mank319's patch fixes the screen brightness OSD: originally the progress bar would always show a value greater than 100%.

Unrelated: libsystemd-login became libsystemd

4 files changed, 45 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f671b4aa8ba3..309093164ac5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Sun Mar 13 06:04:08 UTC 2016
 pkgbase = gnome-settings-daemon-compat
 	pkgdesc = Compatibility package that provides the background, media keys and mount helpers from GNOME Settings Daemon 3.6
 	pkgver = 3.6.4
-	pkgrel = 9
+	pkgrel = 10
 	url = http://www.gnome.org
 	arch = i686
 	arch = x86_64
@@ -20,15 +22,17 @@ pkgbase = gnome-settings-daemon-compat
 	source = xinput.patch
 	source = remove-libgsd-dependency.patch
 	source = move-desktop-file.patch
+	source = libsystemd.patch
 	sha256sums = 3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15
 	sha256sums = 2e7e40175533556493bb58795a2c1b4e53b4baba35d151e632b933c6077456d9
-	sha256sums = ddc4dfaa8083ff24a7d2fb6138b8c3fee5d4e6c60c24b4e80a39392d0c8f2162
+	sha256sums = c41640f51cc2b0165b94cf39971fabfaed3cd678e24cddb3efecfe1b673fc33f
 	sha256sums = 1b6b8216434b766e1389e876cba5d6ab61498c5824f6d2cc5d67dcf58a07842a
 	sha256sums = 0821f469cd168f3a131da513a5f9dd352c06f9bc31d57d79de4dc063fa2de915
 	sha256sums = 02da2467e287620c3b717c7ff5ffea7403cce714d5aa32e27d051b6571451e2a
 	sha256sums = fe8cafee074e36a7a393c9ae7f65db1c13a0959213aaae94ab8a3543bf20a25d
 	sha256sums = 730f11d5689892fbab9aa2896f3720e813d17e2455f34fd3a0751e49f5b4c26c
 	sha256sums = c58ace67581a1e14dc21efc8d22dd1f385cd05483d67e8a385b0767a8daf9fb4
+	sha256sums = d8bf24b8917adbc06cfdd70a841e03111b329928889df7b8048089f20034b1c5
 
 pkgname = gnome-settings-daemon-compat
 
diff --git a/PKGBUILD b/PKGBUILD
index 92bb22ba8a6f..85074acae71b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
-# Maintainer: Charles Bos <charlesbos1 AT gmail>
+# Maintainer: Que Quotion <quequotion at bugmenot dot com>
+# Contributor: Charles Bos <charlesbos1 AT gmail>
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-settings-daemon-compat
 _pkgname=gnome-settings-daemon
 pkgver=3.6.4
-pkgrel=9
+pkgrel=10
 pkgdesc='Compatibility package that provides the background, media keys and mount helpers from GNOME Settings Daemon 3.6'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -20,16 +21,18 @@ source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-
         revert-input-sources.patch
         xinput.patch 
         remove-libgsd-dependency.patch
-        move-desktop-file.patch)
+        move-desktop-file.patch
+        libsystemd.patch)
 sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15'
             '2e7e40175533556493bb58795a2c1b4e53b4baba35d151e632b933c6077456d9'
-            'ddc4dfaa8083ff24a7d2fb6138b8c3fee5d4e6c60c24b4e80a39392d0c8f2162'
+            'c41640f51cc2b0165b94cf39971fabfaed3cd678e24cddb3efecfe1b673fc33f'
             '1b6b8216434b766e1389e876cba5d6ab61498c5824f6d2cc5d67dcf58a07842a'
             '0821f469cd168f3a131da513a5f9dd352c06f9bc31d57d79de4dc063fa2de915'
             '02da2467e287620c3b717c7ff5ffea7403cce714d5aa32e27d051b6571451e2a'
             'fe8cafee074e36a7a393c9ae7f65db1c13a0959213aaae94ab8a3543bf20a25d'
             '730f11d5689892fbab9aa2896f3720e813d17e2455f34fd3a0751e49f5b4c26c'
-            'c58ace67581a1e14dc21efc8d22dd1f385cd05483d67e8a385b0767a8daf9fb4')
+            'c58ace67581a1e14dc21efc8d22dd1f385cd05483d67e8a385b0767a8daf9fb4'
+            'd8bf24b8917adbc06cfdd70a841e03111b329928889df7b8048089f20034b1c5')
 
 prepare() {
   cd $_pkgname-$pkgver
@@ -54,6 +57,8 @@ prepare() {
   # Move desktop files out of autostart, so they can be easily reusable in custom sessions
   patch -Np1 < ../move-desktop-file.patch
 
+  # libsystemd-login is now just libsystemd.
+  patch -Np2 < ../libsystemd.patch
 }
 
 build() {
diff --git a/libsystemd.patch b/libsystemd.patch
new file mode 100644
index 000000000000..0e3e8b377d7b
--- /dev/null
+++ b/libsystemd.patch
@@ -0,0 +1,11 @@
+--- src/gnome-settings-daemon-3.6.4/configure.ac	2013-01-10 22:40:17.000000000 +0900
++++ src/gnome-settings-daemon-3.6.4/configure.ac.new	2016-03-13 14:59:51.761927015 +0900
+@@ -348,7 +348,7 @@
+               [with_systemd=$enableval],
+               [with_systemd=no])
+ if test "$with_systemd" = "yes" ; then
+-  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
++  PKG_CHECK_MODULES(SYSTEMD, [libsystemd])
+   AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
+   SESSION_TRACKING=systemd
+ else
diff --git a/standalone-media-keys-helper.patch b/standalone-media-keys-helper.patch
index 61be1737efe5..87aa9ce0c4ac 100644
--- a/standalone-media-keys-helper.patch
+++ b/standalone-media-keys-helper.patch
@@ -123,6 +123,24 @@ diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-ma
  }
  
  static void
+@@ -1650,7 +1641,7 @@
+                   gpointer             user_data)
+ {
+         GError *error = NULL;
+-        guint percentage;
++        gint32 percentage;
+         GVariant *new_percentage;
+         GsdMediaKeysManager *manager = GSD_MEDIA_KEYS_MANAGER (user_data);
+ 
+@@ -1664,7 +1655,7 @@
+         }
+ 
+         /* update the dialog with the new value */
+-        g_variant_get (new_percentage, "(u)", &percentage);
++        g_variant_get (new_percentage, "(ii)", &percentage, NULL);
+         dialog_init (manager);
+         gsd_osd_window_set_action_custom (GSD_OSD_WINDOW (manager->priv->dialog),
+                                                  "display-brightness-symbolic",
 @@ -2090,7 +2085,6 @@
          char *theme_name;