[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/

2023-12-18 Thread Pacho Ramos 
commit: e5300804a1c1ae8768e8492a9921544c1d9f7f9a
Author: Guillermo Joandet  gmail  com>
AuthorDate: Fri Dec  8 00:07:25 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon Dec 18 10:19:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5300804

gnome-base/gnome-control-center: Version bump to 45.2 Closes: 
https://bugs.gentoo.org/919082

Signed-off-by: Guillermo Joandet  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34169
Signed-off-by: Pacho Ramos  gentoo.org>

 gnome-base/gnome-control-center/Manifest   |   1 +
 .../45.2-fix_incompatible_type_warnings.patch  |  39 
 .../gnome-control-center-45.2.ebuild   | 208 +
 3 files changed, 248 insertions(+)

diff --git a/gnome-base/gnome-control-center/Manifest 
b/gnome-base/gnome-control-center/Manifest
index c0b1848fa5a9..d7347aab7634 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -3,5 +3,6 @@ DIST gnome-control-center-44.3.tar.xz 7634240 BLAKE2B 
edd9cdd0f2cccd628670020f58
 DIST gnome-control-center-45.0-patchset.tar.xz 5888 BLAKE2B 
7b7d818392e8758ca4d9247f55b84e4e8a37419859040e35d8fb3cef16f09423ad74a88a821a5f5947b3f36543ccc328f9a61cb71f92155b6a14669732569910
 SHA512 
e58adc6bb61d04f8c5ecf36335fedd190e063e42eed8e1023dcac95665a270d57c7cbd377fd0f5239f2c144040a9699b428536ffdbac798655b2c9aef25e71ae
 DIST gnome-control-center-45.0.tar.xz 7737740 BLAKE2B 
c2ef08fcca9c14ea911e8a5257cd41e4951d954f5a8ed84fba2e5ede6888e38a9786da8b6a15b7db393d0650abe8ad4592a9d8ae55be76fbe747d0a8e8fb00bb
 SHA512 
c409174f2ce191d21018f7716254e9a5957c0c1daa63902bced6e196b2a1d73daf39364563183fbaca282b23548dc3a6c05b35b68a75334343ca44c23ec8c060
 DIST gnome-control-center-45.1.tar.xz 7721748 BLAKE2B 
de5e11ff187abfe8437b866b1a17ab8cb851ba5e3b754b1fb1f663b97ffac533d6b657a1eba8547d877bd8f47bee65ded79a223c5f5cb4a7384078a62ea0dee9
 SHA512 
f2f7cb97b44729206f0b52d803c225f5f79de9adf0d7e5f06442b20786efa9ca4e5e04e3efa933f2efc54fed5a7a8fe16a5e9fda9dc710be1cfa4b8d47105760
+DIST gnome-control-center-45.2.tar.xz 7715304 BLAKE2B 
5b0b42cf8b1e4e908cbf4dc24018fd645cf4e9643f0233e953bcce5975302eb103306dae37270cce11f0fbe059fbd5dfd6b10cb6dcc08cf4765f648f8f73b32b
 SHA512 
08749b6246e401982bd9c0088a5e2e517c7e8e2cea2fdce5fd29841a6c73b6bad9fba2d2af726f31cde3b64705cc9db22982673117f170cea27bae48911775de
 DIST gnome-control-center-gentoo-logo-dark.svg 14293 BLAKE2B 
570e9326b8abe45849c31fd5cdb3fcfb1b2f18eac522f958928df5c3b747b0699f50a882f31cf7c0ae1f2138194f18596f738f42c942b57d340c53d46d82c551
 SHA512 
91227dafcf2091bb1568b0f9eec68b5e371ec64c9a6bc3605821f60d6bf2bd94dec0564f6a16a4a70d1db4d4df49fc25b6c910367bae3b85205cc609a9f2701b
 DIST gnome-control-center-gentoo-logo.svg 14288 BLAKE2B 
371fc68b1015c8672db3e3858ae9077b1e3a9937e6add8690c39db36302ec031391c4d35e0c0b87094ca474a00c4187849e2d7111df34f43bc5bd7be52678527
 SHA512 
cf88933546de54ca15e2e830ac1086a78c4150f0ff59b8091e7e1cade5961c4e4cb83120a818a960b77841353ce3584ddc8f36b6edbde05543600283a143ad7b

diff --git 
a/gnome-base/gnome-control-center/files/45.2-fix_incompatible_type_warnings.patch
 
b/gnome-base/gnome-control-center/files/45.2-fix_incompatible_type_warnings.patch
new file mode 100644
index ..4b0867bfa0b2
--- /dev/null
+++ 
b/gnome-base/gnome-control-center/files/45.2-fix_incompatible_type_warnings.patch
@@ -0,0 +1,39 @@
+From 13c939659a844049ddc68e90c7830bf96ebe174d Mon Sep 17 00:00:00 2001
+From: Marco Melorio 
+Date: Thu, 5 Oct 2023 19:21:39 +0200
+Subject: [PATCH] misc: Fix incompatible type warnings
+
+---
+ panels/datetime/cc-datetime-panel.c | 2 +-
+ panels/network/net-device-wifi.c| 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/panels/datetime/cc-datetime-panel.c 
b/panels/datetime/cc-datetime-panel.c
+index 3544411d04..204b8ce44d 100644
+--- a/panels/datetime/cc-datetime-panel.c
 b/panels/datetime/cc-datetime-panel.c
+@@ -695,7 +695,7 @@ list_box_row_activated (CcDateTimePanel *self,
+ }
+   else if (row == GTK_LIST_BOX_ROW (self->timezone_row))
+ {
+-  present_window (self, self->timezone_dialog);
++  present_window (self, GTK_WINDOW (self->timezone_dialog));
+ }
+ }
+ 
+diff --git a/panels/network/net-device-wifi.c 
b/panels/network/net-device-wifi.c
+index dd4453d0f8..3cb66e19fa 100644
+--- a/panels/network/net-device-wifi.c
 b/panels/network/net-device-wifi.c
+@@ -780,7 +780,7 @@ net_device_wifi_dispose (GObject *object)
+ NetDeviceWifi *self = NET_DEVICE_WIFI (object);
+ 
+ if (self->hotspot_dialog) {
+-gtk_window_destroy (self->hotspot_dialog);
++gtk_window_destroy (GTK_WINDOW (self->hotspot_dialog));
+ self->hotspot_dialog = NULL;
+ }
+ 
+-- 
+GitLab
+

diff --git a/gnome-base/gnome-control-center/gnome-control-center-45.2.ebuild 
b/gnome-base/gnome-control-center/gnome-control-center-45.2.ebuild
new file mode 100644
index

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/

2020-02-26 Thread David Seifert 
commit: 1785afa0aba9c8d46f05c9f0253c8e7985bf1816
Author: David Seifert  gentoo  org>
AuthorDate: Wed Feb 26 19:46:18 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Feb 26 19:46:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1785afa0

gnome-base/gnome-control-center: Fix GCC 10 / -fno-common

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>

 ...ontrol-center-3.32.2-fix-gcc10-fno-common.patch | 26 ++
 .../gnome-control-center-3.32.2.ebuild |  2 ++
 2 files changed, 28 insertions(+)

diff --git 
a/gnome-base/gnome-control-center/files/gnome-control-center-3.32.2-fix-gcc10-fno-common.patch
 
b/gnome-base/gnome-control-center/files/gnome-control-center-3.32.2-fix-gcc10-fno-common.patch
new file mode 100644
index 000..b0a7a702654
--- /dev/null
+++ 
b/gnome-base/gnome-control-center/files/gnome-control-center-3.32.2-fix-gcc10-fno-common.patch
@@ -0,0 +1,26 @@
+From 901ef8b0ff2b05692cbaa119097f70615ea77ed4 Mon Sep 17 00:00:00 2001
+From: Mike Gorse 
+Date: Thu, 9 Jan 2020 21:34:12 +
+Subject: [PATCH] Thunderbolt: make BoltError enum a typedef
+
+Fixes error when compiled with -fno-common
+---
+ panels/thunderbolt/bolt-error.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/panels/thunderbolt/bolt-error.h b/panels/thunderbolt/bolt-error.h
+index 39b3eee98..7d3823d35 100644
+--- a/panels/thunderbolt/bolt-error.h
 b/panels/thunderbolt/bolt-error.h
+@@ -31,7 +31,7 @@ G_BEGIN_DECLS
+  *
+  * Error codes used inside Bolt.
+  */
+-enum {
++typedef enum {
+   BOLT_ERROR_FAILED = 0,
+   BOLT_ERROR_UDEV,
+   BOLT_ERROR_NOKEY,
+-- 
+2.24.1
+

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild 
b/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
index cac1b28a467..70a11f09240 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
@@ -123,6 +123,8 @@ PATCHES=(
# https://bugzilla.gnome.org/686840, 697478, 700145
# Fix some absolute paths to be appropriate for Gentoo
"${WORKDIR}"/patches/
+
+   "${FILESDIR}"/${PN}-3.32.2-fix-gcc10-fno-common.patch # fixed in 3.35.90
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/

2017-07-14 Thread Mart Raudsepp 
commit: f5563dcc576c5a36e990b2d74eafa7e7809cafe7
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Jul 15 04:12:49 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Jul 15 04:12:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5563dcc

gnome-base/gnome-control-center: Fix compilation with USE=-wayland without 
gtk+[wayland]

Gentoo-bug: 624960
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../files/3.24.2-fix-without-gdkwayland.patch  | 47 ++
 .../gnome-control-center-3.24.2.ebuild |  2 +
 2 files changed, 49 insertions(+)

diff --git 
a/gnome-base/gnome-control-center/files/3.24.2-fix-without-gdkwayland.patch 
b/gnome-base/gnome-control-center/files/3.24.2-fix-without-gdkwayland.patch
new file mode 100644
index 000..0d41cca4704
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/3.24.2-fix-without-gdkwayland.patch
@@ -0,0 +1,47 @@
+From 13437b364fe56ffaaa421b8396ba761a2e0cc13d Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Sat, 15 Jul 2017 06:22:16 +0300
+Subject: [PATCH] common: Add missing GDK_WINDOWING_WAYLAND guards for
+ gsd_udev_device_manager_lookup_device
+
+commit 8f9259ac06db added a gdkwayland specific lookup_device implementation, 
guard it
+with compile-time GDK_WINDOWING_WAYLAND as other places are.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=780544
+---
+ panels/common/gsd-device-manager-udev.c | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/panels/common/gsd-device-manager-udev.c 
b/panels/common/gsd-device-manager-udev.c
+index fdda02a..5dc4447 100644
+--- a/panels/common/gsd-device-manager-udev.c
 b/panels/common/gsd-device-manager-udev.c
+@@ -24,7 +24,9 @@
+ #include 
+ #include 
+ 
++#ifdef GDK_WINDOWING_WAYLAND
+ #include 
++#endif
+ #include "gsd-device-manager-udev.h"
+ 
+ struct _GsdUdevDeviceManager
+@@ -227,6 +229,7 @@ static GsdDevice *
+ gsd_udev_device_manager_lookup_device (GsdDeviceManager *manager,
+  GdkDevice*gdk_device)
+ {
++#ifdef GDK_WINDOWING_WAYLAND
+   const gchar *node_path;
+   GHashTableIter iter;
+   GsdDevice *device;
+@@ -243,6 +246,7 @@ gsd_udev_device_manager_lookup_device (GsdDeviceManager 
*manager,
+   return device;
+   }
+   }
++#endif
+ 
+   return NULL;
+ }
+-- 
+2.10.2
+

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild 
b/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild
index ac0ba455299..763ab0eb174 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild
@@ -138,6 +138,8 @@ PATCHES=(
"${FILESDIR}"/${PV}-optional-cups.patch
# Fix some absolute paths to be appropriate for Gentoo
"${FILESDIR}"/${PV}-gentoo-paths.patch
+   # https://bugzilla.gnome.org/show_bug.cgi?id=780544
+   "${FILESDIR}"/${PV}-fix-without-gdkwayland.patch
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/

2017-03-19 Thread Mart Raudsepp 
commit: 06947f025a4b40e8b9752df158bad875e72ea97a
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Mar 19 12:21:33 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Mar 19 12:28:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06947f02

gnome-base/gnome-control-center: fix build with USE=-wayland, always pull in 
keyboard layout display tool

Gentoo-bug: 539290
Gentoo-bug: 613192

 .../files/3.22.2-fix-build-without-wayland.patch   |  35 +
 .../files/3.22.2-fix-dual-gpu-crash.patch  |  32 +
 .../gnome-control-center-3.22.2-r1.ebuild  | 160 +
 3 files changed, 227 insertions(+)

diff --git 
a/gnome-base/gnome-control-center/files/3.22.2-fix-build-without-wayland.patch 
b/gnome-base/gnome-control-center/files/3.22.2-fix-build-without-wayland.patch
new file mode 100644
index 000..0895a743a71
--- /dev/null
+++ 
b/gnome-base/gnome-control-center/files/3.22.2-fix-build-without-wayland.patch
@@ -0,0 +1,35 @@
+From 4825881b129bdde0eaa5419ece6198ebda420825 Mon Sep 17 00:00:00 2001
+From: Ting-Wei Lan 
+Date: Thu, 10 Nov 2016 22:27:11 +0800
+Subject: [PATCH 1/2] info: Fix build when Wayland is disabled
+
+https://bugzilla.gnome.org/show_bug.cgi?id=774324
+---
+ panels/info/cc-info-panel.c | 11 +--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c
+index 4584766..1d596a3 100644
+--- a/panels/info/cc-info-panel.c
 b/panels/info/cc-info-panel.c
+@@ -351,8 +351,15 @@ get_graphics_data (void)
+   display = gdk_display_get_default ();
+ 
+ #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WAYLAND)
+-  if (GDK_IS_X11_DISPLAY (display) ||
+-  GDK_IS_WAYLAND_DISPLAY (display))
++  gboolean x11_or_wayland = FALSE;
++#ifdef GDK_WINDOWING_X11
++  x11_or_wayland = GDK_IS_X11_DISPLAY (display);
++#endif
++#ifdef GDK_WINDOWING_WAYLAND
++  x11_or_wayland = x11_or_wayland || GDK_IS_WAYLAND_DISPLAY (display);
++#endif
++
++  if (x11_or_wayland)
+ {
+   char *discrete_renderer = NULL;
+   char *renderer;
+-- 
+2.10.1
+

diff --git 
a/gnome-base/gnome-control-center/files/3.22.2-fix-dual-gpu-crash.patch 
b/gnome-base/gnome-control-center/files/3.22.2-fix-dual-gpu-crash.patch
new file mode 100644
index 000..a390477a424
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/3.22.2-fix-dual-gpu-crash.patch
@@ -0,0 +1,32 @@
+From 97e4d87ae8a123d5b1711ddbaba6bc0d3a0a39a8 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy 
+Date: Mon, 5 Dec 2016 10:15:12 +0100
+Subject: [PATCH 2/2] info: Do not crash if Renderer is not set by
+ SessionManager
+
+This regression has been introduced by commit 52da4da. The
+info panel crashes if prettify_info() returns NULL. This happens
+if Renderer property from SessionManager is empty.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=774240
+---
+ panels/info/info-cleanup.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/panels/info/info-cleanup.c b/panels/info/info-cleanup.c
+index 20243ec..bb47493 100644
+--- a/panels/info/info-cleanup.c
 b/panels/info/info-cleanup.c
+@@ -99,6 +99,9 @@ remove_duplicate_whitespace (const char *old)
+   GRegex *re;
+   GError *error;
+ 
++  if (old == NULL)
++return NULL;
++
+   error = NULL;
+   re = g_regex_new ("[ \t\n\r]+", G_REGEX_MULTILINE, 0, );
+   if (re == NULL)
+-- 
+2.10.1
+

diff --git 
a/gnome-base/gnome-control-center/gnome-control-center-3.22.2-r1.ebuild 
b/gnome-base/gnome-control-center/gnome-control-center-3.22.2-r1.ebuild
new file mode 100644
index 000..8598049d522
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.22.2-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit bash-completion-r1 gnome2
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the 
desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/;
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus 
input_devices_wacom kerberos networkmanager v4l wayland"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux 
~x86-linux ~x86-solaris"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
+# g-s-d[policykit] needed for bug #403527
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+# udev could be made optional, only conditions gsd-device-panel
+# (mouse, keyboards, touchscreen, etc)
+COMMON_DEPEND="
+   >=dev-libs/glib-2.44.0:2[dbus]
+   >=x11-libs/gdk-pixbuf-2.23.0:2
+   >=x11-libs/gtk+-3.22.0:3[X,wayland?]
+   >=gnome-base/gsettings-desktop-schemas-3.21.4
+

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/

2015-08-17 Thread Alexandre Rostovtsev 
commit: 527a634b8cb73e7c5bf6b99df3715028b205cd5d
Author: Alexandre Rostovtsev tetromino AT gentoo DOT org
AuthorDate: Tue Aug 18 02:31:50 2015 +
Commit: Alexandre Rostovtsev tetromino AT gentoo DOT org
CommitDate: Tue Aug 18 02:31:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=527a634b

gnome-base/gnome-control-center: clean up old

Package-Manager: portage-2.2.20.1

 gnome-base/gnome-control-center/Manifest   |   1 -
 ...trol-center-3.14.2-networkmanager-version.patch |  63 
 .../gnome-control-center-3.14.2-r1.ebuild  | 166 -
 3 files changed, 230 deletions(-)

diff --git a/gnome-base/gnome-control-center/Manifest 
b/gnome-base/gnome-control-center/Manifest
index a5d6744..73fca6c 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-control-center-3.14.2.tar.xz 6938572 SHA256 
b15e188b3d45c86d71f4d8cb297829cf190be81f22ce76dc74c7b4232bd0652a SHA512 
c5bcdcae87f32cf4b0f9d99709dfe7fcb48e5086945d1685ce94c3996022ff5bf4c82994bbec28e0cf91c9c85309638225536e1dcca06b96cdbaf1ff38f2ae6b
 WHIRLPOOL 
3188ff540a8a01a6479c529f4fe629d2b695b185f762291691a6aefd0f815af382afca2ed8c4ff56e4e5161b3cabe751d507625e4638856034982d2e408000a5
 DIST gnome-control-center-3.14.5.tar.xz 6984452 SHA256 
66ffaf4b1eb0a745a2928035bc1b1e1eac7ea3775941e3a06bfb68ae4c1404c4 SHA512 
ef9fa7a8d95bf37bce4e67521db7c35145f9de7bc9e5a9428d1aa0b0031698e38706529b509534e68dbc4cc8c54ba3482cf439e386fe64f3374432efa637512d
 WHIRLPOOL 
15a83613f80cc3e236fd602d5c84a9a844a236de6556b742ee25147ccecfe207914cb2e4c1ac4029065a6bf19bd81ff8257cbd26163ad7df757849c2e0865f38
 DIST gnome-control-center-3.16.2.tar.xz 7027220 SHA256 
2c2636af27a07a064669abdf79a8b0580a9a611fa4f108900167100473028a3d SHA512 
29c7b87ac2f713a46e20e596f69b343e9d98991c3449e79eb3f77e5d0b14f5250902caa2e481192d6da77f22a309bb7ab5fe4e4eb3c2a9e92d8b672c6b99bb09
 WHIRLPOOL 
e1deb4f228058d5d49c9592a9d4f219190bd8909cccf803a45df767311f3d38bf79d56893f2628475a9d807ef68d57176c89972ec4b63aa81c6d0a35b9d25d60

diff --git 
a/gnome-base/gnome-control-center/files/gnome-control-center-3.14.2-networkmanager-version.patch
 
b/gnome-base/gnome-control-center/files/gnome-control-center-3.14.2-networkmanager-version.patch
deleted file mode 100644
index 40f09d8..000
--- 
a/gnome-base/gnome-control-center/files/gnome-control-center-3.14.2-networkmanager-version.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From fa8d6a13747ed3e586e139b79b63280bd951d10b Mon Sep 17 00:00:00 2001
-From: Bastien Nocera had...@hadess.net
-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
\ No newline at end of file

diff --git 
a/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild 
b/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild
deleted file mode