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

[Martin Wimpress]

    Date: Monday, September 29, 2014 @ 22:32:22
  Author: flexiondotorg
Revision: 119844

upgpkg: mate-control-center 1.8.3-1 - New upstream release.

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

--------------------------------------------------------------+
 PKGBUILD                                                     |   16 ++--------
 remove-segfault-when-more-custom-keybindings-configured.diff |   12 -------
 2 files changed, 4 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-29 20:19:21 UTC (rev 119843)
+++ PKGBUILD	2014-09-29 20:32:22 UTC (rev 119844)
@@ -1,8 +1,8 @@
 # Maintainer : Martin Wimpress <code at flexion.org>
 
 pkgname=mate-control-center
-pkgver=1.8.2
-pkgrel=2
+pkgver=1.8.3
+pkgrel=1
 pkgdesc="The Control Center for MATE"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
@@ -14,18 +14,10 @@
 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"
-        'remove-segfault-when-more-custom-keybindings-configured.diff')
-sha1sums=('581439b1e9d042f6cf5707e041fc521fa3fe63f8'
-          'f94b3c5e42b0cc8404c59231389ece3e6d93ca0d')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('f1c571ff26cafe32e07d82f771a4130d2643a2b5')
 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 \

Deleted: remove-segfault-when-more-custom-keybindings-configured.diff
===================================================================
--- remove-segfault-when-more-custom-keybindings-configured.diff	2014-09-29 20:19:21 UTC (rev 119843)
+++ remove-segfault-when-more-custom-keybindings-configured.diff	2014-09-29 20:32:22 UTC (rev 119844)
@@ -1,12 +0,0 @@
-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);
-         }
-     }