From 3c01e29ae858c6d57c162af1ac2d4cf094ebfb8b2db24fba93a23ed8cbb0e81d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 2 Sep 2016 17:12:16 +0000 Subject: [PATCH 1/7] Accepting request 424514 from home:zhangxiaofei:branches:GNOME:Factory - Update gnome-control-center-allow-extra-tools-in-shell.patch: + Fix leak of strings. + Add tools with category X-GNOME-DesktopSettings into the personal g-c-c category to enable itweb-settings. + Disable logspam in absence of optional components (bnc#866235 bsc#952008). - Specfile cleanup: + fix one mismatched patch tag; + abbreviate lengthy summary of one patch tag - Changelog format: + remove trailing spaces OBS-URL: https://build.opensuse.org/request/show/424514 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=327 --- ...ol-center-allow-extra-tools-in-shell.patch | 140 +++++++----------- gnome-control-center.changes | 138 +++++++++-------- gnome-control-center.spec | 4 +- 3 files changed, 129 insertions(+), 153 deletions(-) diff --git a/gnome-control-center-allow-extra-tools-in-shell.patch b/gnome-control-center-allow-extra-tools-in-shell.patch index 27a9690..2f0c00e 100644 --- a/gnome-control-center-allow-extra-tools-in-shell.patch +++ b/gnome-control-center-allow-extra-tools-in-shell.patch @@ -1,81 +1,41 @@ -From fbdfce5abb17cae9a1b9b8df8f3c5f87af345789 Mon Sep 17 00:00:00 2001 +From 8469e4ac57f3b5d3efbf533ba23512612997ffff Mon Sep 17 00:00:00 2001 From: Felix Zhang -Date: Thu, 12 Jun 2014 20:17:05 +0800 +Date: Fri, 2 Sep 2016 14:55:12 +0800 Subject: [PATCH] allow extra tools in shell --- - shell/cc-panel-loader.c | 61 ++++++++++++++++++++++++++++++------------------- - shell/cc-window.c | 43 ++++++++++++++++++++++++++++++++++ - 2 files changed, 81 insertions(+), 23 deletions(-) + shell/cc-panel-loader.c | 28 ++++++++++++++++++++++++++-- + shell/cc-window.c | 41 +++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 67 insertions(+), 2 deletions(-) -Index: gnome-control-center-3.17.90/shell/cc-panel-loader.c -=================================================================== ---- gnome-control-center-3.17.90.orig/shell/cc-panel-loader.c -+++ gnome-control-center-3.17.90/shell/cc-panel-loader.c -@@ -73,35 +73,41 @@ static struct { - GType (*get_type)(void); - #endif - } all_panels[] = { -- PANEL_TYPE("background", cc_background_panel_get_type ), -+ PANEL_TYPE("background", cc_background_panel_get_type ), - #ifdef BUILD_BLUETOOTH -- PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ), -+ PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ), - #endif -- PANEL_TYPE("color", cc_color_panel_get_type ), -- PANEL_TYPE("datetime", cc_date_time_panel_get_type ), -- PANEL_TYPE("display", cc_display_panel_get_type ), -- PANEL_TYPE("info", cc_info_panel_get_type ), -- PANEL_TYPE("keyboard", cc_keyboard_panel_get_type ), -- PANEL_TYPE("mouse", cc_mouse_panel_get_type ), -+ PANEL_TYPE("color", cc_color_panel_get_type ), -+ PANEL_TYPE("datetime", cc_date_time_panel_get_type ), -+ PANEL_TYPE("display", cc_display_panel_get_type ), -+ PANEL_TYPE("info", cc_info_panel_get_type ), -+ PANEL_TYPE("keyboard", cc_keyboard_panel_get_type ), -+ PANEL_TYPE("mouse", cc_mouse_panel_get_type ), - #ifdef BUILD_NETWORK -- PANEL_TYPE("network", cc_network_panel_get_type ), -+ PANEL_TYPE("network", cc_network_panel_get_type ), - #endif -- PANEL_TYPE("notifications", cc_notifications_panel_get_type), -- PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), -- PANEL_TYPE("power", cc_power_panel_get_type ), -+ PANEL_TYPE("notifications", cc_notifications_panel_get_type), -+ PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), -+ PANEL_TYPE("power", cc_power_panel_get_type ), - #ifdef BUILD_PRINTERS -- PANEL_TYPE("printers", cc_printers_panel_get_type ), -+ PANEL_TYPE("printers", cc_printers_panel_get_type ), - #endif -- PANEL_TYPE("privacy", cc_privacy_panel_get_type ), -- PANEL_TYPE("region", cc_region_panel_get_type ), -- PANEL_TYPE("search", cc_search_panel_get_type ), -- PANEL_TYPE("sharing", cc_sharing_panel_get_type ), -- PANEL_TYPE("sound", cc_sound_panel_get_type ), -- PANEL_TYPE("universal-access", cc_ua_panel_get_type ), -- PANEL_TYPE("user-accounts", cc_user_panel_get_type ), -+ PANEL_TYPE("privacy", cc_privacy_panel_get_type ), -+ PANEL_TYPE("region", cc_region_panel_get_type ), -+ PANEL_TYPE("search", cc_search_panel_get_type ), -+ PANEL_TYPE("sharing", cc_sharing_panel_get_type ), -+ PANEL_TYPE("sound", cc_sound_panel_get_type ), -+ PANEL_TYPE("universal-access", cc_ua_panel_get_type ), -+ PANEL_TYPE("user-accounts", cc_user_panel_get_type ), +diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c +index de9c5df..e24fc6e 100644 +--- a/shell/cc-panel-loader.c ++++ b/shell/cc-panel-loader.c +@@ -102,6 +102,12 @@ static struct { #ifdef BUILD_WACOM -- PANEL_TYPE("wacom", cc_wacom_panel_get_type ), -+ PANEL_TYPE("wacom", cc_wacom_panel_get_type ), + PANEL_TYPE("wacom", cc_wacom_panel_get_type ), #endif -+ PANEL_TYPE("ca.desrt.dconf-editor", NULL ), -+ PANEL_TYPE("gpk-prefs", NULL ), -+ PANEL_TYPE("tracker-preferences", NULL ), -+ PANEL_TYPE("itweb-settings", NULL ), -+ PANEL_TYPE("gnome-tweak-tool", NULL ), -+ PANEL_TYPE("YaST", NULL ), ++ PANEL_TYPE("ca.desrt.dconf-editor", NULL ), ++ PANEL_TYPE("gnome-tweak-tool", NULL ), ++ PANEL_TYPE("gpk-prefs", NULL ), ++ PANEL_TYPE("itweb-settings", NULL ), ++ PANEL_TYPE("tracker-preferences", NULL ), ++ PANEL_TYPE("YaST", NULL ), }; GList * -@@ -158,10 +165,22 @@ cc_panel_loader_fill_model (CcShellModel +@@ -133,7 +139,8 @@ parse_categories (GDesktopAppInfo *app) + { + if (strcmp (split[i], "HardwareSettings") == 0) + retval = CC_CATEGORY_HARDWARE; +- else if (strcmp (split[i], "X-GNOME-PersonalSettings") == 0) ++ else if ((strcmp (split[i], "X-GNOME-PersonalSettings") == 0) ++ || (strcmp (split[i], "X-GNOME-DesktopSettings") == 0)) + retval = CC_CATEGORY_PERSONAL; + else if (strcmp (split[i], "X-GNOME-SystemSettings") == 0) + retval = CC_CATEGORY_SYSTEM; +@@ -158,17 +165,33 @@ cc_panel_loader_fill_model (CcShellModel *model) { GDesktopAppInfo *app; char *desktop_name; @@ -83,10 +43,11 @@ Index: gnome-control-center-3.17.90/shell/cc-panel-loader.c int category; +#ifndef CC_PANEL_LOADER_NO_GTYPES -+ if (all_panels[i].get_type == NULL) { -+ desktop_name = g_strconcat (all_panels[i].name, -+ ".desktop", NULL); -+ name = g_strconcat ("suse-",all_panels[i].name, NULL); ++ if (all_panels[i].get_type == NULL) ++ { ++ desktop_name = g_strconcat (all_panels[i].name, ++ ".desktop", NULL); ++ name = g_strconcat ("suse-",all_panels[i].name, NULL); + } + else +#endif @@ -98,19 +59,30 @@ Index: gnome-control-center-3.17.90/shell/cc-panel-loader.c app = g_desktop_app_info_new (desktop_name); g_free (desktop_name); -@@ -176,7 +195,7 @@ cc_panel_loader_fill_model (CcShellModel + if (app == NULL) + { ++ if (!g_str_has_prefix(name, "suse-")) ++ { + g_warning ("Ignoring broken panel %s (missing desktop file)", + all_panels[i].name); ++ } + continue; + } + +@@ -176,7 +199,8 @@ cc_panel_loader_fill_model (CcShellModel *model) if (G_UNLIKELY (category < 0)) continue; - cc_shell_model_add_item (model, category, G_APP_INFO (app), all_panels[i].name); + cc_shell_model_add_item (model, category, G_APP_INFO (app), name); ++ g_free (name); g_object_unref (app); } } -Index: gnome-control-center-3.17.90/shell/cc-window.c -=================================================================== ---- gnome-control-center-3.17.90.orig/shell/cc-window.c -+++ gnome-control-center-3.17.90/shell/cc-window.c +diff --git a/shell/cc-window.c b/shell/cc-window.c +index 7c85f5c..d10ba9e 100644 +--- a/shell/cc-window.c ++++ b/shell/cc-window.c @@ -140,6 +140,41 @@ get_icon_name_from_g_icon (GIcon *gicon) return NULL; } @@ -153,7 +125,7 @@ Index: gnome-control-center-3.17.90/shell/cc-window.c static gboolean activate_panel (CcWindow *self, const gchar *id, -@@ -153,6 +188,12 @@ activate_panel (CcWindow *self +@@ -153,6 +188,12 @@ activate_panel (CcWindow *self, if (!id) return FALSE; @@ -166,12 +138,6 @@ Index: gnome-control-center-3.17.90/shell/cc-window.c priv->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, parameters)); cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (priv->current_panel)); -@@ -1502,7 +1543,7 @@ create_header (CcWindow *self) - gtk_button_set_image (GTK_BUTTON (priv->search_button), image); - gtk_widget_set_valign (priv->search_button, GTK_ALIGN_CENTER); - gtk_style_context_add_class (gtk_widget_get_style_context (priv->search_button), -- "image-button"); -+ "image-button"); - gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->header), priv->search_button); - - priv->top_right_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); +-- +2.6.6 + diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 6c4e01d..e63c9b9 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Sep 2 13:03:45 UTC 2016 - fezhang@suse.com + +- Update gnome-control-center-allow-extra-tools-in-shell.patch: + + Fix leak of strings. + + Add tools with category X-GNOME-DesktopSettings into the + personal g-c-c category to enable itweb-settings. + + Disable logspam in absence of optional components (bnc#866235 + bsc#952008). + ------------------------------------------------------------------- Wed Aug 31 19:40:38 UTC 2016 - zaitor@opensuse.org @@ -90,7 +100,7 @@ Tue Apr 12 10:00:06 UTC 2016 - fezhang@suse.com fixed upstream - Drop gnome-control-center-change-password-i18n.patch (bnc#880303): fixed upstream -- Drop gnome-control-center-datetime-i18n.patch (bnc#884425, bgo#732585): +- Drop gnome-control-center-datetime-i18n.patch (bnc#884425, bgo#732585): fixed upstream - Drop gnome-control-center-display-login-region.patch (bsc#955322): fixed upstream @@ -233,7 +243,7 @@ Mon Dec 14 02:54:57 UTC 2015 - badshah400@gmail.com ------------------------------------------------------------------- Mon Nov 30 13:52:06 UTC 2015 - fezhang@suse.com -- Fix the unlocalised heading on the Add Profile dialog on Color +- Fix the unlocalised heading on the Add Profile dialog on Color panel (bnc#947761) - Add gnome-control-center-bnc947761-fix-color-dialog-translations.patch @@ -405,7 +415,7 @@ Wed Aug 19 19:53:20 UTC 2015 - dimstar@opensuse.org Wed Jul 29 10:01:00 UTC 2015 - zaitor@opensuse.org - Add gnome-control-center-fix-nb-tans.patch: Fix translation of - Keyboard brightness in Norwegian bokmål (bgo#753005). + Keyboard brightness in Norwegian bokmål (bgo#753005). ------------------------------------------------------------------- Wed Jul 22 07:39:55 UTC 2015 - zaitor@opensuse.org @@ -830,7 +840,7 @@ Tue Sep 16 20:09:22 UTC 2014 - dimstar@opensuse.org Tue Sep 9 11:41:54 UTC 2014 - fezhang@suse.com - Hide Firewall zone entry in Network panel (bnc#894394) - + added patch: gnome-control-center-bnc894394-hide-firewall-zone-entry.patch + + added patch: gnome-control-center-bnc894394-hide-firewall-zone-entry.patch ------------------------------------------------------------------- Sun Sep 7 11:55:48 UTC 2014 - zaitor@opensuse.org @@ -1014,7 +1024,7 @@ Fri Jun 13 08:03:48 UTC 2014 - fezhang@suse.com - Rename gnome-control-center-allow-yast-in-shell.patch to gnome-control-center-allow-extra-tools-in-shell.patch - (bnc#866235). Add dconf-editor, gnome-tweak-tool, pkg-prefs and + (bnc#866235). Add dconf-editor, gnome-tweak-tool, pkg-prefs and tracker-preferences, alongside yast, to the patch so that g-c-c shell show them all. %suse_update_desktop_file are meanwhile added to specfiles of the @@ -1030,7 +1040,7 @@ Thu May 15 07:34:19 UTC 2014 - fezhang@suse.com ------------------------------------------------------------------- Wed May 7 23:35:53 UTC 2014 - dliang@suse.com -- Lower 'Requires' to 'Recommends' for cups-pk-helper (bnc#875606) +- Lower 'Requires' to 'Recommends' for cups-pk-helper (bnc#875606) ------------------------------------------------------------------- Wed Apr 16 14:44:25 UTC 2014 - zaitor@opensuse.org @@ -1574,7 +1584,7 @@ Fri Jul 19 23:36:39 CST 2013 - hillwood@linuxfans.org Tue Jul 2 03:48:05 UTC 2013 - dliang@suse.com - Rebase gnome-control-center-allow-yast-in-shell.patch. - to prevent it from crash. + to prevent it from crash. ------------------------------------------------------------------- Fri Jun 21 18:00:16 UTC 2013 - dimstar@opensuse.org @@ -3453,7 +3463,7 @@ Thu Aug 18 12:01:05 CEST 2011 - dimstar@opensuse.org Wed Aug 3 12:22:47 UTC 2011 - andrea@opensuse.org - split out faces package so that any Display manager other than - gnome with gdm can use it + gnome with gdm can use it ------------------------------------------------------------------- Mon Jul 25 22:47:06 CEST 2011 - vuntz@opensuse.org @@ -4821,7 +4831,7 @@ Tue Nov 4 12:36:33 CET 2008 - vuntz@novell.com Sat Oct 4 08:56:24 WST 2008 - mboman@suse.de - Update to version 2.24.0.1: - + Fix newly-introduced crash in theme tab (bgo#553541) + + Fix newly-introduced crash in theme tab (bgo#553541) ------------------------------------------------------------------- Fri Sep 26 14:57:04 CEST 2008 - vuntz@novell.com @@ -4838,11 +4848,11 @@ Tue Sep 23 12:46:05 CEST 2008 - rodrigo@novell.com + Accessibility: - Improve tooltip wording + Appearance: - * when a hidden theme is selected, and therefore becomes visible, + * when a hidden theme is selected, and therefore becomes visible, create a thumbnail for it (bgo#547301) - * don't fail if the destination files already exist and the user tries + * don't fail if the destination files already exist and the user tries to overwrite them (bgo#552671) - * set GtkAdjustment page size to 0 to avoid roblems due to newly enforced + * set GtkAdjustment page size to 0 to avoid roblems due to newly enforced value boundaries in GTK+ 2.14 (bgo#551740) + Common: * properly initialize the callback data (bgo#550263) @@ -4850,7 +4860,7 @@ Tue Sep 23 12:46:05 CEST 2008 - rodrigo@novell.com * don't advertise startup-notify. The script doesn't support it (bgo#550694) * use a11y icon instead of searchtool (bgo#550742) + Display: - * Use "Mirror Screens" instead of "Cloned Output" in the display of monitors, + * Use "Mirror Screens" instead of "Cloned Output" in the display of monitors, to be consistent with the corresponding checkbox from the Glade file * use theme colours for the background (bgo#545117) + Keybindings: @@ -4908,7 +4918,7 @@ Thu Aug 28 14:27:42 CEST 2008 - ro@suse.de - fix build: sound settings are not being built at the moment (configure does not find CANBERRA) - skip the update-desktop-file if it is not being installed + skip the update-desktop-file if it is not being installed - vfs-methods have been removed, remove in filelist as well ------------------------------------------------------------------- @@ -4987,13 +4997,13 @@ Fri Apr 25 18:46:50 CEST 2008 - federico@novell.com ------------------------------------------------------------------- Tue Apr 15 00:41:30 CEST 2008 - ro@suse.de -- added also provides for old name, not just obsoletes +- added also provides for old name, not just obsoletes ------------------------------------------------------------------- Mon Apr 14 17:43:39 CEST 2008 - rodrigo@suse.de - Renamed to gnome-control-center, like upstream -- Removed desktop-effects patch, moved to simple-ccsm +- Removed desktop-effects patch, moved to simple-ccsm ------------------------------------------------------------------- Fri Apr 11 00:33:44 CEST 2008 - maw@suse.de @@ -5037,7 +5047,7 @@ Mon Mar 31 13:00:06 CEST 2008 - rodrigo@suse.de - Added control-center2-desktop-effects.patch to add compiz activation GUI to the appearance capplet. -- Finish tagging of patches +- Finish tagging of patches ------------------------------------------------------------------- Fri Mar 14 04:50:57 CET 2008 - maw@suse.de @@ -5070,14 +5080,14 @@ Mon Feb 4 17:23:13 CET 2008 - rodrigo@suse.de - Added very much needed dependency for upcoming alpha on gnome-settings-daemon, a runtime dependency which is not being - picked up in any pattern + picked up in any pattern ------------------------------------------------------------------- Fri Feb 1 13:06:26 CET 2008 - rodrigo@suse.de - Update to version 2.21.90: * http://ftp.acc.umu.se/pub/GNOME/sources/gnome-control-center/2.21/gnome-control-center-2.21.90.news -- Re-enable gnome-patch* +- Re-enable gnome-patch* ------------------------------------------------------------------- Wed Jan 30 22:02:40 CET 2008 - maw@suse.de @@ -5088,7 +5098,7 @@ Wed Jan 30 22:02:40 CET 2008 - maw@suse.de ------------------------------------------------------------------- Tue Jan 29 14:14:29 CET 2008 - thoenig@suse.de -- Fix build: Add %dir %{_libdir}/nautilus/extensions-2.0 +- Fix build: Add %dir %{_libdir}/nautilus/extensions-2.0 ------------------------------------------------------------------- Tue Jan 29 12:33:00 CET 2008 - rodrigo@suse.de @@ -5096,7 +5106,7 @@ Tue Jan 29 12:33:00 CET 2008 - rodrigo@suse.de - Updated to 2.21.5: * http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/2.21/gnome-control-center-2.21.5.news - Disabled patches that need rebase -- Removed suse_update_desktop_file for no longer existing files. +- Removed suse_update_desktop_file for no longer existing files. - Removed gnome-settings-daemon related files - Disable temporarily gnome-patch-translation*, since it's complaining about files removed upstream ?? @@ -5147,7 +5157,7 @@ Mon Sep 10 22:31:52 CEST 2007 - maw@suse.de ------------------------------------------------------------------- Mon Sep 10 17:15:01 CEST 2007 - rodrigo@suse.de -- Remove workaround for upstream bug already fixed (#223798) +- Remove workaround for upstream bug already fixed (#223798) ------------------------------------------------------------------- Thu Sep 6 00:10:45 CEST 2007 - maw@suse.de @@ -5240,12 +5250,12 @@ Fri Aug 31 16:45:10 CEST 2007 - maw@suse.de Wed Aug 22 17:09:05 CEST 2007 - rodrigo@suse.de - Patched gnomecc.desktop file to have the control center entry - show up on the traditional menu bar (#260545) + show up on the traditional menu bar (#260545) ------------------------------------------------------------------- Thu Aug 16 20:31:17 CEST 2007 - rodrigo@suse.de -- Fixed location of gnome-passwd.glade file (#296721) +- Fixed location of gnome-passwd.glade file (#296721) ------------------------------------------------------------------- Wed Aug 8 18:52:13 CEST 2007 - maw@suse.de @@ -5283,8 +5293,8 @@ Thu Aug 2 23:59:57 CEST 2007 - maw@suse.de * Show readable_name in cursor theme list instead of name * Fix mnemonics and customize theme window title * Fix theme installation - * Update icon cache when installing icon themes - * Prevent some memory leaks + * Update icon cache when installing icon themes + * Prevent some memory leaks * Add controls for applying suggested backgrounds and/or fonts from metathemes * Only show background/font suggestions if they haven't already been @@ -5304,7 +5314,7 @@ Thu Aug 2 23:59:57 CEST 2007 - maw@suse.de * Remove spurious desktop entries + keyboard: * Improved layout and sorting - * Implement DND in the selected layouts list + * Implement DND in the selected layouts list * Eliminate up/down buttons in the layout list + network: * Also use new icon in the window title bar @@ -5327,9 +5337,9 @@ Thu Aug 2 23:59:57 CEST 2007 - maw@suse.de * Prevent cursor themes from being recognized as icon themes * Read a cursor themes's name from its index.theme file if it has one * Expand check for empty metatheme color scheme to include blank color scheme - strings + strings * Add tooltip foreground and background colors to the list of recognized - symbolic colors + symbolic colors + updated translations - Remove control-center2-dont-update-mimedb.patch - Use %fdupes. @@ -5362,14 +5372,14 @@ Mon Jul 9 17:57:09 CEST 2007 - maw@suse.de - Concomitant with the tarball name change, a number of directories packaged have been renamed from control-center to gnome-control-center -- Remove the following upstreamed patches: +- Remove the following upstreamed patches: * control-center2-217790-sanitize-dpi.diff * control-center2-compiz-keybindings.patch * control-center2-static-libslab.patch * control-center-control-key-events.patch * control-center-no-x-suse.patch - Bug fixes, updated translations -- s#%run_ldconfig#/sbin/ldconfig# in the %post and %postun +- s#%run_ldconfig#/sbin/ldconfig# in the %post and %postun sections. ------------------------------------------------------------------- @@ -5387,7 +5397,7 @@ Tue May 22 12:20:06 CEST 2007 - sbrabec@suse.cz ------------------------------------------------------------------- Thu May 17 10:19:21 CEST 2007 - rodrigo@suse.de -- Look for gnome-passwd.glade file in the correct dir (#272702) +- Look for gnome-passwd.glade file in the correct dir (#272702) ------------------------------------------------------------------- Mon May 14 12:53:29 CDT 2007 - maw@suse.de @@ -5404,7 +5414,7 @@ Thu Apr 12 16:00:32 CEST 2007 - rodrigo@suse.de Tue Apr 10 11:05:17 CEST 2007 - rodrigo@suse.de - Added patch for building libslab statically. -- Patched schemas file to contain our default values. +- Patched schemas file to contain our default values. ------------------------------------------------------------------- Thu Apr 5 17:29:51 CEST 2007 - sbrabec@suse.cz @@ -5495,7 +5505,7 @@ Mon Oct 2 22:58:11 CEST 2006 - jhargadon@suse.de - update to version 2.16.1 - display: - - Never pass negative values for the rates + - Never pass negative values for the rates - keyboard: - Make sure 'model' is never NULL - themus: @@ -5510,7 +5520,7 @@ Thu Sep 14 01:20:29 CEST 2006 - jhargadon@suse.de - update to versin 2.16.0 - avoid excess strduping - avoid extra key events processing -- avoid grabbing all keyboard when the key code cannot be retrieved +- avoid grabbing all keyboard when the key code cannot be retrieved - add missing maximize button - translation updates @@ -5528,7 +5538,7 @@ Wed Aug 30 23:04:09 CEST 2006 - jhargadon@suse.de - free 'resolution' string after using it, not before - fix memory leak - patches from "generate visible previews first" -- translation updates +- translation updates ------------------------------------------------------------------- Mon Aug 21 21:57:51 CEST 2006 - jhargadon@suse.de @@ -5641,7 +5651,7 @@ Thu Mar 23 18:16:12 CET 2006 - rodrigo@suse.de - Updated control-center2-multiple-displays.patch to use the correct DISPLAY for bonobo-activation, and fixed ultra-quick error dialog - (#156801). + (#156801). ------------------------------------------------------------------- Thu Mar 23 02:04:32 CET 2006 - federico@novell.com @@ -5795,17 +5805,17 @@ Mon Aug 29 16:19:30 CEST 2005 - rodrigo@suse.de Mon Aug 22 22:34:20 CEST 2005 - gekker@suse.de - Update to 2.11.92 -- Remove upstreamed theme-thumbnail patch +- Remove upstreamed theme-thumbnail patch ------------------------------------------------------------------- Mon Aug 22 00:49:33 CEST 2005 - ro@suse.de -- added pangoxft to liblist +- added pangoxft to liblist ------------------------------------------------------------------- Fri Aug 19 00:12:13 CEST 2005 - gekker@suse.de -- Fix theme-thumbnail +- Fix theme-thumbnail ------------------------------------------------------------------- Tue Aug 16 19:21:51 CEST 2005 - rodrigo@suse.de @@ -5828,18 +5838,18 @@ Wed Aug 10 15:51:02 CEST 2005 - rodrigo@suse.de Tue Aug 2 17:11:51 CEST 2005 - gekker@suse.de - Update to version 2.11.90 -- Add scrollkeeper magic +- Add scrollkeeper magic ------------------------------------------------------------------- Fri Jul 29 16:40:50 CEST 2005 - jpr@suse.de -- Depend on kereberos libs for building +- Depend on kereberos libs for building ------------------------------------------------------------------- Mon Jul 25 17:01:22 CEST 2005 - gekker@suse.de - Update to 2.11.6 -- Backout fix for (b.g.o309558) fixed bug in xorg-x11 +- Backout fix for (b.g.o309558) fixed bug in xorg-x11 ------------------------------------------------------------------- Mon Jul 18 13:16:19 CEST 2005 - sbrabec@suse.cz @@ -5852,7 +5862,7 @@ Mon Jul 18 13:16:19 CEST 2005 - sbrabec@suse.cz ------------------------------------------------------------------- Fri Jun 17 19:01:16 CEST 2005 - gekker@suse.de -- Update to version 2.11.4 +- Update to version 2.11.4 ------------------------------------------------------------------- Wed Jun 1 18:23:06 CEST 2005 - sbrabec@suse.cz @@ -5894,12 +5904,12 @@ Tue Mar 15 14:16:20 CET 2005 - sbrabec@suse.cz ------------------------------------------------------------------- Thu Mar 10 23:02:29 CET 2005 - gekker@suse.de -- Add new version of the system-proxy-configuration patch (71202). +- Add new version of the system-proxy-configuration patch (71202). ------------------------------------------------------------------- Thu Mar 10 04:26:13 CET 2005 - gekker@suse.de -- Update to version 2.10.0 (GNOME 2.10). +- Update to version 2.10.0 (GNOME 2.10). ------------------------------------------------------------------- Mon Feb 28 11:57:11 CET 2005 - sbrabec@suse.cz @@ -5919,12 +5929,12 @@ Fri Feb 18 21:41:24 CET 2005 - clahey@suse.de ------------------------------------------------------------------- Thu Feb 17 22:25:25 CET 2005 - gekker@suse.de -- add federico's system-proxy-configuration patch +- add federico's system-proxy-configuration patch ------------------------------------------------------------------- Thu Feb 10 22:28:41 CET 2005 - gekker@suse.de -- Update to version 2.9.91 +- Update to version 2.9.91 ------------------------------------------------------------------- Fri Jan 28 16:20:28 CET 2005 - sbrabec@suse.cz @@ -5941,7 +5951,7 @@ Wed Jan 26 17:49:43 CET 2005 - jody@suse.de ------------------------------------------------------------------- Wed Dec 15 14:05:53 CET 2004 - hvogel@suse.de -- fix desktop file +- fix desktop file ------------------------------------------------------------------- Fri Oct 29 23:57:44 CEST 2004 - ro@suse.de @@ -5985,7 +5995,7 @@ Tue Sep 07 18:43:30 CEST 2004 - sbrabec@suse.cz ------------------------------------------------------------------- Mon Sep 6 10:50:17 CEST 2004 - shprasad@suse.de -- Not applying patch6 because it is taken care by gnome-audio. +- Not applying patch6 because it is taken care by gnome-audio. ------------------------------------------------------------------- Mon Aug 30 18:10:55 CEST 2004 - rml@suse.de @@ -6064,7 +6074,7 @@ Fri Feb 20 15:48:37 CET 2004 - sbrabec@suse.cz ------------------------------------------------------------------- Thu Feb 12 09:21:41 CET 2004 - hhetter@suse.de -- gconf schema (de-)installation in %post and %postun +- gconf schema (de-)installation in %post and %postun ------------------------------------------------------------------- Sat Jan 10 11:53:49 CET 2004 - adrian@suse.de @@ -6090,7 +6100,7 @@ Thu Aug 07 16:16:37 CEST 2003 - sbrabec@suse.cz ------------------------------------------------------------------- Wed Aug 6 10:12:49 CEST 2003 - hhetter@suse.de -- remove prefix clash fix patch +- remove prefix clash fix patch ------------------------------------------------------------------- Mon Jul 14 15:47:28 CEST 2003 - sbrabec@suse.cz @@ -6106,7 +6116,7 @@ Wed Jun 25 13:03:59 CEST 2003 - sbrabec@suse.cz ------------------------------------------------------------------- Mon Jun 23 01:06:04 CEST 2003 - ro@suse.de -- package directories +- package directories ------------------------------------------------------------------- Thu May 15 18:07:17 CEST 2003 - sbrabec@suse.cz @@ -6116,13 +6126,13 @@ Thu May 15 18:07:17 CEST 2003 - sbrabec@suse.cz ------------------------------------------------------------------- Fri Feb 14 15:50:15 CET 2003 - hhetter@suse.de -- look in /opt/gnome2 for GTK Themes instead of +- look in /opt/gnome2 for GTK Themes instead of the GTK prefix, to get metathemes to work ------------------------------------------------------------------- Fri Feb 7 10:01:14 CET 2003 - hhetter@suse.de -- updated to version 2.2.0.1 [GNOME 2.2.0] +- updated to version 2.2.0.1 [GNOME 2.2.0] ------------------------------------------------------------------- Mon Feb 3 16:23:35 CET 2003 - ro@suse.de @@ -6146,7 +6156,7 @@ Thu Nov 21 16:08:18 CET 2002 - schwab@suse.de Tue Oct 22 09:24:53 CEST 2002 - hhetter@suse.de - updated to version 2.0.2.91 -- remove wrong docdir +- remove wrong docdir ------------------------------------------------------------------- Tue Oct 01 16:01:12 CEST 2002 - sbrabec@suse.cz @@ -6169,12 +6179,12 @@ Thu Sep 19 10:54:08 CEST 2002 - sbrabec@suse.cz Tue Sep 3 09:43:42 CEST 2002 - hhetter@suse.de - provide option to start xscreensaver-demo from control-center - ( Bug Id #18789) + ( Bug Id #18789) ------------------------------------------------------------------- Tue Aug 20 09:52:22 CEST 2002 - hhetter@suse.de -- added prereq: filesystem +- added prereq: filesystem ------------------------------------------------------------------- Sat Jul 27 18:14:59 CEST 2002 - adrian@suse.de @@ -6184,7 +6194,7 @@ Sat Jul 27 18:14:59 CEST 2002 - adrian@suse.de ------------------------------------------------------------------- Thu Jun 20 16:50:14 CEST 2002 - hhetter@suse.de -- don't install schemas while make install +- don't install schemas while make install ------------------------------------------------------------------- Tue Jun 18 16:17:48 CEST 2002 - meissner@suse.de @@ -6195,18 +6205,18 @@ Tue Jun 18 16:17:48 CEST 2002 - meissner@suse.de Tue Jun 18 11:25:10 CEST 2002 - hhetter@suse.de - updated to version 2.0.0 -- added missing schema file +- added missing schema file ------------------------------------------------------------------- Fri Jun 14 13:35:56 CEST 2002 - hhetter@suse.de -- supply schema files +- supply schema files ------------------------------------------------------------------- Wed Jun 12 09:56:09 CEST 2002 - hhetter@suse.de - added control-center gconf schemas and - glade xml files to filelist + glade xml files to filelist ------------------------------------------------------------------- Wed Jun 5 13:17:36 CEST 2002 - hhetter@suse.de @@ -6216,7 +6226,7 @@ Wed Jun 5 13:17:36 CEST 2002 - hhetter@suse.de ------------------------------------------------------------------- Fri Apr 26 15:27:53 CEST 2002 - ro@suse.de -- replaced gnome-core2 by gnome-desktop in neededforbuild +- replaced gnome-core2 by gnome-desktop in neededforbuild ------------------------------------------------------------------- Fri Feb 1 00:26:05 CET 2002 - ro@suse.de @@ -6226,5 +6236,5 @@ Fri Feb 1 00:26:05 CET 2002 - ro@suse.de ------------------------------------------------------------------- Thu Jan 24 13:34:37 CET 2002 - hhetter@suse.de -- initial SuSE package for GNOME 2.0 platform +- initial SuSE package for GNOME 2.0 platform diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 1c84fe5..59d8e2b 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -36,13 +36,13 @@ License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org Source: http://download.gnome.org/sources/gnome-control-center/3.20/%{name}-%{version}.tar.xz -# PATCH-FEATURE-OPENSUSE gnome-control-center-allow-extra-tools-in-shell.patch fezhang@suse.com -- Add dconf-editor, pkg-prefs, gnome-tweak-tool and tracker-preferences to gnome-control-center-allow-yast-in-shell.patch so that they can launch from g-c-c shell like YaST does. Also change the patch with a more generic name. +# PATCH-FEATURE-OPENSUSE gnome-control-center-allow-extra-tools-in-shell.patch fezhang@suse.com -- Add dconf-editor, gnome-tweak-tool, pkg-prefs, itweb-settings, tracker-preferences and Yast to g-c-c. Patch0: gnome-control-center-allow-extra-tools-in-shell.patch # PATCH-FEATURE-SLE gnome-control-center-add-alacarte-for-sle.patch badshah400@gmail.com -- Add back alacarte for SLE since they require it for their classic mode, on the other hand for TW and other openSUSE versions it should be enough that alacarte is still available from shell overview, just not in the g-c-c shell. This patch must be applied only if required and then immediately after gnome-control-center-allow-extra-tools-in-shell.patch Patch100: gnome-control-center-add-alacarte-for-sle.patch # PATCH-FEATURE-OPENSUSE gnome-control-center-hide-firewall-zone-entry.patch bnc#894394 fezhang@suse.com -- network: hide the firewall zone entry for firewalld, which is not used in opensuse Patch1: gnome-control-center-hide-firewall-zone-entry.patch -# 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... +# PATCH-FEATURE-OPENSUSE gnome-control-center-system-proxy-configuration.patch federico@gnome.org -- Integrate openSUSE's network proxy configuration with GNOME's. 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) Patch15: gcc-private-connection.patch From 6789e3390cff64325a45ae740a00f00112b1b848354947566a8586b04353f9f4 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 5 Sep 2016 14:29:37 +0000 Subject: [PATCH 2/7] Accepting request 424799 from home:Zaitor:branches:GNOME:Factory Resub with tweak OBS-URL: https://build.opensuse.org/request/show/424799 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=328 --- ...-control-center-add-alacarte-for-sle.patch | 34 +++++++++++++------ gnome-control-center.changes | 7 ++++ gnome-control-center.spec | 2 +- 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/gnome-control-center-add-alacarte-for-sle.patch b/gnome-control-center-add-alacarte-for-sle.patch index 3a8d7c8..29577e7 100644 --- a/gnome-control-center-add-alacarte-for-sle.patch +++ b/gnome-control-center-add-alacarte-for-sle.patch @@ -1,12 +1,24 @@ -Index: gnome-control-center-3.18.2/shell/cc-panel-loader.c -=================================================================== ---- gnome-control-center-3.18.2.orig/shell/cc-panel-loader.c -+++ gnome-control-center-3.18.2/shell/cc-panel-loader.c -@@ -103,6 +103,7 @@ static struct { - PANEL_TYPE("wacom", cc_wacom_panel_get_type ), +From df1f2a24bc6d8ff3be90e4c7d810fe13bdce8780 Mon Sep 17 00:00:00 2001 +From: Felix Zhang +Date: Sun, 4 Sep 2016 00:08:10 +0800 +Subject: [PATCH] add alacarte for sle + +--- + shell/cc-panel-loader.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c +index e24fc6e..011da0e 100644 +--- a/shell/cc-panel-loader.c ++++ b/shell/cc-panel-loader.c +@@ -102,6 +102,7 @@ static struct { + #ifdef BUILD_WACOM + PANEL_TYPE("wacom", cc_wacom_panel_get_type ), #endif - PANEL_TYPE("ca.desrt.dconf-editor", NULL ), -+ PANEL_TYPE("alacarte", NULL ), - PANEL_TYPE("gpk-prefs", NULL ), - PANEL_TYPE("tracker-preferences", NULL ), - PANEL_TYPE("itweb-settings", NULL ), ++ PANEL_TYPE("alacarte", NULL ), + PANEL_TYPE("ca.desrt.dconf-editor", NULL ), + PANEL_TYPE("gnome-tweak-tool", NULL ), + PANEL_TYPE("gpk-prefs", NULL ), +-- +2.6.6 + diff --git a/gnome-control-center.changes b/gnome-control-center.changes index e63c9b9..0f39223 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Sep 3 16:10:21 UTC 2016 - fezhang@suse.com + +- Update gnome-control-center-add-alacarte-for-sle.patch: + Rebase on top of rebased + gnome-control-center-allow-extra-tools-in-shell.patch. + ------------------------------------------------------------------- Fri Sep 2 13:03:45 UTC 2016 - fezhang@suse.com diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 59d8e2b..336ffb7 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -42,7 +42,7 @@ Patch0: gnome-control-center-allow-extra-tools-in-shell.patch Patch100: gnome-control-center-add-alacarte-for-sle.patch # PATCH-FEATURE-OPENSUSE gnome-control-center-hide-firewall-zone-entry.patch bnc#894394 fezhang@suse.com -- network: hide the firewall zone entry for firewalld, which is not used in opensuse Patch1: gnome-control-center-hide-firewall-zone-entry.patch -# PATCH-FEATURE-OPENSUSE gnome-control-center-system-proxy-configuration.patch federico@gnome.org -- Integrate openSUSE's network proxy configuration with GNOME's. +# PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch federico@gnome.org -- Integrate openSUSE's network proxy configuration with GNOME's. 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) Patch15: gcc-private-connection.patch From c95887cb4a98fdbf6ee4cebbd4d5808f55cfed6bfa86e5a3042b7bb45a9c73c4 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 8 Sep 2016 21:25:14 +0000 Subject: [PATCH 3/7] Accepting request 425720 from GNOME:Next Fixed patch tag line - it has been rebased OBS-URL: https://build.opensuse.org/request/show/425720 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=330 --- gcc-private-connection.patch | 320 ------------------ gnome-control-center-3.20.1.tar.xz | 3 - gnome-control-center-3.21.90.tar.xz | 3 + ...ol-center-allow-extra-tools-in-shell.patch | 51 ++- ...trol-center-hide-firewall-zone-entry.patch | 58 ---- ...ol-center-system-proxy-configuration.patch | 297 ---------------- ...-control-center-touchpad-wayland-cap.patch | 30 -- gnome-control-center.changes | 108 ++++++ gnome-control-center.spec | 37 +- 9 files changed, 150 insertions(+), 757 deletions(-) delete mode 100644 gcc-private-connection.patch delete mode 100644 gnome-control-center-3.20.1.tar.xz create mode 100644 gnome-control-center-3.21.90.tar.xz delete mode 100644 gnome-control-center-hide-firewall-zone-entry.patch delete mode 100644 gnome-control-center-system-proxy-configuration.patch delete mode 100644 gnome-control-center-touchpad-wayland-cap.patch diff --git a/gcc-private-connection.patch b/gcc-private-connection.patch deleted file mode 100644 index baf5559..0000000 --- a/gcc-private-connection.patch +++ /dev/null @@ -1,320 +0,0 @@ -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 - authorized - -This commit checks whether the polkit policy allows the user to -create a system connection without authentication. If not, create -private connections. - -https://bugzilla.gnome.org/show_bug.cgi?id=646187 ---- - configure.ac | 3 ++- - panels/network/cc-network-panel.c | 40 ++++++++++++++++++++++++++++++++++++-- - panels/network/cc-network-panel.h | 2 ++ - panels/network/net-device-mobile.c | 5 ++++- - panels/network/net-device-wifi.c | 25 +++++++++++++++++++++++- - panels/network/network-dialogs.c | 22 +++++++++++++++++++-- - panels/network/network-dialogs.h | 6 ++++-- - 7 files changed, 94 insertions(+), 9 deletions(-) - -Index: gnome-control-center-3.17.2/configure.ac -=================================================================== ---- gnome-control-center-3.17.2.orig/configure.ac -+++ gnome-control-center-3.17.2/configure.ac -@@ -137,7 +137,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 gmodule-2.0) -+PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0 -+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) - PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES) - 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.99.0 -Index: gnome-control-center-3.17.2/panels/network/cc-network-panel.c -=================================================================== ---- gnome-control-center-3.17.2.orig/panels/network/cc-network-panel.c -+++ gnome-control-center-3.17.2/panels/network/cc-network-panel.c -@@ -23,6 +23,8 @@ - #include - #include - -+#include -+ - #include "cc-network-panel.h" - #include "cc-network-resources.h" - -@@ -84,6 +86,9 @@ struct _CcNetworkPanelPrivate - gchar *arg_device; - gchar *arg_access_point; - gboolean operation_done; -+ -+ /* polkit authentication check */ -+ gboolean default_private; - }; - - enum { -@@ -576,13 +581,13 @@ handle_argv_for_device (CcNetworkPanel * - return TRUE; - } else if (g_strcmp0 (nm_object_get_path (NM_OBJECT (device)), priv->arg_device) == 0) { - if (priv->arg_operation == OPERATION_CONNECT_MOBILE) { -- cc_network_panel_connect_to_3g_network (toplevel, priv->client, priv->remote_settings, device); -+ cc_network_panel_connect_to_3g_network (toplevel, priv->client, priv->remote_settings, device, priv->default_private); - - reset_command_line_args (panel); /* done */ - select_tree_iter (panel, iter); - return TRUE; - } else if (priv->arg_operation == OPERATION_CONNECT_8021X) { -- cc_network_panel_connect_to_8021x_network (toplevel, priv->client, priv->remote_settings, device, priv->arg_access_point); -+ cc_network_panel_connect_to_8021x_network (toplevel, priv->client, priv->remote_settings, device, priv->arg_access_point, priv->default_private); - reset_command_line_args (panel); /* done */ - select_tree_iter (panel, iter); - return TRUE; -@@ -1374,6 +1379,9 @@ cc_network_panel_init (CcNetworkPanel *p - GtkWidget *toplevel; - GDBusConnection *system_bus; - GtkCssProvider *provider; -+ PolkitSubject *subject; -+ PolkitAuthority *authority; -+ PolkitAuthorizationResult *result; - - panel->priv = NETWORK_PANEL_PRIVATE (panel); - g_resources_register (cc_network_get_resource ()); -@@ -1485,4 +1493,32 @@ cc_network_panel_init (CcNetworkPanel *p - GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); - g_object_unref (provider); - -+ /* check the polkit authentication */ -+ panel->priv->default_private = TRUE; -+ authority = polkit_authority_get_sync (NULL, NULL); -+ subject = polkit_unix_process_new_for_owner (getpid (), 0, -1); -+ result = polkit_authority_check_authorization_sync (authority, -+ subject, -+ "org.freedesktop.NetworkManager.settings.modify.system", -+ NULL, -+ POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE, -+ NULL, -+ &error); -+ -+ if (error || !result) { -+ g_warning ("Failed to check polkit authorization! %s", -+ error->message); -+ g_clear_error (&error); -+ } else if (polkit_authorization_result_get_is_authorized (result)) { -+ panel->priv->default_private = FALSE; -+ } -+ g_object_unref (result); -+ g_object_unref (authority); -+ g_object_unref (subject); -+} -+ -+gboolean -+cc_network_panel_get_default_private (CcNetworkPanel *panel) -+{ -+ return panel->priv->default_private; - } -Index: gnome-control-center-3.17.2/panels/network/cc-network-panel.h -=================================================================== ---- gnome-control-center-3.17.2.orig/panels/network/cc-network-panel.h -+++ gnome-control-center-3.17.2/panels/network/cc-network-panel.h -@@ -66,6 +66,8 @@ GType cc_network_panel_get_type (void) G - - GPtrArray *cc_network_panel_get_devices (CcNetworkPanel *panel); - -+gboolean cc_network_panel_get_default_private (CcNetworkPanel *panel); -+ - G_END_DECLS - - #endif /* _CC_NETWORK_PANEL_H */ -Index: gnome-control-center-3.17.2/panels/network/net-device-mobile.c -=================================================================== ---- gnome-control-center-3.17.2.orig/panels/network/net-device-mobile.c -+++ gnome-control-center-3.17.2/panels/network/net-device-mobile.c -@@ -141,12 +141,15 @@ mobile_connection_changed_cb (GtkComboBo - COLUMN_ID, &object_path, - -1); - if (g_strcmp0 (object_path, NULL) == 0) { -+ gboolean default_private; - panel = net_object_get_panel (NET_OBJECT (device_mobile)); - toplevel = cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (panel))); -+ default_private = cc_network_panel_get_default_private (panel); - cc_network_panel_connect_to_3g_network (toplevel, - client, - remote_settings, -- device); -+ device, -+ default_private); - goto out; - } - -Index: gnome-control-center-3.17.2/panels/network/net-device-wifi.c -=================================================================== ---- gnome-control-center-3.17.2.orig/panels/network/net-device-wifi.c -+++ gnome-control-center-3.17.2/panels/network/net-device-wifi.c -@@ -701,6 +701,9 @@ wireless_try_to_connect (NetDeviceWifi * - NMDevice *device; - NMSettingWireless *setting_wireless; - NMClient *client; -+ CcNetworkPanel *panel; -+ NMConnection *partial = NULL; -+ NMSettingConnection *setting_con; - - if (device_wifi->priv->updating_device) - goto out; -@@ -752,10 +755,21 @@ 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); -+ } -+ - if (!is_8021x (device, ap_object_path)) { - g_debug ("no existing connection found for %s, creating and activating one", ssid_target); - nm_client_add_and_activate_connection (client, -- NULL, -+ partial, - device, ap_object_path, - connection_add_activate_cb, device_wifi); - } else { -@@ -996,6 +1010,7 @@ start_shared_connection (NetDeviceWifi * - NMClient *client; - const char *mode; - NMDeviceWifiCapabilities caps; -+ CcNetworkPanel *panel; - - device = net_device_get_nm_device (NET_DEVICE (device_wifi)); - g_assert (nm_device_get_device_type (device) == NM_DEVICE_TYPE_WIFI); -@@ -1032,6 +1047,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 (); -Index: gnome-control-center-3.17.2/panels/network/network-dialogs.c -=================================================================== ---- gnome-control-center-3.17.2.orig/panels/network/network-dialogs.c -+++ gnome-control-center-3.17.2/panels/network/network-dialogs.c -@@ -41,6 +41,7 @@ typedef struct { - NMClient *client; - NMRemoteSettings *settings; - NMDevice *device; -+ gboolean default_private; - } MobileDialogClosure; - - static void -@@ -262,7 +263,8 @@ cc_network_panel_connect_to_8021x_networ - NMClient *client, - NMRemoteSettings *settings, - NMDevice *device, -- const gchar *arg_access_point) -+ const gchar *arg_access_point, -+ gboolean default_private) - { - NMConnection *connection; - NMSettingConnection *s_con; -@@ -300,6 +302,8 @@ cc_network_panel_connect_to_8021x_networ - uuid = nm_utils_uuid_generate (); - g_object_set (s_con, NM_SETTING_CONNECTION_UUID, uuid, NULL); - g_free (uuid); -+ if (default_private) -+ nm_setting_connection_add_permission (s_con, "user", g_get_user_name(), NULL); - nm_connection_add_setting (connection, NM_SETTING (s_con)); - - s_wifi = (NMSettingWireless *) nm_setting_wireless_new (); -@@ -357,6 +361,7 @@ cdma_mobile_wizard_done (NMAMobileWizard - if (!canceled && method) { - NMSetting *setting; - char *uuid, *id; -+ MobileDialogClosure *closure = user_data; - - if (method->devtype != NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO) { - g_warning ("Unexpected device type (not CDMA)."); -@@ -400,6 +405,11 @@ cdma_mobile_wizard_done (NMAMobileWizard - NULL); - g_free (uuid); - g_free (id); -+ if (closure->default_private) -+ nm_setting_connection_add_permission ((NMSettingConnection *)setting, -+ "user", -+ g_get_user_name(), -+ NULL); - nm_connection_add_setting (connection, setting); - } - -@@ -419,6 +429,7 @@ gsm_mobile_wizard_done (NMAMobileWizard - if (!canceled && method) { - NMSetting *setting; - char *uuid, *id; -+ MobileDialogClosure *closure = user_data; - - if (method->devtype != NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) { - g_warning ("Unexpected device type (not GSM)."); -@@ -463,6 +474,11 @@ gsm_mobile_wizard_done (NMAMobileWizard - NULL); - g_free (uuid); - g_free (id); -+ if (closure->default_private) -+ nm_setting_connection_add_permission ((NMSettingConnection *)setting, -+ "user", -+ g_get_user_name(), -+ NULL); - nm_connection_add_setting (connection, setting); - } - -@@ -494,7 +510,8 @@ void - cc_network_panel_connect_to_3g_network (GtkWidget *toplevel, - NMClient *client, - NMRemoteSettings *settings, -- NMDevice *device) -+ NMDevice *device, -+ gboolean default_private) - { - MobileDialogClosure *closure; - NMAMobileWizard *wizard; -@@ -512,6 +529,7 @@ cc_network_panel_connect_to_3g_network ( - closure->client = g_object_ref (client); - closure->settings = g_object_ref (settings); - closure->device = g_object_ref (device); -+ closure->default_private = default_private; - - caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device)); - if (caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) { -Index: gnome-control-center-3.17.2/panels/network/network-dialogs.h -=================================================================== ---- gnome-control-center-3.17.2.orig/panels/network/network-dialogs.h -+++ gnome-control-center-3.17.2/panels/network/network-dialogs.h -@@ -38,11 +38,13 @@ void cc_network_panel_connect_to_8021x_n - NMClient *client, - NMRemoteSettings *settings, - NMDevice *device, -- const gchar *arg_access_point); -+ const gchar *arg_access_point, -+ gboolean default_private); - - void cc_network_panel_connect_to_3g_network (GtkWidget *toplevel, - NMClient *client, - NMRemoteSettings *settings, -- NMDevice *device); -+ NMDevice *device, -+ gboolean default_private); - - #endif /* _NETWORK_DIALOGS_H */ diff --git a/gnome-control-center-3.20.1.tar.xz b/gnome-control-center-3.20.1.tar.xz deleted file mode 100644 index 6bb7e59..0000000 --- a/gnome-control-center-3.20.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce6474fc60f78ed3cfaf555e55a52ec3ebb6437fa184e08ad6077bbec380a1ed -size 7160304 diff --git a/gnome-control-center-3.21.90.tar.xz b/gnome-control-center-3.21.90.tar.xz new file mode 100644 index 0000000..12f4561 --- /dev/null +++ b/gnome-control-center-3.21.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:632d0298306f196cb059ff98af20eed820bfa4bf08b24ba22ba2a58df21a88b8 +size 7179024 diff --git a/gnome-control-center-allow-extra-tools-in-shell.patch b/gnome-control-center-allow-extra-tools-in-shell.patch index 2f0c00e..aa99e86 100644 --- a/gnome-control-center-allow-extra-tools-in-shell.patch +++ b/gnome-control-center-allow-extra-tools-in-shell.patch @@ -8,10 +8,10 @@ Subject: [PATCH] allow extra tools in shell shell/cc-window.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) -diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c -index de9c5df..e24fc6e 100644 ---- a/shell/cc-panel-loader.c -+++ b/shell/cc-panel-loader.c +Index: gnome-control-center-3.21.90/shell/cc-panel-loader.c +=================================================================== +--- gnome-control-center-3.21.90.orig/shell/cc-panel-loader.c ++++ gnome-control-center-3.21.90/shell/cc-panel-loader.c @@ -102,6 +102,12 @@ static struct { #ifdef BUILD_WACOM PANEL_TYPE("wacom", cc_wacom_panel_get_type ), @@ -25,17 +25,17 @@ index de9c5df..e24fc6e 100644 }; GList * -@@ -133,7 +139,8 @@ parse_categories (GDesktopAppInfo *app) - { - if (strcmp (split[i], "HardwareSettings") == 0) - retval = CC_CATEGORY_HARDWARE; -- else if (strcmp (split[i], "X-GNOME-PersonalSettings") == 0) -+ else if ((strcmp (split[i], "X-GNOME-PersonalSettings") == 0) -+ || (strcmp (split[i], "X-GNOME-DesktopSettings") == 0)) - retval = CC_CATEGORY_PERSONAL; - else if (strcmp (split[i], "X-GNOME-SystemSettings") == 0) - retval = CC_CATEGORY_SYSTEM; -@@ -158,17 +165,33 @@ cc_panel_loader_fill_model (CcShellModel *model) +@@ -146,7 +152,8 @@ parse_categories (GDesktopAppInfo *app) + #else + if (g_strv_contains (const_strv (split), "HardwareSettings")) + retval = CC_CATEGORY_HARDWARE; +- else if (g_strv_contains (const_strv (split), "X-GNOME-PersonalSettings")) ++ else if (g_strv_contains (const_strv (split), "X-GNOME-PersonalSettings") ++ || g_strv_contains (const_strv (split), "X-GNOME-DesktopSettings")) + retval = CC_CATEGORY_PERSONAL; + else if (g_strv_contains (const_strv (split), "X-GNOME-SystemSettings")) + retval = CC_CATEGORY_SYSTEM; +@@ -173,17 +180,33 @@ cc_panel_loader_fill_model (CcShellModel { GDesktopAppInfo *app; char *desktop_name; @@ -69,7 +69,7 @@ index de9c5df..e24fc6e 100644 continue; } -@@ -176,7 +199,8 @@ cc_panel_loader_fill_model (CcShellModel *model) +@@ -191,7 +214,8 @@ cc_panel_loader_fill_model (CcShellModel if (G_UNLIKELY (category < 0)) continue; @@ -79,11 +79,11 @@ index de9c5df..e24fc6e 100644 g_object_unref (app); } } -diff --git a/shell/cc-window.c b/shell/cc-window.c -index 7c85f5c..d10ba9e 100644 ---- a/shell/cc-window.c -+++ b/shell/cc-window.c -@@ -140,6 +140,41 @@ get_icon_name_from_g_icon (GIcon *gicon) +Index: gnome-control-center-3.21.90/shell/cc-window.c +=================================================================== +--- gnome-control-center-3.21.90.orig/shell/cc-window.c ++++ gnome-control-center-3.21.90/shell/cc-window.c +@@ -139,6 +139,41 @@ get_icon_name_from_g_icon (GIcon *gicon) return NULL; } @@ -125,7 +125,7 @@ index 7c85f5c..d10ba9e 100644 static gboolean activate_panel (CcWindow *self, const gchar *id, -@@ -153,6 +188,12 @@ activate_panel (CcWindow *self, +@@ -151,6 +186,12 @@ activate_panel (CcWindow *self if (!id) return FALSE; @@ -136,8 +136,5 @@ index 7c85f5c..d10ba9e 100644 + return FALSE; + } - priv->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, parameters)); - cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (priv->current_panel)); --- -2.6.6 - + self->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, parameters)); + cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (self->current_panel)); diff --git a/gnome-control-center-hide-firewall-zone-entry.patch b/gnome-control-center-hide-firewall-zone-entry.patch deleted file mode 100644 index bd5fe24..0000000 --- a/gnome-control-center-hide-firewall-zone-entry.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 889ce41e87872377b6f728fadd0e0ffaa927406a Mon Sep 17 00:00:00 2001 -From: Felix Zhang -Date: Thu, 11 Sep 2014 16:07:43 +0800 -Subject: [PATCH] bnc894394 hide firewall zone entry - -The Firewall Zone entry is only activated if firewalld package is installed. -As openSUSE doesn't have this package, the entry never works. So removing the -entry to avoid confusions. ---- - panels/network/connection-editor/ethernet-page.ui | 4 ++-- - panels/network/connection-editor/vpn-page.ui | 4 ++-- - panels/network/connection-editor/wifi-page.ui | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -Index: gnome-control-center-3.17.2/panels/network/connection-editor/ethernet-page.ui -=================================================================== ---- gnome-control-center-3.17.2.orig/panels/network/connection-editor/ethernet-page.ui -+++ gnome-control-center-3.17.2/panels/network/connection-editor/ethernet-page.ui -@@ -264,7 +264,7 @@ - - - -- True -+ False - False - 1 - Firewall _Zone -@@ -280,7 +280,7 @@ - - - -- True -+ False - False - 0 - 1 -Index: gnome-control-center-3.17.2/panels/network/connection-editor/vpn-page.ui -=================================================================== ---- gnome-control-center-3.17.2.orig/panels/network/connection-editor/vpn-page.ui -+++ gnome-control-center-3.17.2/panels/network/connection-editor/vpn-page.ui -@@ -57,7 +57,7 @@ - 6 - - -- True -+ False - False - Firewall _Zone - True -@@ -71,7 +71,7 @@ - - - -- True -+ False - False - 0 - 1 diff --git a/gnome-control-center-system-proxy-configuration.patch b/gnome-control-center-system-proxy-configuration.patch deleted file mode 100644 index dcb760b..0000000 --- a/gnome-control-center-system-proxy-configuration.patch +++ /dev/null @@ -1,297 +0,0 @@ -From 067cc33aba6eeaffd4efe1d8a8e838aa1a89476a Mon Sep 17 00:00:00 2001 -From: Federico Mena Quintero -Date: Mon, 25 May 2009 14:38:52 -0500 -Subject: [PATCH] Integrate openSUSE's network proxy configuration with GNOME's. - -This is documented in http://en.opensuse.org/GNOME/Proxy_configuration - -We basically add a "use system settings" proxy mode. When it is active, -gnome-settings-daemon will read /etc/sysconfig/proxy and mirror its values -into GNOME's GConf space. - -Signed-off-by: Federico Mena Quintero ---- - capplets/network/gnome-network-properties.c | 164 +++++++++++++++++------ - capplets/network/gnome-network-properties.glade | 24 +++- - 2 files changed, 143 insertions(+), 45 deletions(-) - -diff --git a/capplets/network/gnome-network-properties.c b/capplets/network/gnome-network-properties.c -index f6ea0e6..0ea9945 100644 ---- a/capplets/network/gnome-network-properties.c -+++ b/capplets/network/gnome-network-properties.c -@@ -32,19 +32,11 @@ - #include "capplet-util.h" - #include "gconf-property-editor.h" - --enum ProxyMode --{ -- PROXYMODE_NONE, -- PROXYMODE_MANUAL, -- PROXYMODE_AUTO --}; -- --static GEnumValue proxytype_values[] = { -- { PROXYMODE_NONE, "PROXYMODE_NONE", "none"}, -- { PROXYMODE_MANUAL, "PROXYMODE_MANUAL", "manual"}, -- { PROXYMODE_AUTO, "PROXYMODE_AUTO", "auto"}, -- { 0, NULL, NULL } --}; -+/* Novell extension */ -+#define KEY_USE_SYSTEM_SETTINGS "/system/proxy/use_system_settings" /* string */ -+#define VAL_USE_SYSTEM_SETTINGS_ONLY_IF_NOT_SET "only_if_mode_not_set" -+#define VAL_USE_SYSTEM_SETTINGS_SYSTEM_VALUES "system_values" -+#define VAL_USE_SYSTEM_SETTINGS_USER_VALUES "user_values" - - enum { - COL_NAME, -@@ -1019,36 +1011,58 @@ extract_proxy_host (GConfPropertyEditor *peditor, const GConfValue *orig) - } - - static void -+set_sensitivity_based_on_active_radiobutton (GladeXML *dialog, GtkWidget *active_radio) -+{ -+ gboolean manual_box_sensitive, auto_box_sensitive; -+ -+ g_assert (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (active_radio))); -+ -+ manual_box_sensitive = auto_box_sensitive = FALSE; -+ -+ if (active_radio == WID ("manual_radiobutton")) -+ manual_box_sensitive = TRUE; -+ else if (active_radio == WID ("auto_radiobutton")) -+ auto_box_sensitive = TRUE; -+ -+ gtk_widget_set_sensitive (WID ("manual_box"), manual_box_sensitive); -+ gtk_widget_set_sensitive (WID ("same_proxy_checkbutton"), manual_box_sensitive); -+ gtk_widget_set_sensitive (WID ("auto_box"), auto_box_sensitive); -+} -+ -+static void - proxy_mode_radiobutton_clicked_cb (GtkWidget *widget, - GladeXML *dialog) - { -- GSList *mode_group; -- int mode; -- GConfClient *client; -+ GConfClient *client; - -- if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widget))) -- return; -- -- mode_group = g_slist_copy (gtk_radio_button_get_group -- (GTK_RADIO_BUTTON (WID ("none_radiobutton")))); -- mode_group = g_slist_reverse (mode_group); -- mode = g_slist_index (mode_group, widget); -- g_slist_free (mode_group); -- -- gtk_widget_set_sensitive (WID ("manual_box"), -- mode == PROXYMODE_MANUAL); -- gtk_widget_set_sensitive (WID ("same_proxy_checkbutton"), -- mode == PROXYMODE_MANUAL); -- gtk_widget_set_sensitive (WID ("auto_box"), -- mode == PROXYMODE_AUTO); -+ if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widget))) -+ return; -+ - client = gconf_client_get_default (); -- gconf_client_set_bool (client, USE_PROXY_KEY, -- mode == PROXYMODE_AUTO || mode == PROXYMODE_MANUAL, NULL); -- g_object_unref (client); -+ -+ if (widget == WID ("system_radiobutton")) { -+ gconf_client_set_string (client, KEY_USE_SYSTEM_SETTINGS, VAL_USE_SYSTEM_SETTINGS_SYSTEM_VALUES, NULL); -+ } else if (widget == WID ("none_radiobutton")) { -+ gconf_client_set_string (client, KEY_USE_SYSTEM_SETTINGS, VAL_USE_SYSTEM_SETTINGS_USER_VALUES, NULL); -+ gconf_client_set_string (client, PROXY_MODE_KEY, "none", NULL); -+ gconf_client_set_bool (client, USE_PROXY_KEY, FALSE, NULL); -+ } else if (widget == WID ("manual_radiobutton")) { -+ gconf_client_set_string (client, KEY_USE_SYSTEM_SETTINGS, VAL_USE_SYSTEM_SETTINGS_USER_VALUES, NULL); -+ gconf_client_set_string (client, PROXY_MODE_KEY, "manual", NULL); -+ gconf_client_set_bool (client, USE_PROXY_KEY, TRUE, NULL); -+ } else if (widget == WID ("auto_radiobutton")) { -+ gconf_client_set_string (client, KEY_USE_SYSTEM_SETTINGS, VAL_USE_SYSTEM_SETTINGS_USER_VALUES, NULL); -+ gconf_client_set_string (client, PROXY_MODE_KEY, "auto", NULL); -+ gconf_client_set_bool (client, USE_PROXY_KEY, TRUE, NULL); -+ } -+ -+ set_sensitivity_based_on_active_radiobutton (dialog, widget); -+ -+ g_object_unref (client); - } - - static void --connect_sensitivity_signals (GladeXML *dialog, GSList *mode_group) -+connect_mode_radiobuttons (GladeXML *dialog, GSList *mode_group) - { - for (; mode_group != NULL; mode_group = mode_group->next) - { -@@ -1058,20 +1072,85 @@ connect_sensitivity_signals (GladeXML *dialog, GSList *mode_group) - } - } - -+static GtkWidget * -+get_radio_for_mode (GladeXML *dialog, const char *mode_str) -+{ -+ if (!mode_str) -+ return WID ("none_radiobutton"); -+ else if (strcmp (mode_str, "none") == 0) -+ return WID ("none_radiobutton"); -+ else if (strcmp (mode_str, "manual") == 0) -+ return WID ("manual_radiobutton"); -+ else if (strcmp (mode_str, "auto") == 0) -+ return WID ("auto_radiobutton"); -+ else -+ return WID ("none_radiobutton"); -+} -+ -+static void -+mode_set_initial_value (GladeXML *dialog, GConfClient *client) -+{ -+ char *use_system_settings; -+ GConfValue *mode_value; -+ gboolean use_system_if_mode_not_set; -+ gboolean use_mode; -+ GtkWidget *radiobutton; -+ -+ radiobutton = NULL; -+ -+ use_system_settings = gconf_client_get_string (client, KEY_USE_SYSTEM_SETTINGS, NULL); -+ mode_value = gconf_client_get_without_default (client, PROXY_MODE_KEY, NULL); -+ -+ use_system_if_mode_not_set = FALSE; -+ use_mode = FALSE; -+ -+ if (!use_system_settings) -+ use_system_if_mode_not_set = TRUE; -+ else { -+ if (strcmp (use_system_settings, VAL_USE_SYSTEM_SETTINGS_ONLY_IF_NOT_SET) == 0) -+ use_system_if_mode_not_set = TRUE; -+ else if (strcmp (use_system_settings, VAL_USE_SYSTEM_SETTINGS_SYSTEM_VALUES) == 0) -+ radiobutton = WID ("system_radiobutton"); -+ else if (strcmp (use_system_settings, VAL_USE_SYSTEM_SETTINGS_USER_VALUES) == 0) -+ use_mode = TRUE; -+ -+ g_free (use_system_settings); -+ } -+ -+ if (use_system_if_mode_not_set) { -+ if (mode_value) -+ use_mode = TRUE; -+ else -+ radiobutton = WID ("system_radiobutton"); -+ } -+ -+ if (use_mode) { -+ if (!mode_value || mode_value->type != GCONF_VALUE_STRING) -+ radiobutton = WID ("none_radiobutton"); -+ else -+ radiobutton = get_radio_for_mode (dialog, gconf_value_get_string (mode_value)); -+ } -+ -+ if (radiobutton) { -+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radiobutton), TRUE); -+ set_sensitivity_based_on_active_radiobutton (dialog, radiobutton); -+ } -+ -+ if (mode_value) -+ gconf_value_free (mode_value); -+} -+ - static void - setup_dialog (GladeXML *dialog) - { - GConfPropertyEditor *peditor; - GSList *mode_group; -- GType mode_type = 0; - GConfClient *client; - gint port_value; - GtkWidget *location_box; - GtkCellRenderer *location_renderer; - GtkListStore *store; - -- mode_type = g_enum_register_static ("NetworkPreferencesProxyType", -- proxytype_values); - - /* There's a bug in peditors that cause them to not initialize the entry - * correctly. */ -@@ -1100,17 +1179,16 @@ setup_dialog (GladeXML *dialog) - "style", COL_STYLE, NULL); - - /* Hackety hack */ -+ gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (WID ("system_radiobutton"))->child), TRUE); - gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (WID ("none_radiobutton"))->child), TRUE); - gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (WID ("manual_radiobutton"))->child), TRUE); - gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (WID ("auto_radiobutton"))->child), TRUE); - - /* Mode */ -- mode_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (WID ("none_radiobutton"))); -- connect_sensitivity_signals (dialog, mode_group); -+ mode_set_initial_value (dialog, client); -+ mode_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (WID ("system_radiobutton"))); -+ connect_mode_radiobuttons (dialog, mode_group); - -- peditor = GCONF_PROPERTY_EDITOR (gconf_peditor_new_select_radio_with_enum (NULL, -- PROXY_MODE_KEY, mode_group, mode_type, -- TRUE, NULL)); - - /* Use same proxy for all protocols */ - peditor = GCONF_PROPERTY_EDITOR (gconf_peditor_new_boolean (NULL, -diff --git a/capplets/network/gnome-network-properties.glade b/capplets/network/gnome-network-properties.glade -index 656acb5..1147f17 100644 ---- a/capplets/network/gnome-network-properties.glade -+++ b/capplets/network/gnome-network-properties.glade -@@ -130,6 +130,25 @@ - 18 - - -+ -+ True -+ True -+ <b>Use the s_ystem's proxy settings</b> -+ True -+ GTK_RELIEF_NORMAL -+ True -+ False -+ False -+ True -+ -+ -+ 0 -+ False -+ False -+ -+ -+ -+ - - True - True -@@ -140,6 +159,7 @@ - False - False - True -+ system_radiobutton - - - 0 -@@ -171,7 +191,7 @@ - False - False - True -- none_radiobutton -+ system_radiobutton - - - 0 -@@ -714,7 +734,7 @@ - False - False - True -- none_radiobutton -+ system_radiobutton - - - 0 --- -1.6.0.2 - diff --git a/gnome-control-center-touchpad-wayland-cap.patch b/gnome-control-center-touchpad-wayland-cap.patch deleted file mode 100644 index 57df1af..0000000 --- a/gnome-control-center-touchpad-wayland-cap.patch +++ /dev/null @@ -1,30 +0,0 @@ -From db5dcda0badd33b9aea576f4f3a45c8076f11b8c Mon Sep 17 00:00:00 2001 -From: Rui Matos -Date: Mon, 2 May 2016 14:35:33 +0200 -Subject: mouse: Make touchpad capability checking on wayland work as intended - -We need to set the out variables otherwise the intended semantics as -documented by the comment aren't enforced. - -https://bugzilla.gnome.org/show_bug.cgi?id=765879 ---- - panels/mouse/cc-mouse-caps-helper.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/panels/mouse/cc-mouse-caps-helper.c b/panels/mouse/cc-mouse-caps-helper.c -index 6fdeb4d..3b912ce 100644 ---- a/panels/mouse/cc-mouse-caps-helper.c -+++ b/panels/mouse/cc-mouse-caps-helper.c -@@ -96,6 +96,9 @@ cc_touchpad_check_capabilities (gboolean *have_two_finger_scrolling, - have_edge_scrolling, - have_tap_to_click); - /* else we unconditionally show all touchpad knobs */ -+ *have_two_finger_scrolling = TRUE; -+ *have_edge_scrolling = TRUE; -+ *have_tap_to_click = TRUE; - return FALSE; - } - --- -cgit v0.12 - diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 0f39223..f3e2f47 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Sep 8 12:51:17 UTC 2016 - dimstar@opensuse.org + +- Rebase and re-enable + gnome-control-center-allow-extra-tools-in-shell.patch. + +------------------------------------------------------------------- +Wed Sep 7 16:19:11 UTC 2016 - zaitor@opensuse.org + +- Disable gnome-control-center-allow-extra-tools-in-shell.patch: + Needs rebase. +- Conditionally apply translations-update-upstream BuildRequires + and macro for non-openSUSE only. + +------------------------------------------------------------------- +Tue Sep 6 11:13:28 UTC 2016 - dimstar@opensuse.org + +- Drop gnome-control-center-hide-firewall-zone-entry.patch: no + longer needed, since upstream code now checks if firewalld is + running and hides the widgets dynamically. + ------------------------------------------------------------------- Sat Sep 3 16:10:21 UTC 2016 - fezhang@suse.com @@ -20,6 +41,87 @@ Wed Aug 31 19:40:38 UTC 2016 - zaitor@opensuse.org - Drop Mesa-demo-x Requires: No longer needed. Fixes boo#996633. +------------------------------------------------------------------ +Wed Aug 31 19:06:25 UTC 2016 - zaitor@opensuse.org + +- Drop long disabled and no longer needed patches: + + gnome-control-center-system-proxy-configuration.patch. + + gcc-private-connection.patch. + +------------------------------------------------------------------- +Fri Aug 26 13:24:49 UTC 2016 - badshah400@gmail.com + +- Update to version 3.21.90: + + Fix truncated panel names for larger fonts. + + Port to libnm 1.2. + + Display: + - Add option to enable and disable overscan compensation when + supported by the driver. + - Ensure only one output is set as primary. + - Separate interlaced from normal modes. + + Info: + - Fetch renderer information from gnome-session. + - Show OS build-id. + + Keyboard: Update to a new design. + + Mouse: + - Show only relevant widgets for the hardware we're able to + detect. + - Detect and warn if we're running on the synaptics driver. + - Make all listbox rows unactivatable. + - Remove superfluous GtkListBoxRow. + - Allow keyboard navigation/focus to the Touchpad section + switches. + - Offer a separate option for edge scrolling. + - Don't allow two-finger and edge scrolling at the same time. + + Network: + - Use VPN plugin paths as specified in the .name files. + - Ensure the Wifi list is updated as networks appear/disapper. + - Hide firewall zone combo when firewalld is not running. + - Remove bridge, bond, team, VLAN and virtual devices support + these are most useful on non-desktop systems for which a UI + like Cockpit is better suited. + - Remove the first page of the "Add Connection" wizard. + - Update wireless-security UI from network-manager-applet. + - Remember "Ignore CA certificate". + - Fix removed connections not disappearing. + - Fix hotspot silently failing with long hostname. + - Fix several crashes. + + Online Accounts: + - Don't use deprecated GoaProviderGroup API. + - Add a Calendar group. + - Let goa_provider_show_account create the full UI. + + Power: + - Translate the "When the Power Button is pressed" drop-down. + - Show "Suspend & Power Off" section only when relevant. + + Printers: + - Add compatibility code for older cups. + - Use a panel wide page for empty state. + - Present spinner while populating the panel. + - Rename printers asynchronously. + - Added new async API to check availability of maintenance + commands. + - Check all supported CUPS commands, not just the first one. + + Privacy: + - React to changes in permissions store. + - Various layout and cosmetic cleanups. + + Region: + - Reset the input chooser on escape. + - Improve widget spacing. + + Search: + - Work around applications not shipping icons at all sizes. + - Introduce the new Search Locations dialog. + + Sharing: Update to a new design. + + Universal Access: + - Specify a window when testing visual bell. + - Correct label for "Sound Keys". + - Allow keyboard navigation/focus to the settings switches. + + User Accounts: + - Update to a new design. + - Fix missing records in the history dialog. + + Updated translations. +- Drop gnome-control-center-touchpad-wayland-cap.patch; + incorporated upstream. + ------------------------------------------------------------------- Thu Jul 26 06:53:23 UTC 2016 - sckang@suse.com @@ -82,6 +184,12 @@ Thu Apr 14 10:30:34 UTC 2016 - zaitor@opensuse.org + Updated translations. - Drop 0001-network-Fix-empty-Wifi-list.patch: Fixed upstream. +------------------------------------------------------------------- +Tue Apr 12 11:00:06 UTC 2016 - zaitor@opensuse.org + +- Set define with_cacert_patch to 0, needed now since we have + non-rebased patches in NetworkManager. + ------------------------------------------------------------------- Tue Apr 12 10:00:06 UTC 2016 - fezhang@suse.com diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 336ffb7..c7a755a 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -26,34 +26,26 @@ %define with_wacom 1 %endif -%define with_cacert_patch 1 +%define with_cacert_patch 0 Name: gnome-control-center -Version: 3.20.1 +Version: 3.21.90 Release: 0 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.20/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnome-control-center/3.21/%{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE gnome-control-center-allow-extra-tools-in-shell.patch fezhang@suse.com -- Add dconf-editor, gnome-tweak-tool, pkg-prefs, itweb-settings, tracker-preferences and Yast to g-c-c. Patch0: gnome-control-center-allow-extra-tools-in-shell.patch # PATCH-FEATURE-SLE gnome-control-center-add-alacarte-for-sle.patch badshah400@gmail.com -- Add back alacarte for SLE since they require it for their classic mode, on the other hand for TW and other openSUSE versions it should be enough that alacarte is still available from shell overview, just not in the g-c-c shell. This patch must be applied only if required and then immediately after gnome-control-center-allow-extra-tools-in-shell.patch Patch100: gnome-control-center-add-alacarte-for-sle.patch -# PATCH-FEATURE-OPENSUSE gnome-control-center-hide-firewall-zone-entry.patch bnc#894394 fezhang@suse.com -- network: hide the firewall zone entry for firewalld, which is not used in opensuse -Patch1: gnome-control-center-hide-firewall-zone-entry.patch -# PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch federico@gnome.org -- Integrate openSUSE's network proxy configuration with GNOME's. 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) -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-FEATURE-OPENSUSE gnome-control-center-follow-polkit-permissions-for-tz.patch boo#904058 badshah400@gmail.com -- Follow polkit permissions for allowing/locking timezone setting changes Patch17: gnome-control-center-follow-polkit-permissions-for-tz.patch # PATCH-FIX-SLE gnome-control-center-890979-change-remote-passwd.patch bnc#890979 dliang@suse.com -- user: Enable remote user to change password in user panel Patch18: gnome-control-center-890979-change-remote-passwd.patch -# PATCH-FIX-UPSTREAM gnome-control-center-touchpad-wayland-cap.patch bgo#765879 zaitor@opensuse.org -- mouse: Make touchpad capability checking on wayland work as intended -Patch19: gnome-control-center-touchpad-wayland-cap.patch # PATCH-FIX-OPENSUSE gnome-control-center-disable-error-message-for-NM.patch bsc#989801 sckang@suse.com -- network: Improve the check for whether NM or wicked is running Patch20: gnome-control-center-disable-error-message-for-NM.patch BuildRequires: cups-devel @@ -62,7 +54,9 @@ BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: intltool BuildRequires: krb5-devel +%if !0%{?is_opensuse} BuildRequires: translation-update-upstream +%endif BuildRequires: update-desktop-files BuildRequires: pkgconfig(accountsservice) >= 0.6.39 BuildRequires: pkgconfig(cairo-gobject) @@ -85,17 +79,18 @@ BuildRequires: pkgconfig(goa-1.0) >= 3.15.1 BuildRequires: pkgconfig(goa-backend-1.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(grilo-0.3) -BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.19.3 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.20.3 +BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.21.4 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.21.4 BuildRequires: pkgconfig(gudev-1.0) %if %{with_ibus} BuildRequires: pkgconfig(ibus-1.0) >= 1.5.2 %endif BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libgtop-2.0) -BuildRequires: pkgconfig(libnm-glib) >= 0.9.8 -BuildRequires: pkgconfig(libnm-glib-vpn) >= 0.9.8 -BuildRequires: pkgconfig(libnm-gtk) >= 0.9.8 +BuildRequires: pkgconfig(libnm) >= 1.2 +BuildRequires: pkgconfig(libnm-glib-vpn) >= 1.2 +BuildRequires: pkgconfig(libnm-gtk) >= 1.2 +BuildRequires: pkgconfig(libnma) >= 1.2 BuildRequires: pkgconfig(libpulse) >= 2.0 BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 2.0 BuildRequires: pkgconfig(libsoup-2.4) @@ -199,15 +194,14 @@ GNOME control center. %lang_package %prep %setup -q +%if !0%{?is_opensuse} translation-update-upstream +%endif %patch0 -p1 # PATCH100 ONLY NEEDED FOR SLES AND TO BE APPLIED IMMEDIATELY AFTER PATCH0 %if 0%{?suse_version} == 1315 && 0%{?sle_version} %patch100 -p1 %endif -%patch1 -p1 -# PATCH-NEEDS-REBASE - and g-c-c code seems to be moving in "our" direction see bgo#751378 -#patch15 -p1 %if %{with_cacert_patch} %patch16 -p1 %endif @@ -215,9 +209,6 @@ translation-update-upstream %if ! 0%{?is_opensuse} %patch18 -p1 %endif -#NEEDS-REBASE -#patch14 -p1 -%patch19 -p1 %patch20 -p1 %build @@ -332,5 +323,7 @@ rm -rf %{buildroot} %files devel %defattr (-, root, root) %{_datadir}/pkgconfig/gnome-keybindings.pc +%{_datadir}/gettext/its/gnome-keybindings.its +%{_datadir}/gettext/its/gnome-keybindings.loc %changelog From febfc9f37494ef99c0d5b382483510674b701be76338ed404f0d4447e775a07f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 14 Sep 2016 16:50:45 +0000 Subject: [PATCH 4/7] Accepting request 427365 from GNOME:Next New unstable OBS-URL: https://build.opensuse.org/request/show/427365 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=331 --- gnome-control-center-3.21.90.tar.xz | 3 --- gnome-control-center-3.21.92.tar.xz | 3 +++ gnome-control-center.changes | 25 +++++++++++++++++++++++++ gnome-control-center.spec | 2 +- 4 files changed, 29 insertions(+), 4 deletions(-) delete mode 100644 gnome-control-center-3.21.90.tar.xz create mode 100644 gnome-control-center-3.21.92.tar.xz diff --git a/gnome-control-center-3.21.90.tar.xz b/gnome-control-center-3.21.90.tar.xz deleted file mode 100644 index 12f4561..0000000 --- a/gnome-control-center-3.21.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:632d0298306f196cb059ff98af20eed820bfa4bf08b24ba22ba2a58df21a88b8 -size 7179024 diff --git a/gnome-control-center-3.21.92.tar.xz b/gnome-control-center-3.21.92.tar.xz new file mode 100644 index 0000000..8ab6f37 --- /dev/null +++ b/gnome-control-center-3.21.92.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5579fb61ce1eae6ddce81bc953ec9cb0fae314d84246b74f6af1c27224ef97a0 +size 7214196 diff --git a/gnome-control-center.changes b/gnome-control-center.changes index f3e2f47..5570616 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Tue Sep 13 20:23:53 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.92: + + Privacy: Fix quoting of distro name and privacy URL. + + Network: + - Fix warning when enabling hotspot. + - Fix saving of IPv6 gateway. + - Fix warning if IPv6 gateway is empty. + - Fix IPv6 settings not being applicable when method changes. + - Return better error when 8021x security is invalid. + - Avoid warning when ad-hoc mode is invalid. + - Re-set the SSID when enabling the Hotspot. + - Fix crash when changing IPv4 DNS. + + Keyboard: + - Many UI changes following up from the panel redesign. + - Don't grab the mouse pointer when capturing shortcuts. + - Don't regrab the keyboard after an event if already grabbed. + - Fix grabs not working when initially showing the dialog. + - Don't apply "Backspace" straight away. + - Allow Tab and Super in accels. + - Normalise Shift and Tab in shortcuts. + - Fix shortcut label in RTL languages. + + Region: Avoid a crash on panel destruction. + ------------------------------------------------------------------- Thu Sep 8 12:51:17 UTC 2016 - dimstar@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index c7a755a..dab7187 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -29,7 +29,7 @@ %define with_cacert_patch 0 Name: gnome-control-center -Version: 3.21.90 +Version: 3.21.92 Release: 0 Summary: The GNOME Control Center License: GPL-2.0+ From ab749591553c8140c3f275f1236d265fbdd00f0a43e68bdd9623429218fc39b9 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 18 Sep 2016 19:51:50 +0000 Subject: [PATCH 5/7] Accepting request 428437 from home:zhangxiaofei:branches:GNOME:Factory - Rebase gnome-control-center-890979-change-remote-passwd.patch on 3.21.92. - Add gnome-control-center-info-never-use-gnome-software.patch: On SLE12-SP2 and Leap42.2, never search for gnome-software as an option when checking for updates in info panel, because we use gpk-update-viewer (bsc#999336). - Changelog: + Remove duplicate addtion of gnome-control-center-890979-change-remote-passwd.patch: already in the entry "Tue Sep 23 22:32:24 UTC 2014 - dliang@suse.com" + Remove redundant entry of "Update to GNOME 3.20.x Fate#318572", just to get around IBS changelog checkers and not really informative. OBS-URL: https://build.opensuse.org/request/show/428437 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=332 --- ...l-center-890979-change-remote-passwd.patch | 13 +++++---- ...center-info-never-use-gnome-software.patch | 25 ++++++++++++++++ gnome-control-center.changes | 29 ++++++++++--------- gnome-control-center.spec | 5 ++++ 4 files changed, 53 insertions(+), 19 deletions(-) create mode 100644 gnome-control-center-info-never-use-gnome-software.patch diff --git a/gnome-control-center-890979-change-remote-passwd.patch b/gnome-control-center-890979-change-remote-passwd.patch index af2c324..6937354 100644 --- a/gnome-control-center-890979-change-remote-passwd.patch +++ b/gnome-control-center-890979-change-remote-passwd.patch @@ -1,10 +1,11 @@ -diff -Nur gnome-control-center-3.10.3.bak/panels/user-accounts/um-user-panel.c gnome-control-center-3.10.3/panels/user-accounts/um-user-panel.c ---- gnome-control-center-3.10.3.bak/panels/user-accounts/um-user-panel.c 2014-09-24 06:25:22.293935423 +0800 -+++ gnome-control-center-3.10.3/panels/user-accounts/um-user-panel.c 2014-09-24 06:27:53.801939024 +0800 -@@ -687,7 +687,10 @@ +diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c +index 4f11a0a..1bb7738 100644 +--- a/panels/user-accounts/um-user-panel.c ++++ b/panels/user-accounts/um-user-panel.c +@@ -900,7 +900,10 @@ show_user (ActUser *user, CcUserPanelPrivate *d) - widget = get_widget (d, "account-password-button"); - um_editable_button_set_text (UM_EDITABLE_BUTTON (widget), get_password_mode_text (user)); + widget = get_widget (d, "account-password-button-label"); + gtk_label_set_label (GTK_LABEL (widget), get_password_mode_text (user)); +/* Enable the remote account also. enable = act_user_is_local_account (user); +*/ diff --git a/gnome-control-center-info-never-use-gnome-software.patch b/gnome-control-center-info-never-use-gnome-software.patch new file mode 100644 index 0000000..dc9f70e --- /dev/null +++ b/gnome-control-center-info-never-use-gnome-software.patch @@ -0,0 +1,25 @@ +From 0884359b9fe093f4023ee404274ed3cdf76b857e Mon Sep 17 00:00:00 2001 +From: Felix Zhang +Date: Sat, 17 Sep 2016 00:33:20 +0800 +Subject: [PATCH] info: never use gnome-software + +--- + panels/info/cc-info-panel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c +index ad89d54..d904f6c 100644 +--- a/panels/info/cc-info-panel.c ++++ b/panels/info/cc-info-panel.c +@@ -1512,7 +1512,7 @@ info_panel_setup_overview (CcInfoPanel *self) + static gboolean + does_gnome_software_exist (void) + { +- return g_file_test (BINDIR "/gnome-software", G_FILE_TEST_EXISTS); ++ return FALSE; + } + + static gboolean +-- +2.6.6 + diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 5570616..608a104 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sun Sep 18 05:47:23 UTC 2016 - fezhang@suse.com + +- Rebase gnome-control-center-890979-change-remote-passwd.patch on + 3.21.92. + +------------------------------------------------------------------- +Fri Sep 16 16:52:17 UTC 2016 - fezhang@suse.com + +- Add gnome-control-center-info-never-use-gnome-software.patch: + On SLE12-SP2 and Leap42.2, never search for gnome-software as an + option when checking for updates in info panel, because we use + gpk-update-viewer (bsc#999336). + ------------------------------------------------------------------- Tue Sep 13 20:23:53 UTC 2016 - zaitor@opensuse.org @@ -169,11 +183,6 @@ Mon May 30 08:26:00 UTC 2016 - fcrozat@suse.com provided by it). Add Supplements to ensure it will be pulled when gnome-online-accounts is installed. (FATE#318572) -------------------------------------------------------------------- -Thu May 26 08:47:25 UTC 2016 - fezhang@suse.com - -- Update to GNOME 3.20.2 Fate#318572 - ------------------------------------------------------------------- Fri May 20 15:38:00 UTC 2016 - zaitor@opensuse.org @@ -275,12 +284,6 @@ Mon Mar 21 14:45:14 UTC 2016 - dimstar@opensuse.org - Update to version 3.20.0: + Updated translations. -------------------------------------------------------------------- -Sun Mar 20 15:31:11 UTC 2016 - fezhang@suse.com - -- Add gnome-control-center-890979-change-remote-passwd.patch: - Enable remote user to change password in user panel (bsc#890979). - ------------------------------------------------------------------- Thu Mar 17 14:37:24 UTC 2016 - dimstar@opensuse.org @@ -930,8 +933,8 @@ Wed Sep 24 04:53:24 UTC 2014 - badshah400@gmail.com ------------------------------------------------------------------- Tue Sep 23 22:32:24 UTC 2014 - dliang@suse.com -- Add gnome-control-center-890979-change-remote-passwd.patch - (bnc#890979) +- Add gnome-control-center-890979-change-remote-passwd.patch: + Enable remote user to change password in user panel (bsc#890979). ------------------------------------------------------------------- Mon Sep 22 17:09:55 UTC 2014 - zaitor@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index dab7187..06c8ee0 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -48,6 +48,8 @@ Patch17: gnome-control-center-follow-polkit-permissions-for-tz.patch Patch18: gnome-control-center-890979-change-remote-passwd.patch # PATCH-FIX-OPENSUSE gnome-control-center-disable-error-message-for-NM.patch bsc#989801 sckang@suse.com -- network: Improve the check for whether NM or wicked is running Patch20: gnome-control-center-disable-error-message-for-NM.patch +# PATCH-FIX-OPENSUSE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer. +Patch21: gnome-control-center-info-never-use-gnome-software.patch BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -210,6 +212,9 @@ translation-update-upstream %patch18 -p1 %endif %patch20 -p1 +%if 0%{?suse_version} == 1315 +%patch21 -p1 +%endif %build ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh From ed6cfd810d8a1963789d82b9d1d16c8e9036f21e217bbc024ca37996b20d3017 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 19 Sep 2016 17:37:39 +0000 Subject: [PATCH 6/7] Accepting request 428755 from home:zhangxiaofei:branches:GNOME:Factory - Changelog cleanup + Fix history of with_cacert_patch + Break lone lines + Unify patch history format + Add missing IDs OBS-URL: https://build.opensuse.org/request/show/428755 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=333 --- gnome-control-center.changes | 138 +++++++++++++++-------------------- 1 file changed, 58 insertions(+), 80 deletions(-) diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 608a104..0a37761 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -160,6 +160,8 @@ Fri Aug 26 13:24:49 UTC 2016 - badshah400@gmail.com + Updated translations. - Drop gnome-control-center-touchpad-wayland-cap.patch; incorporated upstream. +- Set define with_cacert_patch to 0, + gnome-control-center-probe-radius-server-cert.patch needs rebase. ------------------------------------------------------------------- Thu Jul 26 06:53:23 UTC 2016 - sckang@suse.com @@ -219,19 +221,9 @@ Thu Apr 14 10:30:34 UTC 2016 - zaitor@opensuse.org - Drop 0001-network-Fix-empty-Wifi-list.patch: Fixed upstream. ------------------------------------------------------------------- -Tue Apr 12 11:00:06 UTC 2016 - zaitor@opensuse.org - -- Set define with_cacert_patch to 0, needed now since we have - non-rebased patches in NetworkManager. - -------------------------------------------------------------------- -Tue Apr 12 10:00:06 UTC 2016 - fezhang@suse.com +Tue Apr 12 12:00:06 UTC 2016 - fezhang@suse.com - Update to GNOME 3.20 Fate#318572 -- Add 0001-network-Fix-empty-Wifi-list.patch (bsc#870322) -- Add gnome-control-center-add-alacarte-for-sle.patch -- Add gnome-control-center-follow-polkit-permissions-for-tz.patch (boo#956879) -- Add gnome-control-center-hide-firewall-zone-entry.patch (bnc#894394) - Drop commit-0f5e433: fixed upstream - Drop commit-23c4ea2: fixed upstream - Drop commit-a53065d: fixed upstream @@ -239,32 +231,34 @@ Tue Apr 12 10:00:06 UTC 2016 - fezhang@suse.com - Drop commit-ccebd62: fixed upstream - Drop commit-d2074fa: fixed upstream - Drop commit-eed8f71: fixed upstream -- Drop gnome-control-center-bnc862415-timezone.patch (bnc#862415): - fixed upstream -- Drop gnome-control-center-bnc865632-disable-popup-for-NM.patch (bnc#865632): - fixed upstream -- Drop gnome-control-center-bnc894394-hide-firewall-zone-entry.patch (bnc#894394): - fixed upstream -- Drop gnome-control-center-bnc947761-fix-color-dialog-translations.patch (bnc#947761): - fixed upstream -- Drop gnome-control-center-change-password-i18n.patch (bnc#880303): - fixed upstream -- Drop gnome-control-center-datetime-i18n.patch (bnc#884425, bgo#732585): - fixed upstream -- Drop gnome-control-center-display-login-region.patch (bsc#955322): - fixed upstream -- Drop gnome-control-center-fix-wifi-list.patch (bsc#870322): - replaced by upstream fix 0001-network-Fix-empty-Wifi-list.patch -- Drop gnome-control-center-Pyongyang-Time.patch (bsc#951590, boo#941290, bgo#753643): - fixed upstream -- Drop gnome-control-center-upower-changed-signal.patch: fixed upstream -- Drop gnome-control-center-upower-DeviceChanged-signal.patch: fixed upstream -- Drop gnome-control-center-upower-display.patch: fixed upstream -- Drop gnome-control-center-upower-fix-build.patch: fixed upstream -- Drop gnome-control-center-upower-icons.patch: fixed upstream -- Rebase gcc-private-connection.patch (bnc#751211) -- Rebase gnome-control-center-allow-extra-tools-in-shell.patch (bnc#866235) -- Rebase gnome-control-center-probe-radius-server-cert.patch (bnc#574266) +- Drop gnome-control-center-bnc862415-timezone.patch: + Fixed upstream (bnc#862415). +- Drop gnome-control-center-bnc865632-disable-popup-for-NM.patch: + Fixed upstream (bnc#865632). +- Drop + gnome-control-center-bnc894394-hide-firewall-zone-entry.patch: + Fixed upstream (bnc#894394). +- Drop gnome-control-center-bnc947761-fix-color-dialog-translations.patch: + Fixed upstream (bnc#947761). +- Drop gnome-control-center-change-password-i18n.patch: + Fixed upstream (bnc#880303). +- Drop gnome-control-center-datetime-i18n.patch: + Fixed upstream (bnc#884425 bgo#732585). +- Drop gnome-control-center-display-login-region.patch: + Fixed upstream (bsc#955322). +- Drop gnome-control-center-fix-wifi-list.patch: + Replaced by 0001-network-Fix-empty-Wifi-list.patch (bsc#870322). +- Rebase gcc-private-connection.patch (bnc#751211). +- Rebase gnome-control-center-allow-extra-tools-in-shell.patch + (bnc#866235). +- Rebase gnome-control-center-probe-radius-server-cert.patch: + Toggle with_cacert_patch to 1 to enable it (bnc#574266). + +------------------------------------------------------------------- +Tue Apr 12 11:00:06 UTC 2016 - zaitor@opensuse.org + +- Set define with_cacert_patch to 0, needed now since we have + non-rebased patches in NetworkManager. ------------------------------------------------------------------- Wed Mar 30 10:26:26 UTC 2016 - sckang@suse.com @@ -275,8 +269,8 @@ Wed Mar 30 10:26:26 UTC 2016 - sckang@suse.com ------------------------------------------------------------------- Thu Mar 24 07:12:23 UTC 2016 - sckang@suse.com -- Fix Wifi list not showing APs correctly (bsc#870322) - + Add gnome-control-center-fix-wifi-list.patch +- Add gnome-control-center-fix-wifi-list.patch: + Fix Wifi list not showing APs correctly (bsc#870322). ------------------------------------------------------------------- Mon Mar 21 14:45:14 UTC 2016 - dimstar@opensuse.org @@ -352,8 +346,8 @@ Tue Jan 19 10:38:07 UTC 2016 - dimstar@opensuse.org Mon Dec 28 15:23:15 UTC 2015 - qzhao@suse.com - Add gnome-control-center-display-login-region.patch: - Fix bug login language button in region list disappear. - (bsc#955322) + Fix bug login language button in region list disappear + (bsc#955322). ------------------------------------------------------------------- Mon Dec 21 17:56:38 UTC 2015 - damjanovic.ivo@gmail.com @@ -386,9 +380,9 @@ Mon Dec 14 02:54:57 UTC 2015 - badshah400@gmail.com ------------------------------------------------------------------- Mon Nov 30 13:52:06 UTC 2015 - fezhang@suse.com -- Fix the unlocalised heading on the Add Profile dialog on Color - panel (bnc#947761) - - Add gnome-control-center-bnc947761-fix-color-dialog-translations.patch +- Add gnome-control-center-bnc947761-fix-color-dialog-translations.patch + Fix the unlocalised heading on the Add Profile dialog on Color + panel (bnc#947761). ------------------------------------------------------------------- Tue Nov 10 15:58:06 UTC 2015 - zaitor@opensuse.org @@ -533,15 +527,6 @@ Mon Aug 31 06:45:32 UTC 2015 - dimstar@opensuse.org - Rebase gnome-control-center-hide-firewall-zone-entry.patch and gcc-private-connection.patch. -------------------------------------------------------------------- -Mon Aug 31 06:45:31 UTC 2015 - dimstar@opensuse.org - -- Add gnome-control-center-Pyongyang-Time.patch: North Korea - changed its timezone to UTC+08:30. -- Add timezone_8.5.png, timezone_8.5_dim.png, timezone_9.png and - timezone_9_dim.png as source files: patch is not willing to patch - binary files. - ------------------------------------------------------------------- Sun Aug 30 14:48:16 UTC 2015 - dimstar@opensuse.org @@ -912,9 +897,11 @@ Tue Oct 7 16:38:35 CEST 2014 - sbrabec@suse.cz - Fix untranslatability of "Change Password" (bnc#880303, gnome-control-center-change-password-l10n.patch) -- Add support for 8.5 time zone to fix compilation failure - (gnome-control-center-Pyongyang-Time.patch, - gnome-control-center-Pyongyang-Time.tar.bz2, bgo#753643). +- Add gnome-control-center-Pyongyang-Time.patch: + North Korea changed its timezone to UTC+08:30. +- Add timezone_8.5.png, timezone_8.5_dim.png, timezone_9.png and + timezone_9_dim.png as source files: patch is not willing to patch + binary files (bsc#951590 boo#941290 bgo#753643). ------------------------------------------------------------------- Tue Sep 30 11:30:07 UTC 2014 - dimstar@opensuse.org @@ -982,8 +969,8 @@ Tue Sep 16 20:09:22 UTC 2014 - dimstar@opensuse.org ------------------------------------------------------------------- Tue Sep 9 11:41:54 UTC 2014 - fezhang@suse.com -- Hide Firewall zone entry in Network panel (bnc#894394) - + added patch: gnome-control-center-bnc894394-hide-firewall-zone-entry.patch +- Add gnome-control-center-bnc894394-hide-firewall-zone-entry.patch + Hide Firewall zone entry in Network panel (bnc#894394). ------------------------------------------------------------------- Sun Sep 7 11:55:48 UTC 2014 - zaitor@opensuse.org @@ -999,8 +986,8 @@ Sun Sep 7 11:55:48 UTC 2014 - zaitor@opensuse.org ------------------------------------------------------------------- Fri Sep 5 22:52:01 UTC 2014 - sreeves@suse.com -- Add gnome-control-center-bnc862415-timezone.patch - Allow changing timezone without root privs. +- Add gnome-control-center-bnc862415-timezone.patch: + Allow changing timezone without root privs (bnc#862415). ------------------------------------------------------------------- Thu Aug 28 14:00:18 UTC 2014 - fcrozat@suse.com @@ -1046,9 +1033,9 @@ Tue Aug 19 19:17:19 UTC 2014 - dimstar@opensuse.org ------------------------------------------------------------------- Fri Aug 8 17:07:11 CEST 2014 - sbrabec@suse.cz -- Make punctuation translatable in datetime preferences - (bnc#884425, bgo#732585, - gnome-control-center-datetime-i18n.patch) +- Add gnome-control-center-datetime-i18n.patch: + Make punctuation translatable in datetime preferences (bnc#884425 + bgo#732585). ------------------------------------------------------------------- Thu Aug 7 12:53:39 UTC 2014 - fcrozat@suse.com @@ -1145,9 +1132,9 @@ Thu Aug 7 12:31:29 UTC 2014 - fcrozat@suse.com ------------------------------------------------------------------- Mon Jul 21 06:30:52 UTC 2014 - fezhang@suse.com -- Remove the device add / remove button in Network panel when NM is - not running (bnc#865632) - + updated patch: gnome-control-center-bnc865632-disable-popup-for-NM.patch +- Update gnome-control-center-bnc865632-disable-popup-for-NM.patch: + Remove the device add / remove button in Network panel when NM is + not running (bnc#865632). ------------------------------------------------------------------- Fri Jun 27 21:26:57 UTC 2014 - sreeves@suse.com @@ -1177,8 +1164,8 @@ Fri Jun 13 08:03:48 UTC 2014 - fezhang@suse.com ------------------------------------------------------------------- Thu May 15 07:34:19 UTC 2014 - fezhang@suse.com -- Remove the popup error message in Network (bnc#865632) - + added patch: gnome-control-center-bnc865632-disable-popup-for-NM.patch +- Add gnome-control-center-bnc865632-disable-popup-for-NM.patch: + Remove the popup error message in Network (bnc#865632). ------------------------------------------------------------------- Wed May 7 23:35:53 UTC 2014 - dliang@suse.com @@ -1410,17 +1397,6 @@ Thu Jan 30 13:00:38 UTC 2014 - fcrozat@suse.com - Ensure gnome-control-center-color Supplements gnome-control-center. -------------------------------------------------------------------- -Fri Jan 24 17:47:03 UTC 2014 - mgorse@suse.com - -- Add gnome-control-center-upower-DeviceChanged-signal.patch, - gnome-control-center-upower-display.patch, - gnome-control-center-upower-fix-build.patch, - gnome-control-center-upower-icons.patch, - gnome-control-center-upower-changed-signal.patch -- update for libupower-glib - API changes, from 3.11. -- Up libupower-glib dependency - ------------------------------------------------------------------- Tue Dec 17 12:07:47 UTC 2013 - mgorse@suse.com @@ -1429,7 +1405,9 @@ Tue Dec 17 12:07:47 UTC 2013 - mgorse@suse.com + gnome-control-center-upower-display.patch + gnome-control-center-upower-fix-build.patch + gnome-control-center-upower-icons.patch - + gnome-control-center-upower-changed-signal.patch + + gnome-control-center-upower-changed-signal.patch -- update for + libupower-glib API changes, from 3.11. +- Up libupower-glib dependency ------------------------------------------------------------------- Tue Nov 12 19:52:46 UTC 2013 - dimstar@opensuse.org From 5cf73e3a2c968482af1856c8eb8d21ee14c7e3fdc35dbbf9e80eec73b31e4887 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 20 Sep 2016 18:38:25 +0000 Subject: [PATCH 7/7] Accepting request 429026 from GNOME:Next Update to 3.22.0 OBS-URL: https://build.opensuse.org/request/show/429026 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=334 --- gnome-control-center-3.21.92.tar.xz | 3 --- gnome-control-center-3.22.0.tar.xz | 3 +++ gnome-control-center.changes | 16 ++++++++++++++++ gnome-control-center.spec | 4 ++-- 4 files changed, 21 insertions(+), 5 deletions(-) delete mode 100644 gnome-control-center-3.21.92.tar.xz create mode 100644 gnome-control-center-3.22.0.tar.xz diff --git a/gnome-control-center-3.21.92.tar.xz b/gnome-control-center-3.21.92.tar.xz deleted file mode 100644 index 8ab6f37..0000000 --- a/gnome-control-center-3.21.92.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5579fb61ce1eae6ddce81bc953ec9cb0fae314d84246b74f6af1c27224ef97a0 -size 7214196 diff --git a/gnome-control-center-3.22.0.tar.xz b/gnome-control-center-3.22.0.tar.xz new file mode 100644 index 0000000..66f1638 --- /dev/null +++ b/gnome-control-center-3.22.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d264ae919aeeb27987dcdd5af5577fad0590e1f184f506b563c89f356aab5052 +size 7258436 diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 0a37761..b21ddb2 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Sep 20 16:06:53 UTC 2016 - dimstar@opensuse.org + +- Update to version 3.22.0: + + Network: + - Only show a gateway entry for the first IPv4 address, + NetworkManager ignored every subsequent ones, but we still + had a UI for those. + - Fix application of the default gateway. + - Fix possible crashes when editing IPv4 gateways or routes. + + Power: + - Fix "automatic suspend" label not taking batteries into + account. + - Fix initial state of the Wi-Fi switch. + + Updated translations. + ------------------------------------------------------------------- Sun Sep 18 05:47:23 UTC 2016 - fezhang@suse.com diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 06c8ee0..d2299c9 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -29,13 +29,13 @@ %define with_cacert_patch 0 Name: gnome-control-center -Version: 3.21.92 +Version: 3.22.0 Release: 0 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.21/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnome-control-center/3.22/%{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE gnome-control-center-allow-extra-tools-in-shell.patch fezhang@suse.com -- Add dconf-editor, gnome-tweak-tool, pkg-prefs, itweb-settings, tracker-preferences and Yast to g-c-c. Patch0: gnome-control-center-allow-extra-tools-in-shell.patch # PATCH-FEATURE-SLE gnome-control-center-add-alacarte-for-sle.patch badshah400@gmail.com -- Add back alacarte for SLE since they require it for their classic mode, on the other hand for TW and other openSUSE versions it should be enough that alacarte is still available from shell overview, just not in the g-c-c shell. This patch must be applied only if required and then immediately after gnome-control-center-allow-extra-tools-in-shell.patch