[arch-commits] Commit in cinnamon-control-center/repos (12 files)
Alexandre Filgueira
faidoc at archlinux.org
Sun Mar 29 19:43:32 UTC 2015
Date: Sunday, March 29, 2015 @ 21:43:31
Author: faidoc
Revision: 130206
archrelease: copy trunk to community-i686, community-x86_64
Added:
cinnamon-control-center/repos/community-i686/PKGBUILD
(from rev 130205, cinnamon-control-center/trunk/PKGBUILD)
cinnamon-control-center/repos/community-i686/cinnamon-control-center.install
(from rev 130205, cinnamon-control-center/trunk/cinnamon-control-center.install)
cinnamon-control-center/repos/community-i686/networkmanager.patch
(from rev 130205, cinnamon-control-center/trunk/networkmanager.patch)
cinnamon-control-center/repos/community-x86_64/PKGBUILD
(from rev 130205, cinnamon-control-center/trunk/PKGBUILD)
cinnamon-control-center/repos/community-x86_64/cinnamon-control-center.install
(from rev 130205, cinnamon-control-center/trunk/cinnamon-control-center.install)
cinnamon-control-center/repos/community-x86_64/networkmanager.patch
(from rev 130205, cinnamon-control-center/trunk/networkmanager.patch)
Deleted:
cinnamon-control-center/repos/community-i686/PKGBUILD
cinnamon-control-center/repos/community-i686/cinnamon-control-center.install
cinnamon-control-center/repos/community-i686/networkmanager.patch
cinnamon-control-center/repos/community-x86_64/PKGBUILD
cinnamon-control-center/repos/community-x86_64/cinnamon-control-center.install
cinnamon-control-center/repos/community-x86_64/networkmanager.patch
--------------------------------------------------+
/PKGBUILD | 120 +++++++++++++++++++++
/cinnamon-control-center.install | 22 +++
/networkmanager.patch | 112 +++++++++++++++++++
community-i686/PKGBUILD | 60 ----------
community-i686/cinnamon-control-center.install | 11 -
community-i686/networkmanager.patch | 56 ---------
community-x86_64/PKGBUILD | 60 ----------
community-x86_64/cinnamon-control-center.install | 11 -
community-x86_64/networkmanager.patch | 56 ---------
9 files changed, 254 insertions(+), 254 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-03-29 19:42:18 UTC (rev 130205)
+++ community-i686/PKGBUILD 2015-03-29 19:43:31 UTC (rev 130206)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
-# Based on gnome-control-center:
-# Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Jan de Groot <jgc at archlinux.org>
-
-pkgname=cinnamon-control-center
-pkgver=2.4.2
-pkgrel=2
-pkgdesc="The Control Center for Cinnamon"
-arch=('i686' 'x86_64')
-depends=('cinnamon-settings-daemon' 'cinnamon-translations' 'cinnamon-menus'
- 'libgnomekbd' 'network-manager-applet')
-optdepends=('gnome-color-manager: for color management tasks')
-makedepends=('intltool' 'gnome-common' 'docbook-xsl')
-url="https://github.com/linuxmint/cinnamon-control-center"
-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')
-
-prepare() {
- cd $pkgname-$pkgver
-
- # Fix compatibility with networkmanager 1.0
- patch -Np1 -i ../networkmanager.patch
-}
-
-build() {
- cd $pkgname-$pkgver
-
- ./autogen.sh --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --enable-systemd \
- --disable-update-mimedb
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=656229
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
- make
-}
-
-package() {
- cd $pkgname-$pkgver
-
- make DESTDIR="$pkgdir" install
-
- # Remove unused stuff
- make -C panels/sound DESTDIR="$pkgdir" uninstall
- make -C panels/sound/data DESTDIR="$pkgdir" install
- make -C shell DESTDIR="$pkgdir" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
- rm "$pkgdir"/usr/share/applications/cinnamon-{control-center,datetime-panel,region-panel,sound-panel}.desktop
- rm -R "$pkgdir/etc"
-
- # Fix a warning
- chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
- chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
-}
Copied: cinnamon-control-center/repos/community-i686/PKGBUILD (from rev 130205, cinnamon-control-center/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-03-29 19:43:31 UTC (rev 130206)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
+# Based on gnome-control-center:
+# Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Jan de Groot <jgc at archlinux.org>
+
+pkgname=cinnamon-control-center
+pkgver=2.4.2
+pkgrel=3
+pkgdesc="The Control Center for Cinnamon"
+arch=('i686' 'x86_64')
+depends=('cinnamon-settings-daemon' 'cinnamon-translations' 'cinnamon-menus'
+ 'libgnomekbd' 'network-manager-applet')
+optdepends=('gnome-color-manager: for color management tasks')
+makedepends=('intltool' 'gnome-common' 'docbook-xsl')
+url="https://github.com/linuxmint/cinnamon-control-center"
+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')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Fix compatibility with networkmanager 1.0
+ patch -Np1 -i ../networkmanager.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --enable-systemd \
+ --disable-update-mimedb
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656229
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ # Remove unused stuff
+ make -C panels/sound DESTDIR="$pkgdir" uninstall
+ make -C panels/sound/data DESTDIR="$pkgdir" install
+ make -C shell DESTDIR="$pkgdir" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
+ rm "$pkgdir"/usr/share/applications/cinnamon-{control-center,datetime-panel,region-panel,sound-panel}.desktop
+ rm -R "$pkgdir/etc"
+
+ # Fix a warning
+ chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
+ chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
+}
Deleted: community-i686/cinnamon-control-center.install
===================================================================
--- community-i686/cinnamon-control-center.install 2015-03-29 19:42:18 UTC (rev 130205)
+++ community-i686/cinnamon-control-center.install 2015-03-29 19:43:31 UTC (rev 130206)
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
\ No newline at end of file
Copied: cinnamon-control-center/repos/community-i686/cinnamon-control-center.install (from rev 130205, cinnamon-control-center/trunk/cinnamon-control-center.install)
===================================================================
--- community-i686/cinnamon-control-center.install (rev 0)
+++ community-i686/cinnamon-control-center.install 2015-03-29 19:43:31 UTC (rev 130206)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
\ No newline at end of file
Deleted: community-i686/networkmanager.patch
===================================================================
--- community-i686/networkmanager.patch 2015-03-29 19:42:18 UTC (rev 130205)
+++ community-i686/networkmanager.patch 2015-03-29 19:43:31 UTC (rev 130206)
@@ -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);
Copied: cinnamon-control-center/repos/community-i686/networkmanager.patch (from rev 130205, cinnamon-control-center/trunk/networkmanager.patch)
===================================================================
--- community-i686/networkmanager.patch (rev 0)
+++ community-i686/networkmanager.patch 2015-03-29 19:43:31 UTC (rev 130206)
@@ -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);
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-03-29 19:42:18 UTC (rev 130205)
+++ community-x86_64/PKGBUILD 2015-03-29 19:43:31 UTC (rev 130206)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
-# Based on gnome-control-center:
-# Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Jan de Groot <jgc at archlinux.org>
-
-pkgname=cinnamon-control-center
-pkgver=2.4.2
-pkgrel=2
-pkgdesc="The Control Center for Cinnamon"
-arch=('i686' 'x86_64')
-depends=('cinnamon-settings-daemon' 'cinnamon-translations' 'cinnamon-menus'
- 'libgnomekbd' 'network-manager-applet')
-optdepends=('gnome-color-manager: for color management tasks')
-makedepends=('intltool' 'gnome-common' 'docbook-xsl')
-url="https://github.com/linuxmint/cinnamon-control-center"
-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')
-
-prepare() {
- cd $pkgname-$pkgver
-
- # Fix compatibility with networkmanager 1.0
- patch -Np1 -i ../networkmanager.patch
-}
-
-build() {
- cd $pkgname-$pkgver
-
- ./autogen.sh --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --enable-systemd \
- --disable-update-mimedb
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=656229
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
- make
-}
-
-package() {
- cd $pkgname-$pkgver
-
- make DESTDIR="$pkgdir" install
-
- # Remove unused stuff
- make -C panels/sound DESTDIR="$pkgdir" uninstall
- make -C panels/sound/data DESTDIR="$pkgdir" install
- make -C shell DESTDIR="$pkgdir" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
- rm "$pkgdir"/usr/share/applications/cinnamon-{control-center,datetime-panel,region-panel,sound-panel}.desktop
- rm -R "$pkgdir/etc"
-
- # Fix a warning
- chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
- chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
-}
Copied: cinnamon-control-center/repos/community-x86_64/PKGBUILD (from rev 130205, cinnamon-control-center/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-03-29 19:43:31 UTC (rev 130206)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
+# Based on gnome-control-center:
+# Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Jan de Groot <jgc at archlinux.org>
+
+pkgname=cinnamon-control-center
+pkgver=2.4.2
+pkgrel=3
+pkgdesc="The Control Center for Cinnamon"
+arch=('i686' 'x86_64')
+depends=('cinnamon-settings-daemon' 'cinnamon-translations' 'cinnamon-menus'
+ 'libgnomekbd' 'network-manager-applet')
+optdepends=('gnome-color-manager: for color management tasks')
+makedepends=('intltool' 'gnome-common' 'docbook-xsl')
+url="https://github.com/linuxmint/cinnamon-control-center"
+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')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Fix compatibility with networkmanager 1.0
+ patch -Np1 -i ../networkmanager.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --enable-systemd \
+ --disable-update-mimedb
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656229
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ # Remove unused stuff
+ make -C panels/sound DESTDIR="$pkgdir" uninstall
+ make -C panels/sound/data DESTDIR="$pkgdir" install
+ make -C shell DESTDIR="$pkgdir" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
+ rm "$pkgdir"/usr/share/applications/cinnamon-{control-center,datetime-panel,region-panel,sound-panel}.desktop
+ rm -R "$pkgdir/etc"
+
+ # Fix a warning
+ chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
+ chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
+}
Deleted: community-x86_64/cinnamon-control-center.install
===================================================================
--- community-x86_64/cinnamon-control-center.install 2015-03-29 19:42:18 UTC (rev 130205)
+++ community-x86_64/cinnamon-control-center.install 2015-03-29 19:43:31 UTC (rev 130206)
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
\ No newline at end of file
Copied: cinnamon-control-center/repos/community-x86_64/cinnamon-control-center.install (from rev 130205, cinnamon-control-center/trunk/cinnamon-control-center.install)
===================================================================
--- community-x86_64/cinnamon-control-center.install (rev 0)
+++ community-x86_64/cinnamon-control-center.install 2015-03-29 19:43:31 UTC (rev 130206)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
\ No newline at end of file
Deleted: community-x86_64/networkmanager.patch
===================================================================
--- community-x86_64/networkmanager.patch 2015-03-29 19:42:18 UTC (rev 130205)
+++ community-x86_64/networkmanager.patch 2015-03-29 19:43:31 UTC (rev 130206)
@@ -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);
Copied: cinnamon-control-center/repos/community-x86_64/networkmanager.patch (from rev 130205, cinnamon-control-center/trunk/networkmanager.patch)
===================================================================
--- community-x86_64/networkmanager.patch (rev 0)
+++ community-x86_64/networkmanager.patch 2015-03-29 19:43:31 UTC (rev 130206)
@@ -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);
More information about the arch-commits
mailing list