[arch-commits] Commit in mate-control-center/trunk (2 files)

[Martin Wimpress]

    Date: Tuesday, September 23, 2014 @ 18:19:43
  Author: flexiondotorg
Revision: 119518

upgpkg: mate-control-center 1.8.2-2 - Fixes FS# 42083

Added:
  mate-control-center/trunk/remove-segfault-when-more-custom-keybindings-configured.diff
Modified:
  mate-control-center/trunk/PKGBUILD

--------------------------------------------------------------+
 PKGBUILD                                                     |   14 +++++++---
 remove-segfault-when-more-custom-keybindings-configured.diff |   12 ++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-23 16:16:56 UTC (rev 119517)
+++ PKGBUILD	2014-09-23 16:19:43 UTC (rev 119518)
@@ -2,7 +2,7 @@
 
 pkgname=mate-control-center
 pkgver=1.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The Control Center for MATE"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
@@ -14,10 +14,18 @@
 makedepends=('docbook2x' 'mate-common' 'perl-xml-parser' 'yelp-tools')
 optdepends=('yelp: for reading MATE help documents')
 groups=('mate')
-source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('581439b1e9d042f6cf5707e041fc521fa3fe63f8')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz"
+        'remove-segfault-when-more-custom-keybindings-configured.diff')
+sha1sums=('581439b1e9d042f6cf5707e041fc521fa3fe63f8'
+          'f94b3c5e42b0cc8404c59231389ece3e6d93ca0d')
 install=${pkgname}.install
 
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    # https://github.com/mate-desktop/mate-control-center/issues/80
+    patch -Np1 -i "${srcdir}/remove-segfault-when-more-custom-keybindings-configured.diff"
+}
+
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure \

Added: remove-segfault-when-more-custom-keybindings-configured.diff
===================================================================
--- remove-segfault-when-more-custom-keybindings-configured.diff	                        (rev 0)
+++ remove-segfault-when-more-custom-keybindings-configured.diff	2014-09-23 16:19:43 UTC (rev 119518)
@@ -0,0 +1,12 @@
+diff --git a/capplets/keybindings/mate-keybinding-properties.c b/capplets/keybindings/mate-keybinding-properties.c
+index 6e44255..ae9bee9 100644
+--- a/capplets/keybindings/mate-keybinding-properties.c
++++ b/capplets/keybindings/mate-keybinding-properties.c
+@@ -1000,6 +1000,7 @@ append_keys_to_tree_from_gsettings (GtkBuilder *builder, const gchar *gsettings_
+           key.name = g_strdup("binding");
+           key.cmd_key = g_strdup("action");
+           key.description_key = g_strdup("name");
++          key.schema = NULL;
+           g_array_append_val (entries, key);
+         }
+     }