From 587234ba13a697ba3fe365aacd71000a639377df063f4cc52b66ac296cddb0d6 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 12 Sep 2012 09:27:40 +0000 Subject: [PATCH 1/7] Accepting request 133592 from GNOME:Next Addressing comments OBS-URL: https://build.opensuse.org/request/show/133592 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=155 --- gcc-private-connection.patch | 48 ++-- gnome-control-center-3.4.2.tar.xz | 3 - gnome-control-center-3.5.91.tar.xz | 3 + ...er-allow-wallpapers-with-weird-names.patch | 27 -- ...e-control-center-allow-yast-in-shell.patch | 26 +- ...trol-center-fix-crash-on-hidden-ssid.patch | 44 ---- ...control-center-fix-screen-brightness.patch | 84 ------ ...rol-center-shortcut-assignment-fixes.patch | 68 ----- gnome-control-center.changes | 245 ++++++++++++++++++ gnome-control-center.spec | 50 ++-- 10 files changed, 307 insertions(+), 291 deletions(-) delete mode 100644 gnome-control-center-3.4.2.tar.xz create mode 100644 gnome-control-center-3.5.91.tar.xz delete mode 100644 gnome-control-center-allow-wallpapers-with-weird-names.patch delete mode 100644 gnome-control-center-fix-crash-on-hidden-ssid.patch delete mode 100644 gnome-control-center-fix-screen-brightness.patch delete mode 100644 gnome-control-center-shortcut-assignment-fixes.patch diff --git a/gcc-private-connection.patch b/gcc-private-connection.patch index 853fe29..63b2886 100644 --- a/gcc-private-connection.patch +++ b/gcc-private-connection.patch @@ -16,25 +16,25 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646187 panels/network/network-dialogs.c | 16 ++++++++ 4 files changed, 91 insertions(+), 2 deletions(-) -Index: gnome-control-center-3.4.2/configure.ac +Index: gnome-control-center-3.5.4/configure.ac =================================================================== ---- gnome-control-center-3.4.2.orig/configure.ac -+++ gnome-control-center-3.4.2/configure.ac -@@ -105,7 +105,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMO +--- gnome-control-center-3.5.4.orig/configure.ac ++++ gnome-control-center-3.5.4/configure.ac +@@ -108,7 +108,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMO PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES) PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11) -PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES) +PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES -+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) - PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0) ++ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) + 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 gnome-settings-daemon >= $GSD_REQUIRED_VERSION) -Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c +Index: gnome-control-center-3.5.4/panels/network/cc-network-panel.c =================================================================== ---- gnome-control-center-3.4.2.orig/panels/network/cc-network-panel.c -+++ gnome-control-center-3.4.2/panels/network/cc-network-panel.c -@@ -24,6 +24,8 @@ +--- gnome-control-center-3.5.4.orig/panels/network/cc-network-panel.c ++++ gnome-control-center-3.5.4/panels/network/cc-network-panel.c +@@ -25,6 +25,8 @@ #include #include @@ -43,7 +43,7 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c #include "cc-network-panel.h" #include "nm-remote-settings.h" -@@ -85,6 +87,9 @@ struct _CcNetworkPanelPrivate +@@ -88,6 +90,9 @@ struct _CcNetworkPanelPrivate gchar *arg_device; gchar *arg_access_point; gboolean operation_done; @@ -53,7 +53,7 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c }; enum { -@@ -2827,8 +2832,10 @@ wireless_ap_changed_cb (GtkComboBox *com +@@ -3000,8 +3005,10 @@ wireless_ap_changed_cb (GtkComboBox *com NetObject *object; NMConnection *connection; NMConnection *connection_activate = NULL; @@ -64,7 +64,7 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c if (panel->priv->updating_device) goto out; -@@ -2897,8 +2904,17 @@ wireless_ap_changed_cb (GtkComboBox *com +@@ -3070,8 +3077,17 @@ wireless_ap_changed_cb (GtkComboBox *com /* create one, as it's missing */ g_debug ("no existing connection found for %s, creating", ssid_target); @@ -83,7 +83,7 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c device, object_path, connection_add_activate_cb, panel); out: -@@ -3150,6 +3166,11 @@ start_shared_connection (CcNetworkPanel +@@ -3323,6 +3339,11 @@ start_shared_connection (CcNetworkPanel "id", "Hotspot", "autoconnect", FALSE, NULL); @@ -95,7 +95,7 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c nm_connection_add_setting (c, (NMSetting *)sc); sw = (NMSettingWireless *)nm_setting_wireless_new (); -@@ -3373,6 +3394,24 @@ network_add_shell_header_widgets_cb (gpo +@@ -3548,6 +3569,24 @@ network_add_shell_header_widgets_cb (gpo } static void @@ -120,7 +120,7 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c cc_network_panel_init (CcNetworkPanel *panel) { DBusGConnection *bus = NULL; -@@ -3387,6 +3426,9 @@ cc_network_panel_init (CcNetworkPanel *p +@@ -3562,6 +3601,9 @@ cc_network_panel_init (CcNetworkPanel *p GtkTreeSortable *sortable; GtkWidget *widget; GtkWidget *toplevel; @@ -130,7 +130,7 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c panel->priv = NETWORK_PANEL_PRIVATE (panel); -@@ -3666,6 +3708,28 @@ cc_network_panel_init (CcNetworkPanel *p +@@ -3841,6 +3883,28 @@ cc_network_panel_init (CcNetworkPanel *p /* add kill switch widgets when dialog activated */ panel->priv->add_header_widgets_idle = g_idle_add (network_add_shell_header_widgets_cb, panel); @@ -159,7 +159,7 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c } void -@@ -3676,3 +3740,9 @@ cc_network_panel_register (GIOModule *mo +@@ -3851,3 +3915,9 @@ cc_network_panel_register (GIOModule *mo CC_TYPE_NETWORK_PANEL, "network", 0); } @@ -169,10 +169,10 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c +{ + return panel->priv->default_private; +} -Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.h +Index: gnome-control-center-3.5.4/panels/network/cc-network-panel.h =================================================================== ---- gnome-control-center-3.4.2.orig/panels/network/cc-network-panel.h -+++ gnome-control-center-3.4.2/panels/network/cc-network-panel.h +--- gnome-control-center-3.5.4.orig/panels/network/cc-network-panel.h ++++ gnome-control-center-3.5.4/panels/network/cc-network-panel.h @@ -67,6 +67,8 @@ GType cc_network_panel_get_type (void) G void cc_network_panel_register (GIOModule *module); @@ -182,10 +182,10 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.h G_END_DECLS #endif /* _CC_NETWORK_PANEL_H */ -Index: gnome-control-center-3.4.2/panels/network/network-dialogs.c +Index: gnome-control-center-3.5.4/panels/network/network-dialogs.c =================================================================== ---- gnome-control-center-3.4.2.orig/panels/network/network-dialogs.c -+++ gnome-control-center-3.4.2/panels/network/network-dialogs.c +--- gnome-control-center-3.5.4.orig/panels/network/network-dialogs.c ++++ gnome-control-center-3.5.4/panels/network/network-dialogs.c @@ -41,6 +41,7 @@ typedef struct { NMClient *client; NMRemoteSettings *settings; diff --git a/gnome-control-center-3.4.2.tar.xz b/gnome-control-center-3.4.2.tar.xz deleted file mode 100644 index 07ec3ec..0000000 --- a/gnome-control-center-3.4.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efc72bf8af07b439f5f0e9135d1b2c5237e649e6a0f1ff3cf32bdd710421042a -size 4267688 diff --git a/gnome-control-center-3.5.91.tar.xz b/gnome-control-center-3.5.91.tar.xz new file mode 100644 index 0000000..ad93638 --- /dev/null +++ b/gnome-control-center-3.5.91.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f18986c1b783b550d8121189abdec7370b2b4e22f0d92ca07c9826eae79a37bd +size 4702224 diff --git a/gnome-control-center-allow-wallpapers-with-weird-names.patch b/gnome-control-center-allow-wallpapers-with-weird-names.patch deleted file mode 100644 index 6337103..0000000 --- a/gnome-control-center-allow-wallpapers-with-weird-names.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ae5b16f873869bce935cfaafad1964340f47e7d3 Mon Sep 17 00:00:00 2001 -From: Jon McCann -Date: Wed, 28 Mar 2012 19:10:32 +0000 -Subject: background: Escape wallpaper filename before display - -https://bugzilla.gnome.org/show_bug.cgi?id=673015 ---- -diff --git a/panels/background/cc-background-panel.c b/panels/background/cc-background-panel.c -index 1ec9188..47a920e 100644 ---- a/panels/background/cc-background-panel.c -+++ b/panels/background/cc-background-panel.c -@@ -340,8 +340,12 @@ update_preview (CcBackgroundPanelPrivate *priv, - if (priv->current_background) - { - GdkColor pcolor, scolor; -+ char *escaped; -+ -+ escaped = g_markup_escape_text (cc_background_item_get_name (priv->current_background), -1); -+ markup = g_strdup_printf ("%s", escaped); -+ g_free (escaped); - -- markup = g_strdup_printf ("%s", cc_background_item_get_name (priv->current_background)); - gtk_label_set_markup (GTK_LABEL (WID ("background-label")), markup); - g_free (markup); - --- -cgit v0.9.0.2 diff --git a/gnome-control-center-allow-yast-in-shell.patch b/gnome-control-center-allow-yast-in-shell.patch index b7b54e4..911109e 100644 --- a/gnome-control-center-allow-yast-in-shell.patch +++ b/gnome-control-center-allow-yast-in-shell.patch @@ -1,11 +1,12 @@ -Index: gnome-control-center-3.2.0/shell/gnome-control-center.c +Index: gnome-control-center-3.5.90/shell/gnome-control-center.c =================================================================== ---- gnome-control-center-3.2.0.orig/shell/gnome-control-center.c -+++ gnome-control-center-3.2.0/shell/gnome-control-center.c -@@ -110,6 +110,39 @@ get_icon_name_from_g_icon (GIcon *gicon) +--- gnome-control-center-3.5.90.orig/shell/gnome-control-center.c ++++ gnome-control-center-3.5.90/shell/gnome-control-center.c +@@ -172,6 +172,39 @@ get_icon_name_from_g_icon (GIcon *gicon) + return NULL; } - static void ++static void +suse_activate_desktop (GnomeControlCenter *shell, + const gchar *id, + const gchar *desktop_file) @@ -38,20 +39,19 @@ Index: gnome-control-center-3.2.0/shell/gnome-control-center.c + g_object_unref (appinfo); +} + -+static void + static gboolean activate_panel (GnomeControlCenter *shell, const gchar *id, - const gchar **argv, -@@ -127,6 +160,12 @@ activate_panel (GnomeControlCenter *shel - if (!desktop_file) - return; +@@ -195,6 +228,12 @@ activate_panel (GnomeControlCenter *shel + if (!id) + return FALSE; + if (g_strcmp0 (id, "YaST.desktop") == 0) + { + suse_activate_desktop (shell, id, desktop_file); -+ return; ++ return TRUE; + } + - if (id) + for (l = panels; l != NULL; l = l->next) { - + GIOExtension *extension; diff --git a/gnome-control-center-fix-crash-on-hidden-ssid.patch b/gnome-control-center-fix-crash-on-hidden-ssid.patch deleted file mode 100644 index f9513a3..0000000 --- a/gnome-control-center-fix-crash-on-hidden-ssid.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit 8631717b3d1cb85bf21b0e0d648b784e8e7c3f8f -Author: Dan Williams -Date: Fri Apr 20 11:48:17 2012 -0500 - - network: don't crash on hidden SSIDs - - APs that don't broadcast their SSID will return NULL from - nm_access_point_get_ssid() (since that's easier to check in C - using an if statement than returning a zero-length GByteArray). - Thus the code shouldn't try to dereference the SSID byte array - since it could be NULL. - - But in fact, the panel shouldn't be showing hidden APs anywhere - in the UI, since the user needs to manually enter the SSID to - connect to it anyway. So just ignore hidden APs like nm-applet - does. - - Signed-off-by: Dan Williams - Signed-off-by: Richard Hughes - -diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c -index c8cbd78..d5ab951 100644 ---- a/panels/network/cc-network-panel.c -+++ b/panels/network/cc-network-panel.c -@@ -1124,13 +1124,19 @@ panel_get_strongest_unique_aps (const GPtrArray *aps) - if (aps != NULL) - for (i = 0; i < aps->len; i++) { - ap = NM_ACCESS_POINT (g_ptr_array_index (aps, i)); -+ -+ /* Hidden SSIDs don't get shown in the list */ - ssid = nm_access_point_get_ssid (ap); -+ if (!ssid) -+ continue; -+ - add_ap = TRUE; - - /* get already added list */ - for (j=0; jlen; j++) { - ap_tmp = NM_ACCESS_POINT (g_ptr_array_index (aps_unique, j)); - ssid_tmp = nm_access_point_get_ssid (ap_tmp); -+ g_assert (ssid_tmp); - - /* is this the same type and data? */ - if (nm_utils_same_ssid (ssid, ssid_tmp, TRUE)) { diff --git a/gnome-control-center-fix-screen-brightness.patch b/gnome-control-center-fix-screen-brightness.patch deleted file mode 100644 index 91e4e6a..0000000 --- a/gnome-control-center-fix-screen-brightness.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 570478bcae6c872a4903118fdae25cb72cb5a027 Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna -Date: Fri, 08 Jun 2012 21:01:10 +0000 -Subject: screen: Fix for gnome-settings-daemon changes - -g-s-d changed its DBus interface, and that made all -external changes to brightness invisible to the panel. Update -accordingly. - -https://bugzilla.gnome.org/show_bug.cgi?id=662117 ---- -Index: gnome-control-center-3.4.2/panels/screen/cc-screen-panel.c -=================================================================== ---- gnome-control-center-3.4.2.orig/panels/screen/cc-screen-panel.c -+++ gnome-control-center-3.4.2/panels/screen/cc-screen-panel.c -@@ -169,33 +169,6 @@ cc_screen_panel_class_finalize (CcScreen - } - - static void --on_signal (GDBusProxy *proxy, -- gchar *sender_name, -- gchar *signal_name, -- GVariant *parameters, -- gpointer user_data) --{ -- CcScreenPanel *self = CC_SCREEN_PANEL (user_data); -- -- if (g_strcmp0 (signal_name, "BrightnessChanged") == 0) -- { -- guint brightness; -- GtkRange *range; -- -- /* changed, but ignoring */ -- if (self->priv->setting_brightness) -- return; -- -- /* update the bar */ -- g_variant_get (parameters, -- "(u)", -- &brightness); -- range = GTK_RANGE (WID ("screen_brightness_hscale")); -- gtk_range_set_value (range, brightness); -- } --} -- --static void - set_brightness_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) - { - GError *error = NULL; -@@ -276,6 +249,34 @@ get_brightness_cb (GObject *source_objec - } - - static void -+on_signal (GDBusProxy *proxy, -+ gchar *sender_name, -+ gchar *signal_name, -+ GVariant *parameters, -+ gpointer user_data) -+{ -+ CcScreenPanel *self = CC_SCREEN_PANEL (user_data); -+ -+ if (g_strcmp0 (signal_name, "Changed") == 0) -+ { -+ /* changed, but ignoring */ -+ if (self->priv->setting_brightness) -+ return; -+ -+ /* retrieve the value again from g-s-d */ -+ g_dbus_proxy_call (self->priv->proxy, -+ "GetPercentage", -+ NULL, -+ G_DBUS_CALL_FLAGS_NONE, -+ 200, /* we don't want to randomly move the bar */ -+ self->priv->cancellable, -+ get_brightness_cb, -+ user_data); -+ } -+} -+ -+ -+static void - got_power_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) - { - GError *error = NULL; diff --git a/gnome-control-center-shortcut-assignment-fixes.patch b/gnome-control-center-shortcut-assignment-fixes.patch deleted file mode 100644 index 89dfb3e..0000000 --- a/gnome-control-center-shortcut-assignment-fixes.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 8560cf39a214d973e24667fcc82a192fd18251c4 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 16 Jul 2012 16:03:36 +0000 -Subject: shell: Fix not being able to assign Ctrl+Q to a shortcut - -Because the shell window was capturing it before the key editing -cell had a change to get to it. - -s/g_signal_connect/g_signal_connect_after/ - -https://bugzilla.gnome.org/show_bug.cgi?id=671448 ---- -diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c -index b1c66b3..d046033 100644 ---- a/shell/gnome-control-center.c -+++ b/shell/gnome-control-center.c -@@ -1115,8 +1115,8 @@ gnome_control_center_init (GnomeControlCenter *self) - /* connect various signals */ - priv->window = W (priv->builder, "main-window"); - g_signal_connect_swapped (priv->window, "delete-event", G_CALLBACK (g_object_unref), self); -- g_signal_connect (priv->window, "key_press_event", -- G_CALLBACK (window_key_press_event), self); -+ g_signal_connect_after (priv->window, "key_press_event", -+ G_CALLBACK (window_key_press_event), self); - - priv->notebook = W (priv->builder, "notebook"); - priv->scrolled_window = W (priv->builder, "scrolledwindow1"); --- -cgit v0.9.0.2 - -From e5bfcb23d31310e73dc73c2af5a6230e772d115f Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 16 Jul 2012 17:05:04 +0000 -Subject: shell: Don't handle shortcuts with excess modifiers - -Ctrl+Alt+W shouldn't be handled the same way as Ctrl+W. - -https://bugzilla.gnome.org/show_bug.cgi?id=675475 ---- -diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c -index d046033..195a0a1 100644 ---- a/shell/gnome-control-center.c -+++ b/shell/gnome-control-center.c -@@ -1058,12 +1058,20 @@ window_key_press_event (GtkWidget *win, - GdkEventKey *event, - GnomeControlCenter *self) - { -+ GdkKeymap *keymap; - gboolean retval; -+ GdkModifierType state; -+ -+ if (event->state == 0) -+ return FALSE; - - retval = FALSE; -+ state = event->state; -+ keymap = gdk_keymap_get_default (); -+ gdk_keymap_add_virtual_modifiers (keymap, &state); -+ state = state & gtk_accelerator_get_default_mod_mask (); - -- if (event->state != 0 && -- (event->state & GDK_CONTROL_MASK)) -+ if (state == GDK_CONTROL_MASK) - { - switch (event->keyval) - { --- -cgit v0.9.0.2 diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 1c74124..ec7c8cc 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,248 @@ +------------------------------------------------------------------- +Tue Sep 4 21:32:36 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.91: + + Common: + - Fix memory leaks in language sorting + - Fix too big editable labels + + Date & Time: + - Make map look unsensitive when the panel is locked + + Display: + - Fix possible warning on exit + - Make 'Mirrored Displays' string consistent with + GnomeRRLabeler + + Info: + - Add PolicyKit rules for hostname setting + - Set related mime types when changing preferred apps + + Mouse: + - New testing area + - Remove italics from test page + - Fix left/right mouse-handedness radio buttons in RTL + languages + + Network: + - Ignore unrecognised device types + - Fix wired and mobile activations + - Don't try to activate slave connections + + Printers: + - Redesign the "new printer" dialogue + + Region & Language: + - Add Russian and Egyptian Arabic as common languages + - Don't use IBus in fallback mode + - Honor the 'show-all-sources' setting + - Don't block getting the IBus engines + - Expand the default list of input sources + + User Accounts: + - Simplify some drawing code + - Fix login keyring password not getting updated + - Fix match icon not updating in some cases. +- Drop gnome-control-center-bgpanel.patch: fixed upstream. + +------------------------------------------------------------------- +Tue Aug 21 20:47:06 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.90: + + Background: + - Implement new design + + Bluetooth: + - Require a newer version of gnome-bluetooth + + Keyboard: + - Add common keyboard layout related options to the shortcuts tab + + Mouse: + - Implement new design, including support for natural scroll + + Network: + - Improve the Wi-Fi page layout + + Online Accounts: + - Allow opening a particular account from the command-line + - Avoid spurious "No online accounts configured" overlay + - Fix crash when loading the panel a second time + + Shell: + - Remove animations, they were causing a number of problems, + but were a useful exercise for future developments. + + Sound: + - Remove hardware page, and offer different connectors directly + from the input and output pages + + Universal Access: + - Add zoom shader options, and reorganise zoom dialogue + + User Accounts: + - UI changes for better remote accounts support + - Fix crash with incompatible versions of realmd + + Wacom: + - Add support for "switch monitor" shortcut + + Updated translations. +- Add gnome-control-center-bgpanel.patch: add missing includes. + +------------------------------------------------------------------- +Wed Aug 8 18:09:34 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.6: + + Add man page + + Brightness & Lock: + - Make "show notifications" available even if we don't lock + the screen automatically + + Display: + - Fix possible error when the preferred mode is only + available on one of the two outputs in mirror mode + + Info: + - Adapt for changed API in PackageKit + - Small UI bug fixes + + Network: + - Refactoring for mobile broadband support and bug fixes + - Split the wireless panel + - Only show extra details for the active connection + - Add network strength to the details panel + - Only show the disconnect button when a device is fully + activated + - Fix crash with Access Points with non UTF-8 names + - Forget the last selected wireless network when the button is + clicked + - Improve hotspot dialogue + + Printers: + - Add support for CUPS 1.6 + - Don't restrict the PPD list to PPDs with DeviceIDs + - Cancel async operations correctly + - Move jobs to a separate dialogue + + Region: + - Make ibus code more robust + - Handle being opened twice gracefully + - Require ibus 1.4.99 if ibus support is requested + + User accounts: + - Update for realmd 0.6 + - Strip remote D-Bus errors from user-visible messages + - Fix memory leaks + + Wacom: + - Fix critical warning after calibration + - Only do calibration for the selected tool + + Updated translations. +- Disable gcc-private-connection.patch for now: needs rebasing. + +------------------------------------------------------------------- +Fri Aug 3 19:55:00 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.5: + + Brightness & Lock: + - Add a "Show Notifications" setting + + Keyboard: + - Fix a memory leak + - Fix some shortcuts used by the shell not being available for + capture + + Network: + - Fix a number of crashers that occurred after the network + panel was closed + - Make mobile broadband support usable + - Sort Wi-Fi access points by strength + - Fix VPN information + + Printers: + - Allow users to change printer's PPD file + - Add "Options" dialogue with more options than available + readily + + Power and User Accounts: + - Port to use GtkLevelBar + + Region: + - Add support for IBus input sources + + Sound: + - Move input streams when the default source changes + - Add backend code to track inputs and outputs in PulseAudio + 2.0 + + Wacom: + - Apply display rotation to devices + - Destroy the display mapping dialogue on unplug + - Show a mark when calibration succeeds. +- Add pkgconfig(ibus-1.0) BuildRequires: new dependency. + +------------------------------------------------------------------- +Fri Aug 3 19:37:04 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.4: + + Wacom: + - Fix crasher related to display matching. +- Rebase gcc-private-connection.patch. + +------------------------------------------------------------------- +Fri Aug 3 09:23:06 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.3: + + All: + - Use '&' instead of 'and', keeping the names shorter but also + keep the user focused on other words which compose the name + + Background: + - Make sure background can get cancelled + - Avoid escaped wallpaper name in the UI + + Brightness & Lock: + - Update slider when changing the brightness via keyboard keys + + Info: + - Add software media to "other media" dialogue + - Add title for the "other media" dialog + + Network: + - Don't crash on hidden SSIDs + - Fix packing order of children in the service dialog + - Add mnemonic for a number of controls + - Sort wireless first + - Make list of Access Points more similar to the shell menu + - Stop buttons jumping when switching between devices + + Online Accounts: + - Updated "Add Account" dialogue design + - Improve layout when there are no configured accounts + + Power: + - Fix reference to "Screen" settings + + Shell: + - Fix crash when using keynav in overview + - Don't animate between overview and search pages + - Use GtkSearchEntry + - Crasher fixes + + Sound: + - Add "audio" keyword + - Fix mouse scrolls and clicking behaviour on sliders + - Fix unmuting not working when dragging the event role slider + + User accounts: + - Add support for remote Kerberos accounts + + Wacom: + - Add keep aspect ratio option + - Cancel calibration if window loses focus. +- Add krb5-devel BuildRequires: new dependency. + +------------------------------------------------------------------- +Thu Aug 2 22:04:28 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.2: + + Shell: + - Many layout improvements + - Format search results in 3 columns + - Animate page switches + - Add an app menu + + User accounts: + - Make controls insensitive when no user selected + - Simplify generated password handling + - Use libpwquality for password quality checks + + Backgrounds: + - Ignore screenshots + - Only show supported image types + + Display: + - Translate the rotation drop-down again + + Info: + - Ignore NFS and removable mounts for disk size + + Network: + - Allow configuring wired network devices when not connected + + Universal Access: + - Redesign for consistency and smallness + + Printers: + - Set default media sizes + + Region: + - Replace layouts tab with input sources tab + + Wacom: + - Rename to "Wacom Tablet" + - Update ui on hotplug + - Disable on s390 and !linux + + Updated translations. +- Rebase gnome-control-center-allow-yast-in-shell.patch. +- Drop upstream fixed patches: + + gnome-control-center-fix-screen-brightness.patch + + gnome-control-center-shortcut-assignment-fixes.patch + + gnome-control-center-allow-wallpapers-with-weird-names.patch + + gnome-control-center-fix-crash-on-hidden-ssid.patch +- Drop pkgconfig(libgnomekbd), pkgconfig(libgnomekbdui) and + pkgconfig(libxklavier) BuildRequires: no longer needed. +- Add pkgconfig(clutter-gtk-1.0) BuildRequires: new dependency. + ------------------------------------------------------------------- Thu Aug 2 13:50:51 UTC 2012 - badshah400@gmail.com diff --git a/gnome-control-center.spec b/gnome-control-center.spec index b78a4f0..8a8d46d 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -21,14 +21,14 @@ %define with_systemd 0 Name: gnome-control-center -Version: 3.4.2 +Version: 3.5.91 Release: 0 # FIXME: in 12.2 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833) Summary: The GNOME Control Center License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org -Source: http://download.gnome.org/sources/gnome-control-center/3.4/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnome-control-center/3.5/%{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE gnome-control-center-allow-yast-in-shell.patch vuntz@opensuse.org -- Allow the launch of the yast shell from the g-c-c shell; it's quite ugly, but on the other hand, we don't want to change the behavior of the shell except for yast... Patch0: gnome-control-center-allow-yast-in-shell.patch # PATCH-HACK-OPENSUSE gnome-control-center-hide-region-system-tab.patch vuntz@opensuse.org -- Hide system tab in region panel until we really use the right files for system settings (see bnc#703833) @@ -37,58 +37,51 @@ Patch2: gnome-control-center-hide-region-system-tab.patch Patch3: gnome-control-center-fine-grained-tz-polkit.patch # PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream - docs at http://en.opensuse.org/GNOME/Proxy_configuration (was PATCH-FEATURE-OPENSUSE) Patch14: gnome-control-center-system-proxy-configuration.patch -# PATCH-FIX-UPSTREAM gcc-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- network: create private connections if the user if not authorized. +# PATCH-NEEDS-REBASE gcc-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- network: create private connections if the user if not authorized. (WAS: PATCH-FIX-UPSTREAM) 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-fix-crash-on-hidden-ssid.patch glin@suse.com -- network: don't crash on hidden ssid -Patch17: gnome-control-center-fix-crash-on-hidden-ssid.patch -# PATCH-FIX-UPSTREAM gnome-control-center-fix-screen-brightness.patch bgo#662117 bnc#774190 badshah400@gmail.com -- Fix brightness slider not picking up right brightness settings values; patch came from upstream git -Patch18: gnome-control-center-fix-screen-brightness.patch -# PATCH-FIX-UPSTREAM gnome-control-center-shortcut-assignment-fixes.patch bgo#675475 bgo#671448 badshah400@gmail.com -- Fix not being able to assign odd keyboard shortcuts (Ctrl+Q, etc); patch came from upstream git -Patch19: gnome-control-center-shortcut-assignment-fixes.patch -# PATCH-FIX-UPSTREAM gnome-control-center-allow-wallpapers-with-weird-names.patch bgo#673015 badshah400@gmail.com -- Wallpapers with weird names involving special characters; patch came from upstream git -Patch20: gnome-control-center-allow-wallpapers-with-weird-names.patch BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: intltool +BuildRequires: krb5-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: pkgconfig(cheese) BuildRequires: pkgconfig(cheese-gtk) >= 3.3.5 +BuildRequires: pkgconfig(clutter-gtk-1.0) BuildRequires: pkgconfig(colord) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.31.0 -BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.3.4 -BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.1.91 -BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.3.91 -BuildRequires: pkgconfig(goa-1.0) +BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.5.5 +BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.5.91 +BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.5.2 +BuildRequires: pkgconfig(goa-1.0) >= 3.5.90 BuildRequires: pkgconfig(goa-backend-1.0) -BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.3.0 +BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.5.91 BuildRequires: pkgconfig(gstreamer-0.10) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.5 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.5.13 +BuildRequires: pkgconfig(ibus-1.0) >= 1.4.99 BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libgnome-menu-3.0) -BuildRequires: pkgconfig(libgnomekbd) -BuildRequires: pkgconfig(libgnomekbdui) BuildRequires: pkgconfig(libgtop-2.0) BuildRequires: pkgconfig(libnm-glib) >= 0.8.992 BuildRequires: pkgconfig(libnm-gtk) >= 0.8.992 BuildRequires: pkgconfig(libnotify) >= 0.7.3 -BuildRequires: pkgconfig(libpulse) -BuildRequires: pkgconfig(libpulse-mainloop-glib) +BuildRequires: pkgconfig(libpulse) >= 2.0 +BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 2.0 %if %{with_systemd} BuildRequires: pkgconfig(libsystemd-login) %endif -BuildRequires: pkgconfig(libwacom) >= 0.3 -BuildRequires: pkgconfig(libxklavier) +BuildRequires: pkgconfig(libwacom) >= 0.5 BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103 +BuildRequires: pkgconfig(pwquality) BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcursor) @@ -171,12 +164,9 @@ translation-update-upstream %patch3 -p1 #NEEDS-REBASE #%patch14 -p1 -%patch15 -p1 +#NEEDS-REBASE +#patch15 -p1 %patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh @@ -248,10 +238,14 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/*/*.png %{_datadir}/icons/hicolor/*/*/*.svg %{_datadir}/polkit-1/actions/org.gnome.controlcenter.datetime.policy +%{_datadir}/polkit-1/actions/org.gnome.controlcenter.user-accounts.policy +%dir %{_datadir}/polkit-1/rules.d +%{_datadir}/polkit-1/rules.d/gnome-control-center.rules %dir %{_datadir}/sounds/gnome %dir %{_datadir}/sounds/gnome/default %dir %{_datadir}/sounds/gnome/default/alerts %{_datadir}/sounds/gnome/default/alerts/*.ogg +%{_mandir}/man1/gnome-control-center.1%{?ext_man} %files branding-upstream %defattr (-, root, root) From 269b3160ce3039d52701ef01cf531bf30b6fa21236a12a099436996f72cdf5ac Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 14 Sep 2012 12:37:21 +0000 Subject: [PATCH 2/7] Accepting request 133759 from home:vuntz:branches:GNOME:Factory Rebase patch; untested at runtime OBS-URL: https://build.opensuse.org/request/show/133759 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=156 --- gcc-private-connection.patch | 166 +++++++++++++++++------------------ gnome-control-center.changes | 5 ++ gnome-control-center.spec | 8 +- 3 files changed, 88 insertions(+), 91 deletions(-) diff --git a/gcc-private-connection.patch b/gcc-private-connection.patch index 63b2886..b6720a9 100644 --- a/gcc-private-connection.patch +++ b/gcc-private-connection.patch @@ -16,11 +16,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646187 panels/network/network-dialogs.c | 16 ++++++++ 4 files changed, 91 insertions(+), 2 deletions(-) -Index: gnome-control-center-3.5.4/configure.ac +Index: gnome-control-center-3.5.91/configure.ac =================================================================== ---- gnome-control-center-3.5.4.orig/configure.ac -+++ gnome-control-center-3.5.4/configure.ac -@@ -108,7 +108,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMO +--- gnome-control-center-3.5.91.orig/configure.ac ++++ gnome-control-center-3.5.91/configure.ac +@@ -136,7 +136,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMO PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES) PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11) @@ -30,12 +30,12 @@ Index: gnome-control-center-3.5.4/configure.ac 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 gnome-settings-daemon >= $GSD_REQUIRED_VERSION) -Index: gnome-control-center-3.5.4/panels/network/cc-network-panel.c +Index: gnome-control-center-3.5.91/panels/network/cc-network-panel.c =================================================================== ---- gnome-control-center-3.5.4.orig/panels/network/cc-network-panel.c -+++ gnome-control-center-3.5.4/panels/network/cc-network-panel.c -@@ -25,6 +25,8 @@ - #include +--- gnome-control-center-3.5.91.orig/panels/network/cc-network-panel.c ++++ gnome-control-center-3.5.91/panels/network/cc-network-panel.c +@@ -23,6 +23,8 @@ + #include #include +#include @@ -43,7 +43,7 @@ Index: gnome-control-center-3.5.4/panels/network/cc-network-panel.c #include "cc-network-panel.h" #include "nm-remote-settings.h" -@@ -88,6 +90,9 @@ struct _CcNetworkPanelPrivate +@@ -73,6 +75,9 @@ struct _CcNetworkPanelPrivate gchar *arg_device; gchar *arg_access_point; gboolean operation_done; @@ -53,75 +53,8 @@ Index: gnome-control-center-3.5.4/panels/network/cc-network-panel.c }; enum { -@@ -3000,8 +3005,10 @@ wireless_ap_changed_cb (GtkComboBox *com - NetObject *object; - NMConnection *connection; - NMConnection *connection_activate = NULL; -+ NMConnection *partial = NULL; - NMDevice *device; - NMSettingWireless *setting_wireless; -+ NMSettingConnection *setting_con; - - if (panel->priv->updating_device) - goto out; -@@ -3070,8 +3077,17 @@ wireless_ap_changed_cb (GtkComboBox *com - /* create one, as it's missing */ - g_debug ("no existing connection found for %s, creating", - ssid_target); -+ if (panel->priv->default_private) { -+ partial = nm_connection_new (); -+ setting_con = nm_setting_connection_new (); -+ nm_connection_add_setting (partial, NM_SETTING (setting_con)); -+ nm_setting_connection_add_permission (setting_con, -+ "user", -+ g_get_user_name(), -+ NULL); -+ } - nm_client_add_and_activate_connection (panel->priv->client, -- NULL, -+ partial, - device, object_path, - connection_add_activate_cb, panel); - out: -@@ -3323,6 +3339,11 @@ start_shared_connection (CcNetworkPanel - "id", "Hotspot", - "autoconnect", FALSE, - NULL); -+ if (panel->priv->default_private) -+ nm_setting_connection_add_permission (sc, -+ "user", -+ g_get_user_name(), -+ NULL); - nm_connection_add_setting (c, (NMSetting *)sc); - - sw = (NMSettingWireless *)nm_setting_wireless_new (); -@@ -3548,6 +3569,24 @@ network_add_shell_header_widgets_cb (gpo - } - - static void -+check_authorization_cb (PolkitAuthority *authority, -+ GAsyncResult *res, -+ gpointer user_data) -+{ -+ PolkitAuthorizationResult *result; -+ CcNetworkPanel *panel = user_data; -+ GError *error = NULL; -+ -+ result = polkit_authority_check_authorization_finish (authority, res, &error); -+ if (error != NULL) { -+ g_warning ("Failed to check authorization: %s", error->message); -+ g_error_free (error); -+ } else if (polkit_authorization_result_get_is_authorized (result)) { -+ panel->priv->default_private = FALSE; -+ } -+} -+ -+static void - cc_network_panel_init (CcNetworkPanel *panel) - { - DBusGConnection *bus = NULL; -@@ -3562,6 +3601,9 @@ cc_network_panel_init (CcNetworkPanel *p - GtkTreeSortable *sortable; +@@ -1027,6 +1032,9 @@ cc_network_panel_init (CcNetworkPanel *p + GtkTreeSelection *selection; GtkWidget *widget; GtkWidget *toplevel; + PolkitSubject *subject; @@ -130,7 +63,7 @@ Index: gnome-control-center-3.5.4/panels/network/cc-network-panel.c panel->priv = NETWORK_PANEL_PRIVATE (panel); -@@ -3841,6 +3883,28 @@ cc_network_panel_init (CcNetworkPanel *p +@@ -1112,6 +1120,28 @@ cc_network_panel_init (CcNetworkPanel *p /* add kill switch widgets when dialog activated */ panel->priv->add_header_widgets_idle = g_idle_add (network_add_shell_header_widgets_cb, panel); @@ -159,7 +92,7 @@ Index: gnome-control-center-3.5.4/panels/network/cc-network-panel.c } void -@@ -3851,3 +3915,9 @@ cc_network_panel_register (GIOModule *mo +@@ -1122,3 +1152,9 @@ cc_network_panel_register (GIOModule *mo CC_TYPE_NETWORK_PANEL, "network", 0); } @@ -169,10 +102,10 @@ Index: gnome-control-center-3.5.4/panels/network/cc-network-panel.c +{ + return panel->priv->default_private; +} -Index: gnome-control-center-3.5.4/panels/network/cc-network-panel.h +Index: gnome-control-center-3.5.91/panels/network/cc-network-panel.h =================================================================== ---- gnome-control-center-3.5.4.orig/panels/network/cc-network-panel.h -+++ gnome-control-center-3.5.4/panels/network/cc-network-panel.h +--- gnome-control-center-3.5.91.orig/panels/network/cc-network-panel.h ++++ gnome-control-center-3.5.91/panels/network/cc-network-panel.h @@ -67,6 +67,8 @@ GType cc_network_panel_get_type (void) G void cc_network_panel_register (GIOModule *module); @@ -182,10 +115,10 @@ Index: gnome-control-center-3.5.4/panels/network/cc-network-panel.h G_END_DECLS #endif /* _CC_NETWORK_PANEL_H */ -Index: gnome-control-center-3.5.4/panels/network/network-dialogs.c +Index: gnome-control-center-3.5.91/panels/network/network-dialogs.c =================================================================== ---- gnome-control-center-3.5.4.orig/panels/network/network-dialogs.c -+++ gnome-control-center-3.5.4/panels/network/network-dialogs.c +--- gnome-control-center-3.5.91.orig/panels/network/network-dialogs.c ++++ gnome-control-center-3.5.91/panels/network/network-dialogs.c @@ -41,6 +41,7 @@ typedef struct { NMClient *client; NMRemoteSettings *settings; @@ -251,3 +184,62 @@ Index: gnome-control-center-3.5.4/panels/network/network-dialogs.c caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device)); if (caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) { +Index: gnome-control-center-3.5.91/panels/network/net-device-wifi.c +=================================================================== +--- gnome-control-center-3.5.91.orig/panels/network/net-device-wifi.c ++++ gnome-control-center-3.5.91/panels/network/net-device-wifi.c +@@ -977,6 +977,9 @@ wireless_try_to_connect (NetDeviceWifi * + NMSettingWireless *setting_wireless; + NMRemoteSettings *remote_settings; + NMClient *client; ++ CcNetworkPanel *panel; ++ NMConnection *partial = NULL; ++ NMSettingConnection *setting_con; + + if (device_wifi->priv->updating_device) + goto out; +@@ -1038,8 +1041,20 @@ wireless_try_to_connect (NetDeviceWifi * + /* create one, as it's missing */ + g_debug ("no existing connection found for %s, creating", + ssid_target); ++ ++ panel = net_object_get_panel (NET_OBJECT (device_wifi)); ++ if (cc_network_panel_get_default_private (panel)) { ++ partial = nm_connection_new (); ++ setting_con = (NMSettingConnection *)nm_setting_connection_new (); ++ nm_connection_add_setting (partial, NM_SETTING (setting_con)); ++ nm_setting_connection_add_permission (setting_con, ++ "user", ++ g_get_user_name(), ++ NULL); ++ } ++ + nm_client_add_and_activate_connection (client, +- NULL, ++ partial, + device, object_path, + connection_add_activate_cb, device_wifi); + out: +@@ -1296,6 +1311,7 @@ start_shared_connection (NetDeviceWifi * + GSList *l; + NMClient *client; + NMRemoteSettings *remote_settings; ++ CcNetworkPanel *panel; + + device = net_device_get_nm_device (NET_DEVICE (device_wifi)); + g_assert (nm_device_get_device_type (device) == NM_DEVICE_TYPE_WIFI); +@@ -1335,6 +1351,14 @@ start_shared_connection (NetDeviceWifi * + "id", "Hotspot", + "autoconnect", FALSE, + NULL); ++ ++ panel = net_object_get_panel (NET_OBJECT (device_wifi)); ++ if (cc_network_panel_get_default_private (panel)) ++ nm_setting_connection_add_permission (sc, ++ "user", ++ g_get_user_name(), ++ NULL); ++ + nm_connection_add_setting (c, (NMSetting *)sc); + + sw = (NMSettingWireless *)nm_setting_wireless_new (); diff --git a/gnome-control-center.changes b/gnome-control-center.changes index ec7c8cc..2e3f9ca 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 12 09:38:20 UTC 2012 - vuntz@opensuse.org + +- Rebase gcc-private-connection.patch. + ------------------------------------------------------------------- Tue Sep 4 21:32:36 UTC 2012 - dimstar@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 8a8d46d..827daee 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -23,7 +23,8 @@ Name: gnome-control-center Version: 3.5.91 Release: 0 -# FIXME: in 12.2 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833) +# FIXME: stop owning %%{_datadir}/polkit-1/rules.d once polkit >= 0.106 is in (should be soon-ish, end of 09/2012) +# 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 License: GPL-2.0+ Group: System/GUI/GNOME @@ -37,7 +38,7 @@ Patch2: gnome-control-center-hide-region-system-tab.patch Patch3: gnome-control-center-fine-grained-tz-polkit.patch # PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream - docs at http://en.opensuse.org/GNOME/Proxy_configuration (was PATCH-FEATURE-OPENSUSE) Patch14: gnome-control-center-system-proxy-configuration.patch -# PATCH-NEEDS-REBASE gcc-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- network: create private connections if the user if not authorized. (WAS: PATCH-FIX-UPSTREAM) +# PATCH-FIX-UPSTREAM gcc-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- network: create private connections if the user if not authorized 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 @@ -164,8 +165,7 @@ translation-update-upstream %patch3 -p1 #NEEDS-REBASE #%patch14 -p1 -#NEEDS-REBASE -#patch15 -p1 +%patch15 -p1 %patch16 -p1 %if 0%{?BUILD_FROM_VCS} From 970764e716e74b2bebc619b33ac1627fea1f278c1b8e3fde6067a6a4ca04e81f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 21 Sep 2012 20:32:52 +0000 Subject: [PATCH 3/7] Accepting request 134742 from home:Zaitor:branches:GNOME:Factory Update + rebase of patch, rebase only buildtested. Further, should we do something about the insane amounts of lintwarnings for the missing ; in .desktop file OBS-URL: https://build.opensuse.org/request/show/134742 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=157 --- gcc-private-connection.patch | 4 +-- gnome-control-center-3.5.91.tar.xz | 3 -- gnome-control-center-3.5.92.tar.xz | 3 ++ gnome-control-center.changes | 47 ++++++++++++++++++++++++++++++ gnome-control-center.spec | 6 ++-- 5 files changed, 55 insertions(+), 8 deletions(-) delete mode 100644 gnome-control-center-3.5.91.tar.xz create mode 100644 gnome-control-center-3.5.92.tar.xz diff --git a/gcc-private-connection.patch b/gcc-private-connection.patch index b6720a9..5bc70be 100644 --- a/gcc-private-connection.patch +++ b/gcc-private-connection.patch @@ -198,7 +198,7 @@ Index: gnome-control-center-3.5.91/panels/network/net-device-wifi.c if (device_wifi->priv->updating_device) goto out; -@@ -1038,8 +1041,20 @@ wireless_try_to_connect (NetDeviceWifi * +@@ -1153,8 +1153,20 @@ /* create one, as it's missing */ g_debug ("no existing connection found for %s, creating", ssid_target); @@ -217,7 +217,7 @@ Index: gnome-control-center-3.5.91/panels/network/net-device-wifi.c nm_client_add_and_activate_connection (client, - NULL, + partial, - device, object_path, + device, ap_object_path, connection_add_activate_cb, device_wifi); out: @@ -1296,6 +1311,7 @@ start_shared_connection (NetDeviceWifi * diff --git a/gnome-control-center-3.5.91.tar.xz b/gnome-control-center-3.5.91.tar.xz deleted file mode 100644 index ad93638..0000000 --- a/gnome-control-center-3.5.91.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f18986c1b783b550d8121189abdec7370b2b4e22f0d92ca07c9826eae79a37bd -size 4702224 diff --git a/gnome-control-center-3.5.92.tar.xz b/gnome-control-center-3.5.92.tar.xz new file mode 100644 index 0000000..f244b53 --- /dev/null +++ b/gnome-control-center-3.5.92.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a247551c86972c4ed24bfccbd1b77d7b72226213d08513e4396795a3b792568c +size 4787184 diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 2e3f9ca..e0dfe7c 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,50 @@ +------------------------------------------------------------------- +Mon Sep 17 19:52:45 UTC 2012 - zaitor@opensuse.org + +- Update to version 3.5.92: + + Ensure that all sources are GPLv2+ instead of a mix of GPLv2+ + and GPLv3+. + + Set blank window titles for a number of dialogues. + + Fix accessible labels for switches. + + Bluetooth: + - Fix setting up dial-up networking for phones. + + Display: + - Fix mouse events not working in preview. + + Background: + - Use a more varied colour palette. + - Fix the small size of the "changes throughout the day" + emblem. + + Network: + - Mark all rows representing saved connections as such. + - Make the 'Settings...' buttons work properly. + - Handle disconnected APs better. + - Show a "Connect" button for disconnected APs. + - Show 'Last used' item for non-active, in-range access points. + - Improve the Wi-Fi list appearance. + + User Accounts: + - Use GStreamer 1.0 + - Fix "enterpise" typo + + Power: + - Fix a wrong use of GCancellable that could lead to crashes. + + Region: + - Use consistent strings for layout/engine names. + - Handle empty layout sources, especially when adding a new + one. + - Handle input sources in the system tab. + - Fix layout problem on the system tab. + - Update IBus engines whitelist. + + Printers: + - Fix building against CUPS 1.6. + + Universal Access: + - Fix whitespace in the zoom options dialogue. + + Screen & Brightness: + - Make notification checkbox focusable. + + Wacom: + - Fix link to docs. +- Exchange pkgconfig(gstreamer-0.10) BuildRequires for + pkgconfig(gstreamer-1.0) BuildRequires, due to upstream changes. +- Rebase gcc-private-connection.patch. + ------------------------------------------------------------------- Wed Sep 12 09:38:20 UTC 2012 - vuntz@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 827daee..b250e3d 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -21,7 +21,7 @@ %define with_systemd 0 Name: gnome-control-center -Version: 3.5.91 +Version: 3.5.92 Release: 0 # FIXME: stop owning %%{_datadir}/polkit-1/rules.d once polkit >= 0.106 is in (should be soon-ish, end of 09/2012) # FIXME: in 12.3 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833) @@ -51,7 +51,7 @@ BuildRequires: krb5-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: pkgconfig(cheese) -BuildRequires: pkgconfig(cheese-gtk) >= 3.3.5 +BuildRequires: pkgconfig(cheese-gtk) >= 3.3.91 BuildRequires: pkgconfig(clutter-gtk-1.0) BuildRequires: pkgconfig(colord) BuildRequires: pkgconfig(fontconfig) @@ -79,7 +79,7 @@ BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 2.0 %if %{with_systemd} BuildRequires: pkgconfig(libsystemd-login) %endif -BuildRequires: pkgconfig(libwacom) >= 0.5 +BuildRequires: pkgconfig(libwacom) >= 0.6 BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103 BuildRequires: pkgconfig(pwquality) From 07c93d51587116a83976976fbb0f0aa3d518d976992f4108d95043d4796a27bf Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 21 Sep 2012 20:33:47 +0000 Subject: [PATCH 4/7] Accepting request 135302 from GNOME:Next tweak OBS-URL: https://build.opensuse.org/request/show/135302 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=158 --- gnome-control-center.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-control-center.changes b/gnome-control-center.changes index e0dfe7c..9fd2c49 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -41,7 +41,7 @@ Mon Sep 17 19:52:45 UTC 2012 - zaitor@opensuse.org - Make notification checkbox focusable. + Wacom: - Fix link to docs. -- Exchange pkgconfig(gstreamer-0.10) BuildRequires for +- Replace pkgconfig(gstreamer-0.10) BuildRequires with pkgconfig(gstreamer-1.0) BuildRequires, due to upstream changes. - Rebase gcc-private-connection.patch. From 7af7feb3b27d76135255a287ffb4cfef553e6d8cc5a71343f536094475911368 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 25 Sep 2012 20:23:40 +0000 Subject: [PATCH 5/7] Accepting request 135965 from home:dimstar:branches:GNOME:Factory Update to 3.6.0 - tired of witing for OBS.. it does build locally OBS-URL: https://build.opensuse.org/request/show/135965 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=159 --- gnome-control-center-3.5.92.tar.xz | 3 --- gnome-control-center-3.6.0.tar.xz | 3 +++ gnome-control-center.changes | 14 ++++++++++++++ gnome-control-center.spec | 4 ++-- 4 files changed, 19 insertions(+), 5 deletions(-) delete mode 100644 gnome-control-center-3.5.92.tar.xz create mode 100644 gnome-control-center-3.6.0.tar.xz diff --git a/gnome-control-center-3.5.92.tar.xz b/gnome-control-center-3.5.92.tar.xz deleted file mode 100644 index f244b53..0000000 --- a/gnome-control-center-3.5.92.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a247551c86972c4ed24bfccbd1b77d7b72226213d08513e4396795a3b792568c -size 4787184 diff --git a/gnome-control-center-3.6.0.tar.xz b/gnome-control-center-3.6.0.tar.xz new file mode 100644 index 0000000..e067676 --- /dev/null +++ b/gnome-control-center-3.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d58d0ccc3defe622f66f4ce8e1229e443f4f57c58f85eecde12b642b8a8e893 +size 4803664 diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 9fd2c49..01f5352 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Sep 25 14:36:45 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.6.0: + + Network: + - Make connecting to Enterprise WPA Wi-Fi networks work again. + + Region: + - Jump directly to the correct shortcuts section when following + the link. + + Shell: + - Fix broken panels when launching the same one twice + + User Accounts: + - Don't ask for the old password when none is set. + ------------------------------------------------------------------- Mon Sep 17 19:52:45 UTC 2012 - zaitor@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index b250e3d..3d5ae4a 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -21,7 +21,7 @@ %define with_systemd 0 Name: gnome-control-center -Version: 3.5.92 +Version: 3.6.0 Release: 0 # FIXME: stop owning %%{_datadir}/polkit-1/rules.d once polkit >= 0.106 is in (should be soon-ish, end of 09/2012) # FIXME: in 12.3 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833) @@ -29,7 +29,7 @@ Summary: The GNOME Control Center License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org -Source: http://download.gnome.org/sources/gnome-control-center/3.5/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnome-control-center/3.6/%{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE gnome-control-center-allow-yast-in-shell.patch vuntz@opensuse.org -- Allow the launch of the yast shell from the g-c-c shell; it's quite ugly, but on the other hand, we don't want to change the behavior of the shell except for yast... Patch0: gnome-control-center-allow-yast-in-shell.patch # PATCH-HACK-OPENSUSE gnome-control-center-hide-region-system-tab.patch vuntz@opensuse.org -- Hide system tab in region panel until we really use the right files for system settings (see bnc#703833) From 29b2210bf0239ecb9b1d29176ad9c8fe20cdb45f6c23b1c5800f8cd739bcec5a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 29 Sep 2012 19:40:57 +0000 Subject: [PATCH 6/7] Accepting request 136433 from GNOME:Next - Really replace pkgconfig(gstreamer-0.10) BuildRequires with pkgconfig(gstreamer-1.0): cheese-devel already correctly pulled in gstreamer 1.0 devel files, so there is no factual change now. But it stops us from pulling in GStreamer 0.10 while we don't need it anymore. OBS-URL: https://build.opensuse.org/request/show/136433 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=160 --- gnome-control-center.changes | 9 +++++++++ gnome-control-center.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 01f5352..e8a6d41 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Sep 29 19:31:29 UTC 2012 - dimstar@opensuse.org + +- Really replace pkgconfig(gstreamer-0.10) BuildRequires with + pkgconfig(gstreamer-1.0): cheese-devel already correctly pulled + in gstreamer 1.0 devel files, so there is no factual change now. + But it stops us from pulling in GStreamer 0.10 while we don't + need it anymore. + ------------------------------------------------------------------- Tue Sep 25 14:36:45 UTC 2012 - dimstar@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 3d5ae4a..c56e702 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -64,7 +64,7 @@ BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.5.2 BuildRequires: pkgconfig(goa-1.0) >= 3.5.90 BuildRequires: pkgconfig(goa-backend-1.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.5.91 -BuildRequires: pkgconfig(gstreamer-0.10) +BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.5.13 BuildRequires: pkgconfig(ibus-1.0) >= 1.4.99 BuildRequires: pkgconfig(iso-codes) From 378728d9f18b94d2182d74f6c7f3bbba63974cf2cb9785da0a622ef2b12c3a08 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 5 Oct 2012 08:54:11 +0000 Subject: [PATCH 7/7] Accepting request 136625 from home:dimstar:branches:GNOME:Factory - Add with_ibus condition (currently set to 0), as we do not have a recent enough version of IBus in Factory at this moment. + when with_ibus is set to 1; pkconfig(ibus) BuildRequires will be used and --enable-ibus is being passed to configure + when with_ibus is set to 0, pkgconfigu(ibus) is being ignored and --disable-ibus is being passed to configure. OBS-URL: https://build.opensuse.org/request/show/136625 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=161 --- gnome-control-center.changes | 10 ++++++++++ gnome-control-center.spec | 12 +++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/gnome-control-center.changes b/gnome-control-center.changes index e8a6d41..db0340b 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Oct 2 16:29:27 UTC 2012 - dimstar@opensuse.org + +- Add with_ibus condition (currently set to 0), as we do not have + a recent enough version of IBus in Factory at this moment. + + when with_ibus is set to 1; pkconfig(ibus) BuildRequires will + be used and --enable-ibus is being passed to configure + + when with_ibus is set to 0, pkgconfigu(ibus) is being ignored + and --disable-ibus is being passed to configure. + ------------------------------------------------------------------- Sat Sep 29 19:31:29 UTC 2012 - dimstar@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index c56e702..6a836fa 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -20,6 +20,9 @@ # lose ConsoleKit support (bad for sysvinit) %define with_systemd 0 +# We can currently not build ibus support, as it requires ibus 1.5, which has not been released yet. +%define with_ibus 0 + Name: gnome-control-center Version: 3.6.0 Release: 0 @@ -66,7 +69,9 @@ BuildRequires: pkgconfig(goa-backend-1.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.5.91 BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.5.13 +%if %{with_ibus} BuildRequires: pkgconfig(ibus-1.0) >= 1.4.99 +%endif BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libgnome-menu-3.0) @@ -180,7 +185,12 @@ NOCONFIGURE=1 gnome-autogen.sh --enable-systemd\ %endif --disable-static\ - --disable-maintainer-mode + --disable-maintainer-mode\ +%if %{with_ibus} + --enable-ibus +%else + --disable-ibus +%endif make %{?_smp_mflags} V=1 %install