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

[Alexandre Filgueira]

    Date: Wednesday, May 20, 2015 @ 03:43:38
  Author: faidoc
Revision: 133860

upgpkg: cinnamon-control-center 2.6.0-1

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

----------------------+
 PKGBUILD             |   13 +++--------
 networkmanager.patch |   56 -------------------------------------------------
 2 files changed, 4 insertions(+), 65 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-20 01:34:39 UTC (rev 133859)
+++ PKGBUILD	2015-05-20 01:43:38 UTC (rev 133860)
@@ -5,8 +5,8 @@
 # Jan de Groot <jgc at archlinux.org>
 
 pkgname=cinnamon-control-center
-pkgver=2.4.2
-pkgrel=3
+pkgver=2.6.0
+pkgrel=1
 pkgdesc="The Control Center for Cinnamon"
 arch=('i686' 'x86_64')
 depends=('cinnamon-settings-daemon' 'cinnamon-translations' 'cinnamon-menus'
@@ -17,16 +17,11 @@
 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"
-        networkmanager.patch)
-sha256sums=('7d25193a3cc13c12f22864f3c9a907acfaa616392cb2b7ab4e0624f0d200f188'
-            'c26d5c76121891643a21c3bb5a14cd114aada77b6aa260ab5f753ffd8ff5afee')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz")
+sha256sums=('bbc39ac8ddcbc06b6aada1ef271f95f5f0d0fe439bec38b9cd847af420305c49')
 
 prepare() {
   cd $pkgname-$pkgver
-
-  # Fix compatibility with networkmanager 1.0
-  patch -Np1 -i ../networkmanager.patch
 }
 
 build() {

Deleted: networkmanager.patch
===================================================================
--- networkmanager.patch	2015-05-20 01:34:39 UTC (rev 133859)
+++ networkmanager.patch	2015-05-20 01:43:38 UTC (rev 133860)
@@ -1,56 +0,0 @@
-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);