Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=15d44eddfb186075bda2ad366265f4fd0e75fbcb
commit 15d44eddfb186075bda2ad366265f4fd0e75fbcb Author: Baste <[email protected]> Date: Fri Nov 23 10:37:02 2012 +0100 gnome-control-center-3.7.1-1-x86_64 * Version bump diff --git a/source/gnome/gnome-control-center/FrugalBuild b/source/gnome/gnome-control-center/FrugalBuild index a1d698d..67c6453 100644 --- a/source/gnome/gnome-control-center/FrugalBuild +++ b/source/gnome/gnome-control-center/FrugalBuild @@ -5,7 +5,7 @@ USE_CHEESE=${USE_CHEESE:-"y"} pkgname=gnome-control-center -pkgver=3.6.3 +pkgver=3.7.1 pkgrel=1 pkgdesc="GNOME Control Center" depends=('gnome-desktop>=3.6.0' 'gnome-menus>=3.6.0' 'gnome-online-accounts>=3.6.0' 'libgtop' 'gnome-settings-daemon>=3.6.0' 'systemd>=188' \ @@ -21,16 +21,19 @@ _F_gnome_mime="y" _F_gnome_iconcache="y" _F_gnome_doc="y" _F_gnome_ext=".tar.xz" -_F_gnome_devel="n" +_F_gnome_devel="y" options=('scriptlet') Finclude gnome gnome-scriptlet +source=($source nm-ui-utils.patch nm-ui-utils-2.patch) Fconfopts+=" --with-libsocialweb=yes \ --disable-update-mimedb --disable-static --enable-debug --enable-systemd" 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.6.0") fi -sha1sums=('2561e4ab3a0a0b3fe73fc2b4901706df68f9e88a') +sha1sums=('84027c136b1c1aebc41e9be2d9a8e43bb17da039' \ + '41e2776e89fecb6acdf5d8ae83f67afee65f483a' \ + '8bb4865bd48c03224677401aad6554bbaaaac1d1') replaces=('accountsdialog' 'gnome-system-tools') build() { diff --git a/source/gnome/gnome-control-center/nm-ui-utils-2.patch b/source/gnome/gnome-control-center/nm-ui-utils-2.patch new file mode 100644 index 0000000..4423b57 --- /dev/null +++ b/source/gnome/gnome-control-center/nm-ui-utils-2.patch @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 0000000..d9d76e7 --- /dev/null +++ b/source/gnome/gnome-control-center/nm-ui-utils.patch @@ -0,0 +1,44 @@ +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
