jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

gnome-control-center: update to 3.14.3.

Browse source
This commit is contained in:
Juan RP 2015-03-16 08:04:07 +01:00
parent b4e7b4ff27
commit 57bf497cbf
2 changed files with 3 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
srcpkgs/gnome-control-center/patches/network-Also-work-with-NM-10.patch
View file

@ -1,63 +0,0 @@
From fa8d6a13747ed3e586e139b79b63280bd951d10b Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@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
--- panels/network/cc-network-panel.c
+++ 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

7
srcpkgs/gnome-control-center/template
View file

@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
version=3.14.2
revision=3
version=3.14.3
revision=1
build_style=gnu-configure
configure_args="--disable-static --with-cheese"
short_desc="The GNOME control center"
@ -9,10 +9,9 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=b15e188b3d45c86d71f4d8cb297829cf190be81f22ce76dc74c7b4232bd0652a
checksum=21f49787cf708e591f53b6d2a6e1c059037a62726f23b9513b0d116996066e15
hostmakedepends="pkg-config intltool gnome-doc-utils gobject-introspection"
makedepends="
libXi-devel colord-devel>=1.1.7 libsoup-devel gsettings-desktop-schemas-devel>=3.14
gnome-desktop-devel>=3.14 libgnomekbd-devel>=3.6.0 samba-devel