Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Adapt c-s-d to Mutter 3.36.9 rebase #349

Merged
merged 7 commits into from
Jun 9, 2022
Merged

Conversation

mtwebster
Copy link
Member

This is just an experiment.
Depends on linuxmint/muffin#601.

@Fantu
Copy link
Contributor

Fantu commented Oct 29, 2021

@mtwebster I don't see this part moved from gnome-settings-daemon to mutter nor implemented in muffin 5.2 PR, maybe I'm a bit tired and from a search I missed something about the settings after removing the cinnamon part and here, sorry if my question is stupid: where is the sound player settings code now?

@mtwebster
Copy link
Member Author

It was done in Cinnamon here: linuxmint/cinnamon@7ab95f0 (the commit you fixed earlier) - it's accessed via global.display.get_sound_player().

It's probably still in g-s-d because there are other desktops that use mutter as a separate window manager and can't access its sound player the way we can.

I'm definitely not blindly mirroring other gnome packages into cinnamon's either - that would cause a lot more problems than any benefits we might get for now - . I'm adapting as needed, and where I can, eliminating overhead (For instance, I'm working on getting rid of using libgnomekbd at the moment).

@Fantu
Copy link
Contributor

Fantu commented Oct 30, 2021

@mtwebster thanks for reply. you are right that not completely follow the gnome components if counterproductive or leave unnecessary stuff. Now I read well the commit comment on cinnamon and remove of sounds volume control which was almost unused and not working well so maybe it's okay to leave it like now.

@Fantu
Copy link
Contributor

Fantu commented Oct 30, 2021

@mtwebster I tested sounds plugin remove (I did also a PR with csd version increase and files remove: #350) and sounds are still working, the only regression I found from some fast tests is "play buttons" on sounds setting window don't working:
sounds-settings
I don't have time now to find/change it in cinnamon code and test it

@mtwebster
Copy link
Member Author

I need to switch those to use something else also (they were using c-s-d also).

@Fantu
Copy link
Contributor

Fantu commented Oct 30, 2021

github search it seemed better to me before but does not even find some simple exact matches in some cases :(
from a fast grep on local repository copy in cinnamon I found files/usr/share/cinnamon/cinnamon-settings/modules/cs_sound.py and files/usr/share/cinnamon/cinnamon-settings/bin/cs_sound.py that still use it

@mtwebster
Copy link
Member Author

I fixed: linuxmint/cinnamon@2a08e42

@Fantu
Copy link
Contributor

Fantu commented Oct 30, 2021

@mtwebster sry I saw only after your new commit, now I'll rebuild cinnamon and I'll retest

@Fantu
Copy link
Contributor

Fantu commented Feb 24, 2022

@mtwebster thanks for merging debian improvements, I did another commit now about etc files removed, I had forgotten with removed some plugins to check the conffiles, I only noticed it today from a quick look at the errors in the logs from the last test: #358

@Fantu
Copy link
Contributor

Fantu commented Apr 26, 2022

@mtwebster in #358 there is still a fix added 2 months ago and now I added 2 other minor things.
I noted one strange thing: in 61d4b51 in the readme you removed "orientation" plugin but was not really removed

@mtwebster
Copy link
Member Author

@Fantu sorry, fixed the readme and merged. Please don't hesitate to bug me sooner if I don't act on stuff like that, I get distracted and am forgetful.

@Fantu
Copy link
Contributor

Fantu commented May 6, 2022

@mtwebster 3e82005 is missed, a "git rebase master" can be done fast and without conflict, I already tested it here: https://github.com/fantu/cinnamon-settings-daemon/commits/muffin-5.2-test

@mtwebster
Copy link
Member Author

Thanks

@Fantu
Copy link
Contributor

Fantu commented May 29, 2022

@mtwebster 2 commit from master are missed, are tested on my latest build is possible a fast rebase without conflict ( https://github.com/fantu/cinnamon-settings-daemon/commits/muffin-5.2-test )

mtwebster and others added 7 commits June 8, 2022 15:32
Don't build csd-sound.
Muffin has its own sound player now.
about deps nothing removed in debian packaging because seems used by
other plugins from some grep
- remove some things from the keyboard plugin that are handled in
  muffin now.
- xsettings: rework to let muffin determine scaling, tie cinnamon's
  and gtk animation togethere
- remove obsolete plugins: a11y-keyboard, cursor, mouse, orientation,
  sound, xrandr.
- some media-keys actions are handled in cinnamon/muffin now, remove
  their handling here.
* debian: wrap and sort

* update debian/copyright

* d/rules: hardening from bindnow to all

* d/control: Drop the libdbus-glib-1-dev dependency in cinnamon-settings-daemon-dev

looks useless looking at the pkg-config file

* remove tracker-gui and gnome-search-tool from suggests

they are not present anymore in latest debian versions

* debian: add small changes to support some archs

merged from debian package
* debian: add removed etc files to maintscript

* d/changelog: mention other plugin removed

remove also trailing whitespace

* d/copyright: remove entry of file removed
This removes dbus as a dependency.

Fedora and Suse need to be tested.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants