Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=e0df420efd6af1108d579774fbcb104b0d11c33f

commit e0df420efd6af1108d579774fbcb104b0d11c33f
Author: Baste <[email protected]>
Date:   Wed Feb 4 09:43:54 2015 +0100

gnome-control-center-3.14.2-3-x86_64
- Add nm-1.0 patch

diff --git a/source/gnome/gnome-control-center/FrugalBuild 
b/source/gnome/gnome-control-center/FrugalBuild
index f5148b6..13974e0 100644
--- a/source/gnome/gnome-control-center/FrugalBuild
+++ b/source/gnome/gnome-control-center/FrugalBuild
@@ -8,7 +8,7 @@ options+=('asneeded')

pkgname=gnome-control-center
pkgver=3.14.2
-pkgrel=2
+pkgrel=3
pkgdesc="GNOME Control Center"
depends=('gnome-desktop>=3.14.0' 'gnome-menus>=3.8.0' 
'gnome-online-accounts>=3.12.0' 'libgtop' 'gnome-settings-daemon>=3.14.0' 
'systemd>=188' \
'mesademos' 'libpwquality' 'gst1-plugins-bad' 'ibus' 'cups-pk-helper' 
'colord-gtk' 'accountsservice' \
@@ -27,14 +27,15 @@ _F_gnome_devel="n"
_F_gnome_ext=".tar.xz"
options+=('scriptlet')
Finclude gnome gnome-scriptlet
-#source=($source nm-ui-utils.patch nm-ui-utils-2.patch)
+source=($source nm-1.0.patch)
Fconfopts+=" --enable-debug \
--disable-update-mimedb --disable-static --enable-systemd"
if Fuse $USE_CHEESE; then
export CFLAGS="$CFLAGS -I/usr/include/cheese -I/usr/include/gstreamer-1.0 
-I/usr/include/libxml2"
depends=("${depends[@]}" "cheese-devel>=3.6.0")
fi
-sha1sums=('d0ff0aba461fdc67e7f962c721af2c375c7d977e')
+sha1sums=('d0ff0aba461fdc67e7f962c721af2c375c7d977e' \
+          '318d0ec0c5e293b08a4e39e5c7cd43be6e362f4a')
replaces=('accountsdialog' 'gnome-system-tools')

#build() {
diff --git a/source/gnome/gnome-control-center/nm-1.0.patch 
b/source/gnome/gnome-control-center/nm-1.0.patch
new file mode 100644
index 0000000..855ab41
--- /dev/null
+++ b/source/gnome/gnome-control-center/nm-1.0.patch
@@ -0,0 +1,64 @@
+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
+
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to