Date: Saturday, January 10, 2015 @ 22:48:44 Author: heftig Revision: 228908
Fix compat with NM 1.0 Added: gnome-control-center/trunk/network-Also-work-with-NM-10.patch Modified: gnome-control-center/trunk/PKGBUILD ------------------------------------+ PKGBUILD | 13 +++++-- network-Also-work-with-NM-10.patch | 63 +++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-01-10 21:19:02 UTC (rev 228907) +++ PKGBUILD 2015-01-10 21:48:44 UTC (rev 228908) @@ -4,7 +4,7 @@ pkgname=gnome-control-center pkgver=3.14.2 -pkgrel=1 +pkgrel=2 pkgdesc="The Control Center for GNOME" license=(GPL) arch=(i686 x86_64) @@ -22,9 +22,16 @@ url="http://www.gnome.org"; install=gnome-control-center.install options=('!emptydirs') -source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('b15e188b3d45c86d71f4d8cb297829cf190be81f22ce76dc74c7b4232bd0652a') +source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz + network-Also-work-with-NM-10.patch) +sha256sums=('b15e188b3d45c86d71f4d8cb297829cf190be81f22ce76dc74c7b4232bd0652a' + '5a09f20f2defd097050498791194d0937bec2edfec0edbd903cea71a1ab0af78') +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../network-Also-work-with-NM-10.patch +} + build() { cd $pkgname-$pkgver Added: network-Also-work-with-NM-10.patch =================================================================== --- network-Also-work-with-NM-10.patch (rev 0) +++ network-Also-work-with-NM-10.patch 2015-01-10 21:48:44 UTC (rev 228908) @@ -0,0 +1,63 @@ +From fa8d6a13747ed3e586e139b79b63280bd951d10b Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <[email protected]> +Date: Thu, 18 Dec 2014 08:04:00 +0100 +Subject: [PATCH] network: Also work with NM 1.0 + +Remove the NetworkManager version checking altogether. The code was made +to check for now very old versions of NetworkManager, and anything newer +than ancient should degrade gracefully if we support newer features. + +https://bugzilla.gnome.org/show_bug.cgi?id=741661 +--- + 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 90b265e..28f6158 100644 +--- a/panels/network/cc-network-panel.c ++++ b/panels/network/cc-network-panel.c +@@ -1321,30 +1321,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; + } + +@@ -1391,8 +1378,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); +--- +2.1.0
