[arch-commits] Commit in gnome-screensaver/trunk (2 files)

[Balló György]

    Date: Wednesday, October 8, 2014 @ 04:41:46
  Author: bgyorgy
Revision: 120384

upgpkg: gnome-screensaver 3.6.1-9

Honour background setting of the lock screen (compatibility with recent GNOME versions)

Added:
  gnome-screensaver/trunk/use-screensaver-background.patch
Modified:
  gnome-screensaver/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |   19 ++++++++-----
 use-screensaver-background.patch |   53 +++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-08 02:12:06 UTC (rev 120383)
+++ PKGBUILD	2014-10-08 02:41:46 UTC (rev 120384)
@@ -5,7 +5,7 @@
 
 pkgname=gnome-screensaver
 pkgver=3.6.1
-pkgrel=8
+pkgrel=9
 pkgdesc="Legacy GNOME screensaver"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,7 +13,7 @@
 backup=(etc/pam.d/gnome-screensaver)
 depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop')
 makedepends=('intltool' 'gnome-common')
-optdepends=('gnome-themes-standard: default background')
+optdepends=('gnome-backgrounds: default background')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
        gnome-screensaver.pam
        move-desktop-file.patch
@@ -20,7 +20,8 @@
        fix-autoconf.patch
        fix-systemd-support.patch
        lock_screen_on_suspend.patch
-       lightdm_switch_user.patch)
+       lightdm_switch_user.patch
+       use-screensaver-background.patch)
 sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
             'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
             '4bb96f62aa069c83b629204a79a3f63b146bcaf773569aee8b5dd23fbcd88974'
@@ -27,10 +28,11 @@
             'c4da9c18b543ecbc781c1f103321b324a855bdd0979fd36b437f6033736ad4bb'
             '8aa387578c1756e573f6558a66be25fc96d7e8567fb7bee580159479841f5f45'
             '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8'
-            '5d40bd6e1843150912dc52932eaa94c0f6d57931fd45a3769ef40e2335fe3c6f')
+            '5d40bd6e1843150912dc52932eaa94c0f6d57931fd45a3769ef40e2335fe3c6f'
+            '7161ff962801d9e34ea564c372de4b5f93b30180b83c13aadbc9a8a1cd73ff65')
 
 prepare() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   # Upstream patch that moves gnome-screensaver desktop file out of autostart
   patch -Np1 -i "$srcdir/move-desktop-file.patch"
@@ -46,10 +48,13 @@
 
   # Add support for user switch with LightDM
   patch -Np1 -i "$srcdir/lightdm_switch_user.patch"
+
+  # Honour background setting of the lock screen
+  patch -Np1 -i "$srcdir/use-screensaver-background.patch"
 }
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
               --with-mit-ext
@@ -57,7 +62,7 @@
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
   install -Dm644 ../gnome-screensaver.pam "$pkgdir/etc/pam.d/gnome-screensaver"
 }

Added: use-screensaver-background.patch
===================================================================
--- use-screensaver-background.patch	                        (rev 0)
+++ use-screensaver-background.patch	2014-10-08 02:41:46 UTC (rev 120384)
@@ -0,0 +1,53 @@
+diff -Naur gnome-screensaver-3.6.1.orig/src/gs-manager.c gnome-screensaver-3.6.1/src/gs-manager.c
+--- gnome-screensaver-3.6.1.orig/src/gs-manager.c	2012-08-20 19:12:39.000000000 +0200
++++ gnome-screensaver-3.6.1/src/gs-manager.c	2014-10-08 03:49:37.877178771 +0200
+@@ -555,40 +555,8 @@
+                                      gint       n_keys,
+                                      GSManager   *manager)
+ {
+-#if 0
+-        /* FIXME: since we bind user settings instead of system ones,
+-         *        watching for changes is no longer valid.
+-         */
+         gnome_bg_load_from_preferences (manager->priv->bg,
+                                         manager->priv->settings);
+-#endif
+-
+-        return FALSE;
+-}
+-
+-static GSettings *
+-get_system_settings (void)
+-{
+-        GSettings *settings;
+-        gchar **keys;
+-        gchar **k;
+-
+-        /* FIXME: we need to bind system settings instead of user but
+-         *        that's currently impossible, not implemented yet.
+-         *        Hence, reset to system default values.
+-         */
+-        /* TODO: Ideally we would like to bind some other key, screensaver-specific. */
+-        settings = g_settings_new ("org.gnome.desktop.background");
+-
+-        g_settings_delay (settings);
+-
+-        keys = g_settings_list_keys (settings);
+-        for (k = keys; *k; k++) {
+-                g_settings_reset (settings, *k);
+-        }
+-        g_strfreev (keys);
+-
+-        return settings;
+ }
+ 
+ static void
+@@ -599,7 +567,7 @@
+         manager->priv->fade = gs_fade_new ();
+         manager->priv->grab = gs_grab_new ();
+ 
+-        manager->priv->settings = get_system_settings ();
++        manager->priv->settings = g_settings_new ("org.gnome.desktop.screensaver");
+         manager->priv->bg = gnome_bg_new ();
+ 
+         g_signal_connect (manager->priv->bg,