[arch-commits] Commit in cinnamon-control-center/trunk (PKGBUILD networkmanager.patch)

[Balló György]

    Date: Monday, March 9, 2015 @ 04:00:47
  Author: bgyorgy
Revision: 128961

upgpkg: cinnamon-control-center 2.4.2-2

Fix compatibility with networkmanager 1.0

Added:
  cinnamon-control-center/trunk/networkmanager.patch
Modified:
  cinnamon-control-center/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   10 ++++++--
 networkmanager.patch |   56 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-09 02:38:40 UTC (rev 128960)
+++ PKGBUILD	2015-03-09 03:00:47 UTC (rev 128961)
@@ -6,7 +6,7 @@
 
 pkgname=cinnamon-control-center
 pkgver=2.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The Control Center for Cinnamon"
 arch=('i686' 'x86_64')
 depends=('cinnamon-settings-daemon' 'cinnamon-translations' 'cinnamon-menus'
@@ -17,12 +17,16 @@
 install=cinnamon-control-center.install
 license=('GPL')
 options=('!emptydirs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz")
-sha256sums=('7d25193a3cc13c12f22864f3c9a907acfaa616392cb2b7ab4e0624f0d200f188')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz"
+        networkmanager.patch)
+sha256sums=('7d25193a3cc13c12f22864f3c9a907acfaa616392cb2b7ab4e0624f0d200f188'
+            'c26d5c76121891643a21c3bb5a14cd114aada77b6aa260ab5f753ffd8ff5afee')
 
 prepare() {
   cd $pkgname-$pkgver
 
+  # Fix compatibility with networkmanager 1.0
+  patch -Np1 -i ../networkmanager.patch
 }
 
 build() {

Added: networkmanager.patch
===================================================================
--- networkmanager.patch	                        (rev 0)
+++ networkmanager.patch	2015-03-09 03:00:47 UTC (rev 128961)
@@ -0,0 +1,56 @@
+From c53b915aec80928a1be96c6d0eb6645e415e18f9 Mon Sep 17 00:00:00 2001
+From: leigh123linux <leigh123linux at googlemail.com>
+Date: Sun, 1 Mar 2015 08:35:52 +0000
+Subject: [PATCH] Remove the NetworkManager version checking altogether
+
+---
+ panels/network/cc-network-panel.c | 19 +++----------------
+ 1 file changed, 3 insertions(+), 16 deletions(-)
+
+diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
+index df64bd1..d247c90 100644
+--- a/panels/network/cc-network-panel.c
++++ b/panels/network/cc-network-panel.c
+@@ -1311,30 +1311,17 @@ static gboolean
+ panel_check_network_manager_version (CcNetworkPanel *panel)
+ {
+         const gchar *version;
+-        gchar **split = NULL;
+-        guint major = 0;
+-        guint micro = 0;
+-        guint minor = 0;
+         gboolean ret = TRUE;
+ 
+         /* parse running version */
+         version = nm_client_get_version (panel->priv->client);
+-        if (version != NULL) {
+-                split = g_strsplit (version, ".", -1);
+-                major = atoi (split[0]);
+-                minor = atoi (split[1]);
+-                micro = atoi (split[2]);
+-        }
+-
+-        /* is it too new or old */
+-        if (major > 0 || minor > 9 || (minor <= 8 && micro < 992)) {
++        if (version == NULL) {
+                 ret = FALSE;
+ 
+                 /* do modal dialog in idle so we don't block startup */
+                 panel->priv->nm_warning_idle = g_idle_add ((GSourceFunc)display_version_warning_idle, panel);
+         }
+ 
+-        g_strfreev (split);
+         return ret;
+ }
+ 
+@@ -1381,8 +1368,8 @@ on_toplevel_map (GtkWidget      *widget,
+ {
+         gboolean ret;
+ 
+-        /* is the user compiling against a new version, but running an
+-         * old daemon version? */
++        /* is the user compiling against a new version, but not running
++         * the daemon? */
+         ret = panel_check_network_manager_version (panel);
+         if (ret) {
+                 manager_running (panel->priv->client, NULL, panel);