[arch-commits] Commit in gnome-control-center/trunk (2 files)
Jan Steffens
heftig at archlinux.org
Wed Jul 22 04:26:39 UTC 2015
Date: Wednesday, July 22, 2015 @ 06:26:39
Author: heftig
Revision: 242418
3.16.3
Modified:
gnome-control-center/trunk/PKGBUILD
Deleted:
gnome-control-center/trunk/network-Also-work-with-NM-10.patch
------------------------------------+
PKGBUILD | 6 +--
network-Also-work-with-NM-10.patch | 63 -----------------------------------
2 files changed, 3 insertions(+), 66 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-07-22 04:11:16 UTC (rev 242417)
+++ PKGBUILD 2015-07-22 04:26:39 UTC (rev 242418)
@@ -3,8 +3,8 @@
# Contributor: Jan de Groot <jgc at archlinux.org>
pkgname=gnome-control-center
-pkgver=3.16.2
-pkgrel=2
+pkgver=3.16.3
+pkgrel=1
pkgdesc="The Control Center for GNOME"
license=(GPL)
arch=(i686 x86_64)
@@ -24,7 +24,7 @@
install=gnome-control-center.install
options=('!emptydirs')
source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2c2636af27a07a064669abdf79a8b0580a9a611fa4f108900167100473028a3d')
+sha256sums=('ff9fe9c703be1d0e3afdef7b9ea331e436846ccd4d35090d501ba9510ee5a0c5')
build() {
cd $pkgname-$pkgver
Deleted: network-Also-work-with-NM-10.patch
===================================================================
--- network-Also-work-with-NM-10.patch 2015-07-22 04:11:16 UTC (rev 242417)
+++ network-Also-work-with-NM-10.patch 2015-07-22 04:26:39 UTC (rev 242418)
@@ -1,63 +0,0 @@
-From fa8d6a13747ed3e586e139b79b63280bd951d10b Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess at 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
More information about the arch-commits
mailing list