Merge pull request #269073 from bobby285271/upd/cinnamon

cinnamon.cinnamon-screensaver: Fix broken theming with pygobject 3.46
This commit is contained in:
Bobby Rong 2023-11-23 21:18:50 +08:00 committed by GitHub
commit fe69c517e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 0 deletions

View File

@ -38,6 +38,11 @@ stdenv.mkDerivation rec {
hash = "sha256-d7h9OJ39HVQNCHNr13M1ybDFoU3Xnd1PEczGLHZU/lU=";
};
patches = [
# See https://github.com/linuxmint/cinnamon-screensaver/issues/446#issuecomment-1819580053
./fix-broken-theming-with-pygobject-3-46.patch
];
nativeBuildInputs = [
pkg-config
wrapGAppsHook

View File

@ -0,0 +1,17 @@
diff --git a/src/cinnamon-screensaver-main.py b/src/cinnamon-screensaver-main.py
index 05b727c..a185159 100755
--- a/src/cinnamon-screensaver-main.py
+++ b/src/cinnamon-screensaver-main.py
@@ -139,9 +139,9 @@ class Main(Gtk.Application):
fallback_prov = Gtk.CssProvider()
- if fallback_prov.load_from_data(fallback_css.encode()):
- Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default(), fallback_prov, 600)
- Gtk.StyleContext.reset_widgets(Gdk.Screen.get_default())
+ fallback_prov.load_from_data(fallback_css.encode())
+ Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default(), fallback_prov, 600)
+ Gtk.StyleContext.reset_widgets(Gdk.Screen.get_default())
if __name__ == "__main__":
setproctitle.setproctitle('cinnamon-screensaver')