[arch-commits] Commit in mate-settings-daemon/trunk (2 files)

[Martin Wimpress]

    Date: Thursday, October 23, 2014 @ 13:30:27
  Author: flexiondotorg
Revision: 121285

upgpkg: mate-settings-daemon 1.8.2-2 - Add media key support for galculator.

Added:
  mate-settings-daemon/trunk/use_galculator_first.diff
Modified:
  mate-settings-daemon/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   14 +++++++++++---
 use_galculator_first.diff |   15 +++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-23 11:09:27 UTC (rev 121284)
+++ PKGBUILD	2014-10-23 11:30:27 UTC (rev 121285)
@@ -3,7 +3,7 @@
 pkgbase=mate-settings-daemon
 pkgname=("${pkgbase}-pulseaudio" "${pkgbase}-gstreamer")
 pkgver=1.8.2
-pkgrel=1
+pkgrel=2
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -11,10 +11,18 @@
          'libcanberra-pulse' 'libmatekbd' 'libnotify' 'libxt' 'mate-desktop'
          'nss' 'polkit' 'pulseaudio-alsa')
 makedepends=('mate-common')
-source=("http://pub.mate-desktop.org/releases/1.8/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('e465eb33b79394150514ad0af201bf32f07fd520')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgbase}-${pkgver}.tar.xz"
+        'use_galculator_first.diff')
+sha1sums=('e465eb33b79394150514ad0af201bf32f07fd520'
+          '916dc6519a7778e97cd8dd18c46363e6c36d389a')
 install=${pkgbase}.install
 
+prepare() {
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+    # https://github.com/mate-desktop/mate-settings-daemon/commit/163f01a8b527c1ed801f68681fc7d82a54d42b1c
+    patch -Np1 -i "${srcdir}/use_galculator_first.diff"
+}
+
 build() {
     cd "${srcdir}"
     cp -a ${pkgbase}-${pkgver}{,-gstreamer}

Added: use_galculator_first.diff
===================================================================
--- use_galculator_first.diff	                        (rev 0)
+++ use_galculator_first.diff	2014-10-23 11:30:27 UTC (rev 121285)
@@ -0,0 +1,15 @@
+diff --git a/plugins/media-keys/msd-media-keys-manager.c b/plugins/media-keys/msd-media-keys-manager.c
+index ad7665d..cc819c5 100644
+--- a/plugins/media-keys/msd-media-keys-manager.c
++++ b/plugins/media-keys/msd-media-keys-manager.c
+@@ -999,7 +999,9 @@ do_action (MsdMediaKeysManager *manager,
+                 do_media_action (manager);
+                 break;
+         case CALCULATOR_KEY:
+-                if ((cmd = g_find_program_in_path ("mate-calc"))) {
++                if ((cmd = g_find_program_in_path ("galculator"))) {
++                        execute (manager, "galculator", FALSE, FALSE);
++                } else if ((cmd = g_find_program_in_path ("mate-calc"))) {
+                         execute (manager, "mate-calc", FALSE, FALSE);
+                 } else {
+                         execute (manager, "gcalctool", FALSE, FALSE);