Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3eddc6a42a1ab47b07727bf7d6683e4456ef6103
commit 3eddc6a42a1ab47b07727bf7d6683e4456ef6103 Author: Baste <[email protected]> Date: Mon Oct 12 16:23:23 2015 +0200 gnome-control-center-3.18.1-1-x86_64 - 3.18.0 -> 3.18.1 diff --git a/source/gnome/gnome-control-center/FrugalBuild b/source/gnome/gnome-control-center/FrugalBuild index 6294e88..0d0df34 100644 --- a/source/gnome/gnome-control-center/FrugalBuild +++ b/source/gnome/gnome-control-center/FrugalBuild @@ -4,17 +4,14 @@ USE_CHEESE=${USE_CHEESE:-"y"} -options+=('asneeded') - pkgname=gnome-control-center -pkgver=3.18.0 -pkgrel=2 +pkgver=3.18.1 +pkgrel=1 pkgdesc="GNOME Control Center" depends=('gnome-desktop>=3.18.0' 'gnome-menus>=3.8.0' 'gnome-online-accounts>=3.17.92' 'libgtop' 'gnome-settings-daemon>=3.18.0' 'libgudev' \ 'mesademos' 'libpwquality' 'gst1-plugins-bad' 'ibus' 'cups-pk-helper' 'colord-gtk' 'accountsservice' \ 'nm-connection-editor' 'libsmbclient' 'talloc' 'grilo' 'gnome-bluetooth' 'libpulse>=6.0') makedepends=('intltool' 'gnome-doc-utils' 'cups' 'krb5' 'icu4c>=4.8' 'docbook-xsl' 'gobject-introspection') -# 'gnome-common') rodepends=('gst1-plugins-base-alsa>=1.5.91' 'sound-theme-freedesktop' 'system-config-printer') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') @@ -33,7 +30,7 @@ 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.18.0") fi -sha1sums=('a9b093ee8fe1ca5fdbde3786c5ecdf2dc6e426c7') +sha1sums=('241023507b860e5553df096f4275964d0a773152') replaces=('accountsdialog' 'gnome-system-tools') #build() { diff --git a/source/gnome/gnome-control-center/build.patch b/source/gnome/gnome-control-center/build.patch deleted file mode 100644 index dcf085c..0000000 --- a/source/gnome/gnome-control-center/build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f08a22526c050d2032c926c5bc045927a646ea4a Mon Sep 17 00:00:00 2001 -From: Kalev Lember <[email protected]> -Date: Wed, 16 Oct 2013 10:01:36 +0000 -Subject: background: Fix test-chooser-dialog build with some linkers - -List missing libs for the libbackground-chooser.la convenience library. - -https://bugzilla.gnome.org/show_bug.cgi?id=709302 ---- -diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am -index f24f8b3..2766207 100644 ---- a/panels/background/Makefile.am -+++ b/panels/background/Makefile.am -@@ -40,6 +40,8 @@ libbackground_chooser_la_SOURCES = \ - bg-colors-source.c \ - bg-colors-source.h - -+libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) -+ - libbackground_la_SOURCES = \ - cc-background-panel.c \ - cc-background-panel.h --- -cgit v0.9.2 - diff --git a/source/gnome/gnome-control-center/nm-1.0.patch b/source/gnome/gnome-control-center/nm-1.0.patch deleted file mode 100644 index 855ab41..0000000 --- a/source/gnome/gnome-control-center/nm-1.0.patch +++ /dev/null @@ -1,64 +0,0 @@ -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 - diff --git a/source/gnome/gnome-control-center/nm-ui-utils-2.patch b/source/gnome/gnome-control-center/nm-ui-utils-2.patch deleted file mode 100644 index 4423b57..0000000 --- a/source/gnome/gnome-control-center/nm-ui-utils-2.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- panels/network/cc-network-panel.c 2012-11-03 14:25:31.000000000 +0100 -+++ panels/network/cc-network-panel.c.new 2012-11-03 14:25:37.000000000 +0100 -@@ -29,7 +29,6 @@ - #include "nm-client.h" - #include "nm-device.h" - #include "nm-device-modem.h" --#include <libnm-gtk/nm-ui-utils.h> - - #include "net-device.h" - #include "net-device-mobile.h" diff --git a/source/gnome/gnome-control-center/nm-ui-utils.patch b/source/gnome/gnome-control-center/nm-ui-utils.patch deleted file mode 100644 index d9d76e7..0000000 --- a/source/gnome/gnome-control-center/nm-ui-utils.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 38a7a3fbe6cd5dba7cfd7ad706d03cccaa05823a Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <[email protected]> -Date: Fri, 26 Oct 2012 10:27:32 -0400 -Subject: [PATCH] network: Fix the build with nma 0.9.6.2 - -This is a temporary bandaid until 0.9.6.4 is released. ---- - panels/network/network-dialogs.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/panels/network/network-dialogs.c b/panels/network/network-dialogs.c -index f9be79d..e6b0774 100644 ---- a/panels/network/network-dialogs.c -+++ b/panels/network/network-dialogs.c -@@ -30,7 +30,7 @@ - #include <nm-device-wifi.h> - - #include "network-dialogs.h" --#include "nm-wifi-dialog.h" -+#include "nm-wireless-dialog.h" - #include "nm-mobile-wizard.h" - - typedef struct { -@@ -108,7 +108,7 @@ nag_dialog_response_cb (GtkDialog *nag_dialog, - gint response, - gpointer user_data) - { -- NMAWifiDialog *wireless_dialog = NMA_WIFI_DIALOG (user_data); -+ NMAWirelessDialog *wireless_dialog = NMA_WIRELESS_DIALOG (user_data); - - if (response == GTK_RESPONSE_NO) { /* user opted not to correct the warning */ - nma_wifi_dialog_set_nag_ignored (wireless_dialog, TRUE); -@@ -121,7 +121,7 @@ wireless_dialog_response_cb (GtkDialog *foo, - gint response, - gpointer user_data) - { -- NMAWifiDialog *dialog = NMA_WIFI_DIALOG (foo); -+ NMAWirelessDialog *dialog = NMA_WIRELESS_DIALOG (foo); - WirelessDialogClosure *closure = user_data; - NMConnection *connection, *fuzzy_match = NULL; - NMDevice *device; --- -1.7.12.1 - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
