From 37ee45a27d08fb7d4ccc7988400d547d009280d215a4bbfe1d1596dc4714c651 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Thu, 17 Oct 2013 10:31:38 +0000 Subject: [PATCH] Accepting request 203560 from home:dimstar:branches:GNOME:Factory Update to 3.10.1 - GNOME Stable branch - Bugfixes only OBS-URL: https://build.opensuse.org/request/show/203560 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=224 --- gcc-private-connection.patch | 28 +++++------ gnome-control-center-3.10.0.tar.xz | 3 -- gnome-control-center-3.10.1.tar.xz | 3 ++ gnome-control-center-linker.patch | 25 ++++++++++ ...e-control-center-network-8021x-entry.patch | 50 ------------------- gnome-control-center.changes | 43 ++++++++++++++++ gnome-control-center.spec | 8 +-- 7 files changed, 89 insertions(+), 71 deletions(-) delete mode 100644 gnome-control-center-3.10.0.tar.xz create mode 100644 gnome-control-center-3.10.1.tar.xz create mode 100644 gnome-control-center-linker.patch delete mode 100644 gnome-control-center-network-8021x-entry.patch diff --git a/gcc-private-connection.patch b/gcc-private-connection.patch index 962030b..bb8ffdc 100644 --- a/gcc-private-connection.patch +++ b/gcc-private-connection.patch @@ -1,4 +1,4 @@ -From e805287d5e6749dd5b02f30b339f9c1523020fce Mon Sep 17 00:00:00 2001 +From b72c423a344f2e455c17978bab76eb29912d0b5b Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin Date: Tue, 14 Feb 2012 18:41:51 +0800 Subject: [PATCH] network: create private connections if the user if not @@ -20,10 +20,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646187 7 files changed, 94 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac -index a7542e6..2245fc3 100644 +index b0b492d..4453123 100644 --- a/configure.ac +++ b/configure.ac -@@ -132,7 +132,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMON_MODULES +@@ -134,7 +134,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMON_MODULES PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES) PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11) @@ -34,7 +34,7 @@ index a7542e6..2245fc3 100644 PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1 diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c -index cab9f4c..b03cf1a 100644 +index 4fa3706..7bae539 100644 --- a/panels/network/cc-network-panel.c +++ b/panels/network/cc-network-panel.c @@ -24,6 +24,8 @@ @@ -72,7 +72,7 @@ index cab9f4c..b03cf1a 100644 reset_command_line_args (panel); /* done */ select_tree_iter (panel, iter); return TRUE; -@@ -1352,6 +1357,9 @@ cc_network_panel_init (CcNetworkPanel *panel) +@@ -1355,6 +1360,9 @@ cc_network_panel_init (CcNetworkPanel *panel) GtkWidget *widget; GtkWidget *toplevel; GDBusConnection *system_bus; @@ -82,10 +82,10 @@ index cab9f4c..b03cf1a 100644 panel->priv = NETWORK_PANEL_PRIVATE (panel); g_resources_register (cc_network_get_resource ()); -@@ -1455,4 +1463,32 @@ cc_network_panel_init (CcNetworkPanel *panel) +@@ -1458,4 +1466,32 @@ cc_network_panel_init (CcNetworkPanel *panel) widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "vbox1")); - gtk_widget_reparent (widget, (GtkWidget *) panel); + gtk_container_add (GTK_CONTAINER (panel), widget); + + /* check the polkit authentication */ + panel->priv->default_private = TRUE; @@ -129,10 +129,10 @@ index f869c3f..d3773b2 100644 #endif /* _CC_NETWORK_PANEL_H */ diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c -index 6c35524..e3abcd6 100644 +index dad3a4a..c671637 100644 --- a/panels/network/net-device-mobile.c +++ b/panels/network/net-device-mobile.c -@@ -148,12 +148,15 @@ mobile_connection_changed_cb (GtkComboBox *combo_box, NetDeviceMobile *device_mo +@@ -141,12 +141,15 @@ mobile_connection_changed_cb (GtkComboBox *combo_box, NetDeviceMobile *device_mo COLUMN_ID, &object_path, -1); if (g_strcmp0 (object_path, NULL) == 0) { @@ -150,10 +150,10 @@ index 6c35524..e3abcd6 100644 } diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c -index 397d556..6851bf8 100644 +index 49a79a8..da488c5 100644 --- a/panels/network/net-device-wifi.c +++ b/panels/network/net-device-wifi.c -@@ -704,6 +704,9 @@ wireless_try_to_connect (NetDeviceWifi *device_wifi, +@@ -696,6 +696,9 @@ wireless_try_to_connect (NetDeviceWifi *device_wifi, NMDevice *device; NMSettingWireless *setting_wireless; NMClient *client; @@ -163,7 +163,7 @@ index 397d556..6851bf8 100644 if (device_wifi->priv->updating_device) goto out; -@@ -755,10 +758,21 @@ wireless_try_to_connect (NetDeviceWifi *device_wifi, +@@ -747,10 +750,21 @@ wireless_try_to_connect (NetDeviceWifi *device_wifi, /* create one, as it's missing */ g_debug ("no existing connection found for %s, creating", ssid_target); @@ -186,7 +186,7 @@ index 397d556..6851bf8 100644 device, ap_object_path, connection_add_activate_cb, device_wifi); } else { -@@ -972,6 +986,7 @@ start_shared_connection (NetDeviceWifi *device_wifi) +@@ -965,6 +979,7 @@ start_shared_connection (NetDeviceWifi *device_wifi) GSList *l; NMClient *client; const char *mode; @@ -194,7 +194,7 @@ index 397d556..6851bf8 100644 device = net_device_get_nm_device (NET_DEVICE (device_wifi)); g_assert (nm_device_get_device_type (device) == NM_DEVICE_TYPE_WIFI); -@@ -1008,6 +1023,14 @@ start_shared_connection (NetDeviceWifi *device_wifi) +@@ -1001,6 +1016,14 @@ start_shared_connection (NetDeviceWifi *device_wifi) "id", "Hotspot", "autoconnect", FALSE, NULL); diff --git a/gnome-control-center-3.10.0.tar.xz b/gnome-control-center-3.10.0.tar.xz deleted file mode 100644 index 7b885f9..0000000 --- a/gnome-control-center-3.10.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea74d87e255308f130039a9afab548ae0416e2c96e69adfc7c794d1775f1474f -size 6837440 diff --git a/gnome-control-center-3.10.1.tar.xz b/gnome-control-center-3.10.1.tar.xz new file mode 100644 index 0000000..7419340 --- /dev/null +++ b/gnome-control-center-3.10.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbfc1a935c33901c6afc999160696e0cde60ccb9997679cc8d0a2ff952568cbe +size 6829656 diff --git a/gnome-control-center-linker.patch b/gnome-control-center-linker.patch new file mode 100644 index 0000000..e11268a --- /dev/null +++ b/gnome-control-center-linker.patch @@ -0,0 +1,25 @@ +From 0d6bccaf4ded90bd89f56eec849511d20ae714ab Mon Sep 17 00:00:00 2001 +From: Kalev Lember +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/gnome-control-center-network-8021x-entry.patch b/gnome-control-center-network-8021x-entry.patch deleted file mode 100644 index 78c8d65..0000000 --- a/gnome-control-center-network-8021x-entry.patch +++ /dev/null @@ -1,50 +0,0 @@ -From fff5883cbff3505c9a82d0f5ed96efa0052f7865 Mon Sep 17 00:00:00 2001 -From: Gary Ching-Pang Lin -Date: Mon, 7 Oct 2013 15:34:06 +0800 -Subject: [PATCH] network: Use the parameters property for 8021x - -The argv property was deprecated. This commit converts the 8021x -settings to the parameters property so that the user is able to -setup the 8021x connections. - -https://bugzilla.gnome.org/show_bug.cgi?id=709545 ---- - panels/network/net-device-wifi.c | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) - -diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c -index 3f0d624..005cda6 100644 ---- a/panels/network/net-device-wifi.c -+++ b/panels/network/net-device-wifi.c -@@ -757,19 +757,20 @@ wireless_try_to_connect (NetDeviceWifi *device_wifi, - connection_add_activate_cb, device_wifi); - } else { - CcNetworkPanel *panel; -- GPtrArray *array; -+ GVariantBuilder *builder; -+ GVariant *parameters; - - g_debug ("no existing connection found for %s, creating", ssid_target); -- array = g_ptr_array_new (); -- g_ptr_array_add (array, "connect-8021x-wifi"); -- g_ptr_array_add (array, (gpointer) nm_object_get_path (NM_OBJECT (device))); -- g_ptr_array_add (array, (gpointer) ap_object_path); -- g_ptr_array_add (array, NULL); -+ builder = g_variant_builder_new (G_VARIANT_TYPE ("av")); -+ g_variant_builder_add (builder, "v", g_variant_new_string ("connect-8021x-wifi")); -+ g_variant_builder_add (builder, "v", g_variant_new_string (nm_object_get_path (NM_OBJECT (device)))); -+ g_variant_builder_add (builder, "v", g_variant_new_string (ap_object_path)); -+ parameters = g_variant_new ("av", builder); - - panel = net_object_get_panel (NET_OBJECT (device_wifi)); -- g_object_set (G_OBJECT (panel), "argv", array->pdata, NULL); -+ g_object_set (G_OBJECT (panel), "parameters", parameters, NULL); - -- g_ptr_array_free (array, FALSE); -+ g_variant_builder_unref (builder); - } - out: - return; --- -1.8.1.4 - diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 12df9e6..a878546 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Wed Oct 16 06:43:54 UTC 2013 - dimstar@opensuse.org + +- Update to version 3.10.1: + + Background: + - Fix several memory leaks. + - Some code cleanups. + - Be robust against missing directories, and warn otherwise. + - Use a consistent set of permissions when creating + directories. + + Display: Always label the built in display as "1". + + Mouse: Do not reset mouse speed when unset. + + Network: + - Fix a few crashes and memory leaks. + - Some code cleanups. + - Just dismiss forget dialog if response is not OK. + - Update forget button sensitivity when rows are destroyed. + - Use the command line parameters property for 8021x. + - Only start the spinner when we can stop it. + + Power: Use device models as names. + + Sharing: + - Allow screen sharing approving without remote control + enabled. + - Ensure the hostname in labels is updated. + - Prevent duplicate folders being selected for media sharing. + - When enabling DLNA, also make sure to enable the MediaExport + plugin. + + Shell: Align the buttons in the headerbar. + + Universal Access: Fix a crash. + + Wacom: + - Align the stylus section with the tablet section. + - Fix device filtering in calibration UI. + - Fix use after free causing random values in the calibration + data. + - Fix incorrect default window information. + - Fix ~100 pixel offset when calibrating. + - Reset the calibration before starting a new one. +- Drop gnome-control-center-network-8021x-entry.patch: fixed + upstream. +- Add gnome-control-center-linker.patch: Fix test-chooser-dialog + build with some linkers. +- Rebase gcc-private-connection.patch (Gary Lin). + ------------------------------------------------------------------- Sun Oct 13 12:04:18 UTC 2013 - dimstar@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index be80010..8a03dc4 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -27,7 +27,7 @@ %endif Name: gnome-control-center -Version: 3.10.0 +Version: 3.10.1 Release: 0 # FIXME: in 12.3 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833) Summary: The GNOME Control Center @@ -43,8 +43,8 @@ Patch14: gnome-control-center-system-proxy-configuration.patch Patch15: gcc-private-connection.patch # PATCH-FIX-UPSTREAM gnome-control-center-probe-radius-server-cert.patch bnc#574266 glin@suse.com -- network: Probe the RADIUS server certificate Patch16: gnome-control-center-probe-radius-server-cert.patch -# PATCH-FIX-UPSTREAM gnome-control-center-network-8021x-entry.patch bgo#709545 glin@suse.com -- network: fix 8021x connection settings -Patch17: gnome-control-center-network-8021x-entry.patch +# PATCH-FIX-UPSTREAM gnome-control-center-linker.patch bgo#709302 dimstar@opensuse.org -- Fix test-chooser-dialog build with some linkers, taken from upstream +Patch17: gnome-control-center-linker.patch BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -164,9 +164,9 @@ translation-update-upstream %patch0 -p1 %patch15 -p1 %patch16 -p1 -%patch17 -p1 #NEEDS-REBASE #patch14 -p1 +%patch17 -p1 %build ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh