pool/gnome-control-center
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 283037 from home:dimstar:branches:GNOME:Factory

Browse Source 
- Add gnome-control-center-NM-1.0.patch: Add compatibility to
  NetworkManager 1.0.
- Disable gnome-control-center-probe-radius-server-cert.patch until
  NetworkManager has been fixed up again.

OBS-URL: https://build.opensuse.org/request/show/283037
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=267
This commit is contained in:
Dominique Leuenberger 2015-01-27 17:25:00 +00:00 committed by Git OBS Bridge
parent 1935884bea
commit 34fc8744da
3 changed files with 75 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
gnome-control-center-NM-1.0.patch Normal file
View File

@ -0,0 +1,62 @@
From f30e6df1d4665b06a45ad7bbe7a2ed2bfa9387f5 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 18 Dec 2014 08:04:00 +0100
Subject: 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
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);
--
cgit v0.10.1

8
gnome-control-center.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jan 27 16:24:06 UTC 2015 - dimstar@opensuse.org
- Add gnome-control-center-NM-1.0.patch: Add compatibility to
NetworkManager 1.0.
- Disable gnome-control-center-probe-radius-server-cert.patch until
NetworkManager has been fixed up again.
-------------------------------------------------------------------
Fri Nov 21 16:17:24 UTC 2014 - zaitor@opensuse.org

7
gnome-control-center.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gnome-control-center
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -47,6 +47,8 @@ Patch15: gcc-private-connection.patch
Patch16: gnome-control-center-probe-radius-server-cert.patch
# PATCH-FEATURE-OPENSUSE gnome-control-center-follow-polkit-permissions-for-tz.patch boo#904058 badshah400@gmail.com -- Follow polkit permissions for allowing/locking timezone setting changes
Patch17: gnome-control-center-follow-polkit-permissions-for-tz.patch
# PATCH-FIX-UPSTREAM gnome-control-center-NM-1.0.patch dimstar@opensuse.org -- Allow to operate with NetworkManager 1.0
Patch18: gnome-control-center-NM-1.0.patch
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
BuildRequires: fdupes
@ -180,10 +182,11 @@ translation-update-upstream
%patch0 -p1
%patch1 -p1
%patch15 -p1
%patch16 -p1
#patch16 -p1
%patch17 -p1
#NEEDS-REBASE
#patch14 -p1
%patch18 -p1
%build
ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh