From 81a98966e95b2307b02da3eb2c59d69908802124ecbd7c8faee69929bf247e49 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 31 Aug 2017 07:41:33 +0000 Subject: [PATCH 1/7] Accepting request 519344 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/519344 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=355 --- gnome-control-center-3.24.3.tar.xz | 3 - gnome-control-center-3.25.91.tar.xz | 3 + ...ol-center-allow-extra-tools-in-shell.patch | 77 +++++---- ...-center-disable-error-message-for-NM.patch | 101 +++++++----- ...trol-center-info-disc-size-for-btrfs.patch | 46 ------ ...center-info-never-use-gnome-software.patch | 23 +-- ...rol-center-more-power-button-actions.patch | 16 +- gnome-control-center.changes | 153 ++++++++++++++++++ gnome-control-center.spec | 37 ++--- 9 files changed, 278 insertions(+), 181 deletions(-) delete mode 100644 gnome-control-center-3.24.3.tar.xz create mode 100644 gnome-control-center-3.25.91.tar.xz delete mode 100644 gnome-control-center-info-disc-size-for-btrfs.patch diff --git a/gnome-control-center-3.24.3.tar.xz b/gnome-control-center-3.24.3.tar.xz deleted file mode 100644 index fcce048..0000000 --- a/gnome-control-center-3.24.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43a4d2a4c222ee4a53428a4a720f823e157e4d4c597ea1a84e438d242596cca2 -size 7302120 diff --git a/gnome-control-center-3.25.91.tar.xz b/gnome-control-center-3.25.91.tar.xz new file mode 100644 index 0000000..18b50cd --- /dev/null +++ b/gnome-control-center-3.25.91.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55540de3e04761635a58e3baf33b6f4866326a8ed9a3a0affc11e3a6bb166c06 +size 7401528 diff --git a/gnome-control-center-allow-extra-tools-in-shell.patch b/gnome-control-center-allow-extra-tools-in-shell.patch index aa99e86..a5c7bd6 100644 --- a/gnome-control-center-allow-extra-tools-in-shell.patch +++ b/gnome-control-center-allow-extra-tools-in-shell.patch @@ -1,18 +1,8 @@ -From 8469e4ac57f3b5d3efbf533ba23512612997ffff Mon Sep 17 00:00:00 2001 -From: Felix Zhang -Date: Fri, 2 Sep 2016 14:55:12 +0800 -Subject: [PATCH] allow extra tools in shell - ---- - shell/cc-panel-loader.c | 28 ++++++++++++++++++++++++++-- - shell/cc-window.c | 41 +++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 67 insertions(+), 2 deletions(-) - -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 { +diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c +index fc235fe..816cd1c 100644 +--- a/shell/cc-panel-loader.c ++++ b/shell/cc-panel-loader.c +@@ -106,6 +106,12 @@ static struct { #ifdef BUILD_WACOM PANEL_TYPE("wacom", cc_wacom_panel_get_type ), #endif @@ -25,9 +15,9 @@ Index: gnome-control-center-3.21.90/shell/cc-panel-loader.c }; GList * -@@ -146,7 +152,8 @@ parse_categories (GDesktopAppInfo *app) - #else - if (g_strv_contains (const_strv (split), "HardwareSettings")) +@@ -139,7 +145,8 @@ parse_categories (GDesktopAppInfo *app) + retval = CC_CATEGORY_HIDDEN; + 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") @@ -35,12 +25,22 @@ Index: gnome-control-center-3.21.90/shell/cc-panel-loader.c 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 +@@ -148,7 +155,8 @@ parse_categories (GDesktopAppInfo *app) + retval = CC_CATEGORY_HIDDEN; + else if (g_strv_contains (const_strv (split), "X-GNOME-ConnectivitySettings")) + retval = CC_CATEGORY_CONNECTIVITY; +- else if (g_strv_contains (const_strv (split), "X-GNOME-PersonalizationSettings")) ++ else if (g_strv_contains (const_strv (split), "X-GNOME-PersonalizationSettings") ++ || g_strv_contains (const_strv (split), "X-GNOME-DesktopSettings")) + retval = CC_CATEGORY_PERSONALIZATION; + else if (g_strv_contains (const_strv (split), "X-GNOME-AccountSettings")) + retval = CC_CATEGORY_ACCOUNT; +@@ -181,15 +189,31 @@ cc_panel_loader_fill_model (CcShellModel *model) { - GDesktopAppInfo *app; - char *desktop_name; -+ char *name; - int category; + g_autoptr (GDesktopAppInfo) app; + g_autofree gchar *desktop_name = NULL; ++ g_autofree gchar *name = NULL; + gint category; +#ifndef CC_PANEL_LOADER_NO_GTYPES + if (all_panels[i].get_type == NULL) @@ -57,33 +57,30 @@ Index: gnome-control-center-3.21.90/shell/cc-panel-loader.c + name = g_strconcat (all_panels[i].name, NULL); + } app = g_desktop_app_info_new (desktop_name); - g_free (desktop_name); - if (app == NULL) + if (!app) { + if (!g_str_has_prefix(name, "suse-")) + { - g_warning ("Ignoring broken panel %s (missing desktop file)", - all_panels[i].name); + g_warning ("Ignoring broken panel %s (missing desktop file)", all_panels[i].name); + } continue; } -@@ -191,7 +214,8 @@ cc_panel_loader_fill_model (CcShellModel - if (G_UNLIKELY (category < 0)) - continue; - -- cc_shell_model_add_item (model, category, G_APP_INFO (app), all_panels[i].name); +@@ -201,7 +225,7 @@ cc_panel_loader_fill_model (CcShellModel *model) + * that are only visible in the new Shell. + */ + if (category != CC_CATEGORY_HIDDEN) +- 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.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) + +diff --git a/shell/cc-window.c b/shell/cc-window.c +index 9f29c55..3be0d4e 100644 +--- a/shell/cc-window.c ++++ b/shell/cc-window.c +@@ -114,6 +114,41 @@ get_icon_name_from_g_icon (GIcon *gicon) return NULL; } @@ -125,7 +122,7 @@ Index: gnome-control-center-3.21.90/shell/cc-window.c static gboolean activate_panel (CcWindow *self, const gchar *id, -@@ -151,6 +186,12 @@ activate_panel (CcWindow *self +@@ -126,6 +161,12 @@ activate_panel (CcWindow *self, if (!id) return FALSE; diff --git a/gnome-control-center-disable-error-message-for-NM.patch b/gnome-control-center-disable-error-message-for-NM.patch index 8c3639c..2920f37 100644 --- a/gnome-control-center-disable-error-message-for-NM.patch +++ b/gnome-control-center-disable-error-message-for-NM.patch @@ -1,8 +1,19 @@ -Index: gnome-control-center-3.20.1/panels/network/cc-network-panel.c -=================================================================== ---- gnome-control-center-3.20.1.orig/panels/network/cc-network-panel.c -+++ gnome-control-center-3.20.1/panels/network/cc-network-panel.c -@@ -1286,10 +1286,23 @@ panel_check_network_manager_version (CcN +diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c +index ad019a380..9b5119b77 100644 +--- a/panels/network/cc-network-panel.c ++++ b/panels/network/cc-network-panel.c +@@ -64,8 +64,10 @@ struct _CcNetworkPanel + /* widgets */ + GtkWidget *box_proxy; + GtkWidget *box_vpn; ++ GtkWidget *box_vpn1; + GtkWidget *box_wired; + GtkWidget *empty_listbox; ++ GtkWidget *label_NM_warning; + + /* wireless dialog stuff */ + CmdlineOperation arg_operation; +@@ -734,10 +736,23 @@ panel_check_network_manager_version (CcNetworkPanel *panel) GtkWidget *label; gchar *markup; const gchar *version; @@ -21,27 +32,22 @@ Index: gnome-control-center-3.20.1/panels/network/cc-network-panel.c + state = g_variant_get_string (variant, NULL); /* parse running version */ - version = nm_client_get_version (panel->priv->client); + version = nm_client_get_version (panel->client); - if (version == NULL) { + if (version == NULL && g_strcmp0 (state, "inactive") == 0) { gtk_container_remove (GTK_CONTAINER (panel), gtk_bin_get_child (GTK_BIN (panel))); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20); -@@ -1312,9 +1325,22 @@ panel_check_network_manager_version (CcN +@@ -760,9 +775,17 @@ panel_check_network_manager_version (CcNetworkPanel *panel) gtk_widget_show_all (box); g_free (markup); + } else if (g_strcmp0 (state, "active") == 0) { -+ GtkWidget *w; -+ -+ w = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, -+ "devices_toolbar")); -+ gtk_widget_hide (w); -+ w = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, -+ "label_NM_warning")); -+ gtk_widget_show (w); ++ gtk_widget_hide (panel->box_vpn1); ++ gtk_widget_hide (panel->box_wired); ++ gtk_widget_show (panel->label_NM_warning); } else { - manager_running (panel->priv->client, NULL, panel); + manager_running (panel->client, NULL, panel); } + + g_object_unref (connection); @@ -50,27 +56,46 @@ Index: gnome-control-center-3.20.1/panels/network/cc-network-panel.c } static void -Index: gnome-control-center-3.20.1/panels/network/network.ui -=================================================================== ---- gnome-control-center-3.20.1.orig/panels/network/network.ui -+++ gnome-control-center-3.20.1/panels/network/network.ui -@@ -127,6 +127,19 @@ - 1 - +@@ -816,9 +839,11 @@ cc_network_panel_class_init (CcNetworkPanelClass *klass) + + gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, box_proxy); + gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, box_vpn); ++ gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, box_vpn1); + gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, box_wired); + gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, empty_listbox); + gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, sizegroup); ++ gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, label_NM_warning); + + gtk_widget_class_bind_template_callback (widget_class, create_connection_cb); + } +diff --git a/panels/network/network.ui b/panels/network/network.ui +index 93b770d0d..0a35c3270 100644 +--- a/panels/network/network.ui ++++ b/panels/network/network.ui +@@ -79,7 +79,7 @@ + + + +- ++ + True + False + vertical +@@ -168,6 +168,14 @@ + vertical + + ++ ++ ++ False ++ False ++ 0 ++ Please use YaST2 to configure your network. ++ ++ + -+ -+ -+ False -+ False -+ 0 -+ Please use YaST2 to configure your network. -+ -+ -+ False -+ True -+ 2 -+ -+ - - True +-- +2.13.4 + diff --git a/gnome-control-center-info-disc-size-for-btrfs.patch b/gnome-control-center-info-disc-size-for-btrfs.patch deleted file mode 100644 index 8af0bb3..0000000 --- a/gnome-control-center-info-disc-size-for-btrfs.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c -index d904f6c..d9d3504 100644 ---- a/panels/info/cc-info-panel.c -+++ b/panels/info/cc-info-panel.c -@@ -547,7 +547,9 @@ get_primary_disc_info (CcInfoPanel *self) - { - GList *points; - GList *p; -+ GHashTable *hash; - -+ hash = g_hash_table_new (g_str_hash, g_str_equal); - points = g_unix_mount_points_get (NULL); - - /* If we do not have /etc/fstab around, try /etc/mtab */ -@@ -558,21 +560,30 @@ get_primary_disc_info (CcInfoPanel *self) - { - GUnixMountEntry *mount = p->data; - const char *mount_path; -+ const char *device_path; - - mount_path = g_unix_mount_get_mount_path (mount); -+ device_path = g_unix_mount_get_device_path (mount); -+ -+ /* Do not count multiple mounts with same device_path, because it is -+ * probably something like btrfs subvolume. Use only the first one in -+ * order to count the real size. */ - - if (gsd_should_ignore_unix_mount (mount) || - gsd_is_removable_mount (mount) || - g_str_has_prefix (mount_path, "/media/") || -- g_str_has_prefix (mount_path, g_get_home_dir ())) -+ g_str_has_prefix (mount_path, g_get_home_dir ()) || -+ g_hash_table_lookup (hash, device_path) != NULL) - { - g_unix_mount_free (mount); - continue; - } - - self->priv->primary_mounts = g_list_prepend (self->priv->primary_mounts, mount); -+ g_hash_table_insert (hash, (gpointer) device_path, (gpointer) device_path); - } - g_list_free (points); -+ g_hash_table_destroy (hash); - - get_primary_disc_info_start (self); - } diff --git a/gnome-control-center-info-never-use-gnome-software.patch b/gnome-control-center-info-never-use-gnome-software.patch index dc9f70e..be83bfd 100644 --- a/gnome-control-center-info-never-use-gnome-software.patch +++ b/gnome-control-center-info-never-use-gnome-software.patch @@ -1,25 +1,14 @@ -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) +diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c +index 7a5879c..7b6c27b 100644 +--- a/panels/info/cc-info-overview-panel.c ++++ b/panels/info/cc-info-overview-panel.c +@@ -829,7 +829,8 @@ info_overview_panel_setup_overview (CcInfoOverviewPanel *self) static gboolean does_gnome_software_exist (void) { - return g_file_test (BINDIR "/gnome-software", G_FILE_TEST_EXISTS); ++ /* no gnome-software for SLE */ + return FALSE; } static gboolean --- -2.6.6 - diff --git a/gnome-control-center-more-power-button-actions.patch b/gnome-control-center-more-power-button-actions.patch index ff069fb..5a80848 100644 --- a/gnome-control-center-more-power-button-actions.patch +++ b/gnome-control-center-more-power-button-actions.patch @@ -1,18 +1,12 @@ diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c -index e631e0b..fed19dd 100644 +index 3377500..f6fd736 100644 --- a/panels/power/cc-power-panel.c +++ b/panels/power/cc-power-panel.c -@@ -2020,9 +2020,11 @@ populate_power_button_model (GtkTreeModel *model) +@@ -2060,6 +2060,7 @@ populate_power_button_model (GtkTreeModel *model, char *name; GsdPowerButtonActionType value; } actions[] = { -- { N_("Suspend"), GSD_POWER_BUTTON_ACTION_SUSPEND }, - { N_("Hibernate"), GSD_POWER_BUTTON_ACTION_HIBERNATE }, -- { N_("Nothing"), GSD_POWER_BUTTON_ACTION_NOTHING } -+ { N_("Interactive"), GSD_POWER_BUTTON_ACTION_INTERACTIVE}, -+ { N_("Nothing"), GSD_POWER_BUTTON_ACTION_NOTHING }, + { N_("Shutdown"), GSD_POWER_BUTTON_ACTION_SHUTDOWN }, -+ { N_("Suspend"), GSD_POWER_BUTTON_ACTION_SUSPEND } - }; - guint i; - + { N_("Suspend"), GSD_POWER_BUTTON_ACTION_SUSPEND }, + { N_("Power Off"), GSD_POWER_BUTTON_ACTION_INTERACTIVE }, + { N_("Hibernate"), GSD_POWER_BUTTON_ACTION_HIBERNATE }, diff --git a/gnome-control-center.changes b/gnome-control-center.changes index eb2d4fd..37e9a72 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,156 @@ +------------------------------------------------------------------- +Wed Aug 23 17:14:33 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.91: + + Several small UI improvements and layout adjustments. + + Various crash fixes. + + Updated translations. +- Disable gnome-control-center-disable-error-message-for-NM.patch + again, needs rebase. + +------------------------------------------------------------------- +Wed Aug 16 09:21:45 UTC 2017 - sckang@suse.com + +- Rebase gnome-control-center-disable-error-message-for-NM.patch + on 3.25.90. + +------------------------------------------------------------------- +Tue Aug 15 08:06:54 UTC 2017 - fezhang@suse.com + +- Rebase SLE / Leap patches and set applied suse_version to 1500: + + gnome-control-center-allow-extra-tools-in-shell.patch. + + gnome-control-center-info-never-use-gnome-software.patch. + + gnome-control-center-more-power-button-actions.patch. + +------------------------------------------------------------------- +Mon Aug 14 19:28:54 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.90: + + Changed to a new shell design with a side bar to switch panels. + + The info panel was split into default apps, overview and + removable media. + + Fixed Toronto being translated as Tortola in some locales. + + Display: Redesigned. + + Network: Redesigned. + + Power: Restore Power Off option for Power Button. + + Updated translations. +- Disable gnome-control-center-allow-extra-tools-in-shell.patch and + gnome-control-center-disable-error-message-for-NM.patch: Needs + rebase. + +------------------------------------------------------------------- +Sat Jul 22 17:31:26 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.4: + + A new Wi-Fi panel is introduced replacing the corresponding + functionality in the Network panel. + + Bluetooth: Center empty states in the panel. + + Display: Adapt to new Mutter interface with scaling per mode. + + Keyboard: + - Fix several memory leaks. + - Follow the usual search pattern for filtering. + - Consider additional bindings in uniqueness checks. + - Consider multiple bindings when resetting. + + Network: + - Replace the notebook with a stack. + - Stop managing wi-fi devices. + + Printers: Fix a crash when the user cancels the add new printer + dialog. + + Region & Language: + - Embed "Restart session" button below the Language entry. + - Make the "Restart" notification persist until the session + restarts. + + Wacom: + - Make the calibrator only reactive to the tablet being + calibrated. + - Fix undesired cursor offsets after the calibration is + applied. + - Recognize and pair pad devices with others on the same + tablet. +- Stop handling glib2_gsettings_schema_post(un), + desktop_database_post(un) and icon_theme_cache_post(un) in + post(un), we have file-triggers taking care of this for us now. +- Drop obsolete clean section. + +------------------------------------------------------------------- +Sat Jul 22 17:31:25 UTC 2017 - dimstar@opensuse.org + +- Update to version 3.25.3: + + Fix memory leaks + + Background: handle EXIF orientation in chooser + + Network: + - Reduce connection editor dialog width. + - Rely on notebook tabs to switch connection editor pages. + - Align details page labels at start. + - Move checkboxes to Details page. + - Drop Reset page. + - Adapt forget button label according to connection type. + - Move Security page to the end. + - Use radio buttons instead of a combobox in IP pages. + - Avoid crashing if the NMDevice doesn't have a hw-address. + - Simplify the ignored Network interface types. + + Online Accounts: + - Move the margins and spacing lower down the hierarchy. + - Increase the spacing above the "Remove Account" button. + + Printers: + - Don't block when removing printers. + - Allow undoing deletion of a printer. + - Add 10s timeout for printer removal. + - Scroll view to show newly added Printer. + - Move options dialog spinner out of the action area. + - Add print "Test Page" button to Options Dialog. + - Hide supply level bar when there is no inklevel data. + + Region & Language: + - Make the input source chooser back button activate on click. + - Don't return the input chooser dialog if nothing is selected. + - Avoid starting with a gap at the bottom of the input chooser. + + Updated translations. + +------------------------------------------------------------------- +Sat Jul 22 17:31:24 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.2: + + Memory leak and correctness fixes. + + Add keywords to several panels to ease search. + + Make more dialogs use headerbars. + + Display: + - Fix blurry icons in night light dialogue. + - Add support for mutter's new display config API. + + Info: + - Fix total disc size for btrfs subvolumes. + - Split up "Base system" and "OS type" to separate lines. + + Keyboard: + - Discard the added shortcut on Escape. + - Allow searching for shortcut accelerators. + + Network: + - Fix SSID not changing when enabling hotspot. + - Fix initial state of Wi-Fi device when using Hotpost. + - Update wireless-security from network-manager-applet. + - Fix mobile broadband switch state. + - Remove support for firewalld zones. + - Update connection titles when they change. + - Sort connections by title. + + Notifications: Forward notification settings to portal. + + Printers: + - Add search capabilities to the panel. + - Improve panel layout. + - Allow printer model label to ellipsize. + - Don't block on the network in the jobs dialogue. + - Add an extra button "Clean Print Heads" when available. + - Fix possible crash when exiting Printers panel. + + Region: Use locale aware date time formats for previewing. + + Search: UI improvements. + + Universal Access: Add Cursor Size selection dialogue. + + User Accounts: + - Fix layout in add user dialog. + - Add strength indicator level for weak passwords. + - Improve password hints. + - Fix photo popup position on wayland. + - Handle EXIF orientation. + + Updated translations. +- Drop gnome-control-center-info-disc-size-for-btrfs.patch: Fixed + upstream. + ------------------------------------------------------------------- Sat Jul 22 17:31:23 UTC 2017 - zaitor@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index d43c240..f650ffa 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.24.3 +Version: 3.25.91 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.24/%{name}-%{version}.tar.xz +Source: https://download.gnome.org/sources/gnome-control-center/3.25/%{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 @@ -46,14 +46,12 @@ Patch16: gnome-control-center-probe-radius-server-cert.patch 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-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 +# PATCH-NEEDS-REBASE 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 was:PATCH-FIX-OPENSUSE 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 # PATCH-FIX-OPENSUSE gnome-control-center-more-power-button-actions.patch bsc#993381 fezhang@suse.com -- power: Bring back the "shutdown" and "interactive" power button actions. Patch22: gnome-control-center-more-power-button-actions.patch -# PATCH-FIX-UPSTREAM gnome-control-center-info-disc-size-for-btrfs.patch bsc#890385 bsc#1037234 bgo#708786 fezhang@suse.com -- info: Fix total disc size for btrfs subvolumes -Patch23: gnome-control-center-info-disc-size-for-btrfs.patch BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -76,15 +74,15 @@ BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.23.0 BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(glib-2.0) >= 2.44.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.53.0 BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.18.2 BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.19.93 -BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.19.1 -BuildRequires: pkgconfig(goa-1.0) >= 3.21.5 +BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.25.90 +BuildRequires: pkgconfig(goa-1.0) >= 3.25.3 BuildRequires: pkgconfig(goa-backend-1.0) BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(grilo-0.3) +BuildRequires: pkgconfig(grilo-0.3) >= 0.2.12 BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.21.4 BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0 BuildRequires: pkgconfig(gudev-1.0) @@ -205,7 +203,7 @@ 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} +%if 0%{?suse_version} == 1500 && 0%{?sle_version} %patch100 -p1 %endif %if %{with_cacert_patch} @@ -215,12 +213,12 @@ translation-update-upstream %if ! 0%{?is_opensuse} %patch18 -p1 %endif -%patch20 -p1 -%if 0%{?suse_version} == 1315 +# Needs rebase, again... +#patch20 -p1 +%if 0%{?suse_version} == 1500 %patch21 -p1 %patch22 -p1 %endif -%patch23 -p1 %build ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh @@ -273,19 +271,6 @@ rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules %endif %fdupes %{buildroot} -%clean -rm -rf %{buildroot} - -%post -%glib2_gsettings_schema_post -%desktop_database_post -%icon_theme_cache_post - -%postun -%glib2_gsettings_schema_postun -%desktop_database_postun -%icon_theme_cache_postun - %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README From c7e905b054a2caa356f501b4c72d097f3522e848e40c59e52f728751d45637ad Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 31 Aug 2017 15:13:03 +0000 Subject: [PATCH 2/7] Accepting request 519908 from GNOME:Next Drop bogus Requires gnome-menu OBS-URL: https://build.opensuse.org/request/show/519908 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=356 --- gnome-control-center.changes | 5 +++++ gnome-control-center.spec | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 37e9a72..aa58841 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 31 10:50:11 UTC 2017 - zaitor@opensuse.org + +- Drop since a long time obsolete gnome-menus Requires. + ------------------------------------------------------------------- Wed Aug 23 17:14:33 UTC 2017 - zaitor@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index f650ffa..d6e4c25 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -111,8 +111,6 @@ BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xft) BuildRequires: pkgconfig(xi) >= 1.2 -# needed for printers panel -Requires: gnome-menus Requires: gnome-settings-daemon # needed for universal access panel Requires: gnome-themes-accessibility From f4bb03aaaf785551beeea6b387b4fe1b1900a8b3303982dcb582c106097f77b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 1 Sep 2017 18:45:43 +0000 Subject: [PATCH 3/7] Accepting request 520232 from GNOME:Next Resub, now with patch + extra diff to fix the last fail in finish translation OBS-URL: https://build.opensuse.org/request/show/520232 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=357 --- gnome-control-center-3.25.91.tar.xz | 3 - gnome-control-center-3.25.92.tar.xz | 3 + ...ontrol-center-fix-finish-translation.patch | 181 ++++++++++++++++++ gnome-control-center.changes | 22 +++ gnome-control-center.spec | 7 +- 5 files changed, 211 insertions(+), 5 deletions(-) delete mode 100644 gnome-control-center-3.25.91.tar.xz create mode 100644 gnome-control-center-3.25.92.tar.xz create mode 100644 gnome-control-center-fix-finish-translation.patch diff --git a/gnome-control-center-3.25.91.tar.xz b/gnome-control-center-3.25.91.tar.xz deleted file mode 100644 index 18b50cd..0000000 --- a/gnome-control-center-3.25.91.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55540de3e04761635a58e3baf33b6f4866326a8ed9a3a0affc11e3a6bb166c06 -size 7401528 diff --git a/gnome-control-center-3.25.92.tar.xz b/gnome-control-center-3.25.92.tar.xz new file mode 100644 index 0000000..a2e0395 --- /dev/null +++ b/gnome-control-center-3.25.92.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ebb706a317d60e8f5077f73519d2faf485e202801b123eefae81e68c79cc3a2b +size 7384212 diff --git a/gnome-control-center-fix-finish-translation.patch b/gnome-control-center-fix-finish-translation.patch new file mode 100644 index 0000000..2902118 --- /dev/null +++ b/gnome-control-center-fix-finish-translation.patch @@ -0,0 +1,181 @@ +From 69667d83cd2c9fc437914fd7464d272e6f968199 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jiri=20Gr=C3=B6nroos?= +Date: Fri, 1 Sep 2017 14:08:27 +0000 +Subject: Update Finnish translation + +--- + po/fi.po | 44 +++++++++++++++++++++----------------------- + 1 file changed, 21 insertions(+), 23 deletions(-) + +diff --git a/po/fi.po b/po/fi.po +index d589d1c..0ff67f4 100644 +--- a/po/fi.po ++++ b/po/fi.po +@@ -26,8 +26,8 @@ msgstr "" + "Project-Id-Version: gnome-control-center\n" + "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" + "control-center&keywords=I18N+L10N&component=general\n" +-"POT-Creation-Date: 2017-08-29 08:17+0000\n" +-"PO-Revision-Date: 2017-08-31 10:30+0300\n" ++"POT-Creation-Date: 2017-08-31 07:30+0000\n" ++"PO-Revision-Date: 2017-09-01 17:04+0300\n" + "Last-Translator: Jiri Grönroos \n" + "Language-Team: suomi \n" + "Language: fi\n" +@@ -35,7 +35,7 @@ msgstr "" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" +-"X-Generator: Gtranslator 2.91.7\n" ++"X-Generator: Poedit 1.8.7.1\n" + "X-POT-Import-Date: 2012-03-07 10:37:43+0000\n" + "X-Project-Style: gnome\n" + +@@ -137,7 +137,7 @@ msgstr "Voit lisätä kuvia %s-kansioon, jolloin ne näkyvät täällä" + #: ../panels/privacy/cc-privacy-panel.c:1049 + #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 + #: ../panels/search/cc-search-locations-dialog.c:642 +-#: ../panels/sharing/cc-sharing-panel.c:375 ++#: ../panels/sharing/cc-sharing-panel.c:382 + #: ../panels/user-accounts/data/account-dialog.ui.h:2 + #: ../panels/user-accounts/data/join-dialog.ui.h:2 + #: ../panels/user-accounts/data/password-dialog.ui.h:2 +@@ -1501,9 +1501,7 @@ msgstr "Tiedot" + #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details + #: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:2 + msgid "Remo­vable Media" +-msgstr "" +-"Erilliset\n" +-"tallennusvälineet" ++msgstr "Erilliset tallennusvälineet" + + #: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:3 + msgid "Configure Removable Media settings" +@@ -2106,7 +2104,7 @@ msgid "Single click, secondary button" + msgstr "Yksi napsautus, toissijainen painike" + + #. add proxy to device list +-#: ../panels/network/cc-network-panel.c:581 ++#: ../panels/network/cc-network-panel.c:579 + msgid "Network proxy" + msgstr "Verkon välityspalvelin" + +@@ -2114,17 +2112,17 @@ msgstr "Verkon välityspalvelin" + #. * window for vpn connections, it is also used to display + #. * vpn connections in the device list. + #. +-#: ../panels/network/cc-network-panel.c:717 ../panels/network/net-vpn.c:192 ++#: ../panels/network/cc-network-panel.c:715 ../panels/network/net-vpn.c:192 + #: ../panels/network/net-vpn.c:321 + #, c-format + msgid "%s VPN" + msgstr "%s - VPN" + +-#: ../panels/network/cc-network-panel.c:781 ../panels/network/wifi.ui.h:7 ++#: ../panels/network/cc-network-panel.c:779 ../panels/network/wifi.ui.h:7 + msgid "Oops, something has gone wrong. Please contact your software vendor." + msgstr "Hups, jokin taisi mennä pieleen. Ota yhteys sovellustoimittajaan." + +-#: ../panels/network/cc-network-panel.c:787 ++#: ../panels/network/cc-network-panel.c:785 + msgid "NetworkManager needs to be running." + msgstr "NetworkManagerin tulee olla käynnissä." + +@@ -2597,7 +2595,7 @@ msgstr "Valitse tuotava tiedosto" + + #: ../panels/network/connection-editor/vpn-helpers.c:182 + #: ../panels/printers/pp-details-dialog.c:320 +-#: ../panels/sharing/cc-sharing-panel.c:376 ++#: ../panels/sharing/cc-sharing-panel.c:383 + #: ../panels/user-accounts/um-photo-dialog.c:222 + msgid "_Open" + msgstr "_Avaa" +@@ -5298,32 +5296,32 @@ msgstr "Asetukset" + msgid "No networks selected for sharing" + msgstr "Ei verkkoja valittu jakamista varten" + +-#: ../panels/sharing/cc-sharing-panel.c:266 ++#: ../panels/sharing/cc-sharing-panel.c:273 + msgctxt "service is enabled" + msgid "On" + msgstr "Päällä" + +-#: ../panels/sharing/cc-sharing-panel.c:268 +-#: ../panels/sharing/cc-sharing-panel.c:295 ++#: ../panels/sharing/cc-sharing-panel.c:275 ++#: ../panels/sharing/cc-sharing-panel.c:302 + msgctxt "service is disabled" + msgid "Off" + msgstr "Pois" + +-#: ../panels/sharing/cc-sharing-panel.c:298 ++#: ../panels/sharing/cc-sharing-panel.c:305 + msgctxt "service is enabled" + msgid "Enabled" + msgstr "Käytössä" + +-#: ../panels/sharing/cc-sharing-panel.c:301 ++#: ../panels/sharing/cc-sharing-panel.c:308 + msgctxt "service is active" + msgid "Active" + msgstr "Aktiivinen" + +-#: ../panels/sharing/cc-sharing-panel.c:372 ++#: ../panels/sharing/cc-sharing-panel.c:379 + msgid "Choose a Folder" + msgstr "Valitse kansio" + +-#: ../panels/sharing/cc-sharing-panel.c:683 ++#: ../panels/sharing/cc-sharing-panel.c:690 + #, c-format + msgid "" + "Personal File Sharing allows you to share your Public folder with others on " +@@ -5332,7 +5330,7 @@ msgstr "" + "Henkilökohtaisen tiedostonjaon avulla voit jakaa julkisen kansiosi verkon " + "muiden käyttäjien kanssa käyttäen osoitetta dav://%s" + +-#: ../panels/sharing/cc-sharing-panel.c:685 ++#: ../panels/sharing/cc-sharing-panel.c:692 + #, c-format + msgid "" + "When remote login is enabled, remote users can connect using the Secure " +@@ -5343,7 +5341,7 @@ msgstr "" + "Secure Shell -komentoa:\n" + "ssh %s" + +-#: ../panels/sharing/cc-sharing-panel.c:687 ++#: ../panels/sharing/cc-sharing-panel.c:694 + #, c-format + msgid "" + "Screen sharing allows remote users to view or control your screen by " +@@ -5352,11 +5350,11 @@ msgstr "" + "Näytön jakaminen sallii etäkäyttäjien seurata ja hallita näyttöäsi " + "yhdistämällä kohteeseen vnc://%s" + +-#: ../panels/sharing/cc-sharing-panel.c:799 ++#: ../panels/sharing/cc-sharing-panel.c:806 + msgid "Copy" + msgstr "Kopioi" + +-#: ../panels/sharing/cc-sharing-panel.c:1125 ++#: ../panels/sharing/cc-sharing-panel.c:1233 + msgid "Sharing" + msgstr "Jakaminen" + +-- +cgit v0.12 + + +--- gnome-control-center-3.25.92-orig/po/fi.po 2017-09-01 14:20:48.000000000 +0200 ++++ gnome-control-center-3.25.92/po/fi.po 2017-09-01 18:51:53.651290930 +0200 +@@ -1473,8 +1473,7 @@ + #: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:2 + msgid "Ab­out" + msgstr "" +-"Järjestelmä-\n" +-"tiedot" ++"Järjestelmä-tiedot" + + #: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:3 + #: ../panels/info/gnome-info-panel.desktop.in.in.h:3 + diff --git a/gnome-control-center.changes b/gnome-control-center.changes index aa58841..44017fc 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Fri Sep 1 12:51:26 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.92: + + A few more layout adjustments for the new shell. + + Make Devices and Details rows selectable. + + Crash and memory leak fixes. + + Display: + - Fix the two output UI to start with the current + configuration. + - Ensure we generate the UI initially on two output mode. + - Don't show inactive monitors in the arrangement widget. + - Show refresh rates with two digits after the radix. + - Round the displayed scale values logically. + - Fix some valid scaled multi monitor layouts being rejected by + mutter. + + Sharing: Add Wayland screen sharing support - only shown if + mutter advertises the capability. + + Updated translations. +- Add gnome-control-center-fix-finish-translation.patch: Fix the + finish translation, it broke the build. + ------------------------------------------------------------------- Thu Aug 31 10:50:11 UTC 2017 - zaitor@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index d6e4c25..8ef0cd9 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.25.91 +Version: 3.25.92 Release: 0 Summary: The GNOME Control Center License: GPL-2.0+ @@ -52,6 +52,8 @@ Patch20: gnome-control-center-disable-error-message-for-NM.patch Patch21: gnome-control-center-info-never-use-gnome-software.patch # PATCH-FIX-OPENSUSE gnome-control-center-more-power-button-actions.patch bsc#993381 fezhang@suse.com -- power: Bring back the "shutdown" and "interactive" power button actions. Patch22: gnome-control-center-more-power-button-actions.patch +# PATCH-FIX-UPSTREAM gnome-control-center-fix-finish-translation.patch zaitor@opensuse.org -- Fix broken finish translation. +Patch23: gnome-control-center-fix-finish-translation.patch BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -78,7 +80,7 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.53.0 BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.18.2 BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.19.93 -BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.25.90 +BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.25.92 BuildRequires: pkgconfig(goa-1.0) >= 3.25.3 BuildRequires: pkgconfig(goa-backend-1.0) BuildRequires: pkgconfig(gobject-introspection-1.0) @@ -217,6 +219,7 @@ translation-update-upstream %patch21 -p1 %patch22 -p1 %endif +%patch23 -p1 %build ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh From 64d21c79ee9d6dd128c384a5d38c7bca3346cc56c950cecfbb8b8a560ebea062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Mon, 4 Sep 2017 20:03:03 +0000 Subject: [PATCH 4/7] Accepting request 520843 from GNOME:Next New unstable OBS-URL: https://build.opensuse.org/request/show/520843 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=358 --- gnome-control-center-3.25.92.1.tar.xz | 3 + gnome-control-center-3.25.92.tar.xz | 3 - ...ontrol-center-fix-finish-translation.patch | 181 ------------------ gnome-control-center.changes | 10 + gnome-control-center.spec | 5 +- 5 files changed, 14 insertions(+), 188 deletions(-) create mode 100644 gnome-control-center-3.25.92.1.tar.xz delete mode 100644 gnome-control-center-3.25.92.tar.xz delete mode 100644 gnome-control-center-fix-finish-translation.patch diff --git a/gnome-control-center-3.25.92.1.tar.xz b/gnome-control-center-3.25.92.1.tar.xz new file mode 100644 index 0000000..25a746a --- /dev/null +++ b/gnome-control-center-3.25.92.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9144c3890f2993760c9b256761003adc2ad3aa770b74cd1b1395eb6319457def +size 7465372 diff --git a/gnome-control-center-3.25.92.tar.xz b/gnome-control-center-3.25.92.tar.xz deleted file mode 100644 index a2e0395..0000000 --- a/gnome-control-center-3.25.92.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ebb706a317d60e8f5077f73519d2faf485e202801b123eefae81e68c79cc3a2b -size 7384212 diff --git a/gnome-control-center-fix-finish-translation.patch b/gnome-control-center-fix-finish-translation.patch deleted file mode 100644 index 2902118..0000000 --- a/gnome-control-center-fix-finish-translation.patch +++ /dev/null @@ -1,181 +0,0 @@ -From 69667d83cd2c9fc437914fd7464d272e6f968199 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jiri=20Gr=C3=B6nroos?= -Date: Fri, 1 Sep 2017 14:08:27 +0000 -Subject: Update Finnish translation - ---- - po/fi.po | 44 +++++++++++++++++++++----------------------- - 1 file changed, 21 insertions(+), 23 deletions(-) - -diff --git a/po/fi.po b/po/fi.po -index d589d1c..0ff67f4 100644 ---- a/po/fi.po -+++ b/po/fi.po -@@ -26,8 +26,8 @@ msgstr "" - "Project-Id-Version: gnome-control-center\n" - "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" - "control-center&keywords=I18N+L10N&component=general\n" --"POT-Creation-Date: 2017-08-29 08:17+0000\n" --"PO-Revision-Date: 2017-08-31 10:30+0300\n" -+"POT-Creation-Date: 2017-08-31 07:30+0000\n" -+"PO-Revision-Date: 2017-09-01 17:04+0300\n" - "Last-Translator: Jiri Grönroos \n" - "Language-Team: suomi \n" - "Language: fi\n" -@@ -35,7 +35,7 @@ msgstr "" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" --"X-Generator: Gtranslator 2.91.7\n" -+"X-Generator: Poedit 1.8.7.1\n" - "X-POT-Import-Date: 2012-03-07 10:37:43+0000\n" - "X-Project-Style: gnome\n" - -@@ -137,7 +137,7 @@ msgstr "Voit lisätä kuvia %s-kansioon, jolloin ne näkyvät täällä" - #: ../panels/privacy/cc-privacy-panel.c:1049 - #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 - #: ../panels/search/cc-search-locations-dialog.c:642 --#: ../panels/sharing/cc-sharing-panel.c:375 -+#: ../panels/sharing/cc-sharing-panel.c:382 - #: ../panels/user-accounts/data/account-dialog.ui.h:2 - #: ../panels/user-accounts/data/join-dialog.ui.h:2 - #: ../panels/user-accounts/data/password-dialog.ui.h:2 -@@ -1501,9 +1501,7 @@ msgstr "Tiedot" - #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details - #: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:2 - msgid "Remo­vable Media" --msgstr "" --"Erilliset\n" --"tallennusvälineet" -+msgstr "Erilliset tallennusvälineet" - - #: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:3 - msgid "Configure Removable Media settings" -@@ -2106,7 +2104,7 @@ msgid "Single click, secondary button" - msgstr "Yksi napsautus, toissijainen painike" - - #. add proxy to device list --#: ../panels/network/cc-network-panel.c:581 -+#: ../panels/network/cc-network-panel.c:579 - msgid "Network proxy" - msgstr "Verkon välityspalvelin" - -@@ -2114,17 +2112,17 @@ msgstr "Verkon välityspalvelin" - #. * window for vpn connections, it is also used to display - #. * vpn connections in the device list. - #. --#: ../panels/network/cc-network-panel.c:717 ../panels/network/net-vpn.c:192 -+#: ../panels/network/cc-network-panel.c:715 ../panels/network/net-vpn.c:192 - #: ../panels/network/net-vpn.c:321 - #, c-format - msgid "%s VPN" - msgstr "%s - VPN" - --#: ../panels/network/cc-network-panel.c:781 ../panels/network/wifi.ui.h:7 -+#: ../panels/network/cc-network-panel.c:779 ../panels/network/wifi.ui.h:7 - msgid "Oops, something has gone wrong. Please contact your software vendor." - msgstr "Hups, jokin taisi mennä pieleen. Ota yhteys sovellustoimittajaan." - --#: ../panels/network/cc-network-panel.c:787 -+#: ../panels/network/cc-network-panel.c:785 - msgid "NetworkManager needs to be running." - msgstr "NetworkManagerin tulee olla käynnissä." - -@@ -2597,7 +2595,7 @@ msgstr "Valitse tuotava tiedosto" - - #: ../panels/network/connection-editor/vpn-helpers.c:182 - #: ../panels/printers/pp-details-dialog.c:320 --#: ../panels/sharing/cc-sharing-panel.c:376 -+#: ../panels/sharing/cc-sharing-panel.c:383 - #: ../panels/user-accounts/um-photo-dialog.c:222 - msgid "_Open" - msgstr "_Avaa" -@@ -5298,32 +5296,32 @@ msgstr "Asetukset" - msgid "No networks selected for sharing" - msgstr "Ei verkkoja valittu jakamista varten" - --#: ../panels/sharing/cc-sharing-panel.c:266 -+#: ../panels/sharing/cc-sharing-panel.c:273 - msgctxt "service is enabled" - msgid "On" - msgstr "Päällä" - --#: ../panels/sharing/cc-sharing-panel.c:268 --#: ../panels/sharing/cc-sharing-panel.c:295 -+#: ../panels/sharing/cc-sharing-panel.c:275 -+#: ../panels/sharing/cc-sharing-panel.c:302 - msgctxt "service is disabled" - msgid "Off" - msgstr "Pois" - --#: ../panels/sharing/cc-sharing-panel.c:298 -+#: ../panels/sharing/cc-sharing-panel.c:305 - msgctxt "service is enabled" - msgid "Enabled" - msgstr "Käytössä" - --#: ../panels/sharing/cc-sharing-panel.c:301 -+#: ../panels/sharing/cc-sharing-panel.c:308 - msgctxt "service is active" - msgid "Active" - msgstr "Aktiivinen" - --#: ../panels/sharing/cc-sharing-panel.c:372 -+#: ../panels/sharing/cc-sharing-panel.c:379 - msgid "Choose a Folder" - msgstr "Valitse kansio" - --#: ../panels/sharing/cc-sharing-panel.c:683 -+#: ../panels/sharing/cc-sharing-panel.c:690 - #, c-format - msgid "" - "Personal File Sharing allows you to share your Public folder with others on " -@@ -5332,7 +5330,7 @@ msgstr "" - "Henkilökohtaisen tiedostonjaon avulla voit jakaa julkisen kansiosi verkon " - "muiden käyttäjien kanssa käyttäen osoitetta dav://%s" - --#: ../panels/sharing/cc-sharing-panel.c:685 -+#: ../panels/sharing/cc-sharing-panel.c:692 - #, c-format - msgid "" - "When remote login is enabled, remote users can connect using the Secure " -@@ -5343,7 +5341,7 @@ msgstr "" - "Secure Shell -komentoa:\n" - "ssh %s" - --#: ../panels/sharing/cc-sharing-panel.c:687 -+#: ../panels/sharing/cc-sharing-panel.c:694 - #, c-format - msgid "" - "Screen sharing allows remote users to view or control your screen by " -@@ -5352,11 +5350,11 @@ msgstr "" - "Näytön jakaminen sallii etäkäyttäjien seurata ja hallita näyttöäsi " - "yhdistämällä kohteeseen vnc://%s" - --#: ../panels/sharing/cc-sharing-panel.c:799 -+#: ../panels/sharing/cc-sharing-panel.c:806 - msgid "Copy" - msgstr "Kopioi" - --#: ../panels/sharing/cc-sharing-panel.c:1125 -+#: ../panels/sharing/cc-sharing-panel.c:1233 - msgid "Sharing" - msgstr "Jakaminen" - --- -cgit v0.12 - - ---- gnome-control-center-3.25.92-orig/po/fi.po 2017-09-01 14:20:48.000000000 +0200 -+++ gnome-control-center-3.25.92/po/fi.po 2017-09-01 18:51:53.651290930 +0200 -@@ -1473,8 +1473,7 @@ - #: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:2 - msgid "Ab­out" - msgstr "" --"Järjestelmä-\n" --"tiedot" -+"Järjestelmä-tiedot" - - #: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:3 - #: ../panels/info/gnome-info-panel.desktop.in.in.h:3 - diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 44017fc..9b2e5db 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Sep 4 15:49:10 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.92.1: + + Fix inability to run Settings shell caused by a broken + translation. + + Updated translations. +- Drop gnome-control-center-fix-finish-translation.patch: Fixed + upstream. + ------------------------------------------------------------------- Fri Sep 1 12:51:26 UTC 2017 - zaitor@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 8ef0cd9..299fd16 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.25.92 +Version: 3.25.92.1 Release: 0 Summary: The GNOME Control Center License: GPL-2.0+ @@ -52,8 +52,6 @@ Patch20: gnome-control-center-disable-error-message-for-NM.patch Patch21: gnome-control-center-info-never-use-gnome-software.patch # PATCH-FIX-OPENSUSE gnome-control-center-more-power-button-actions.patch bsc#993381 fezhang@suse.com -- power: Bring back the "shutdown" and "interactive" power button actions. Patch22: gnome-control-center-more-power-button-actions.patch -# PATCH-FIX-UPSTREAM gnome-control-center-fix-finish-translation.patch zaitor@opensuse.org -- Fix broken finish translation. -Patch23: gnome-control-center-fix-finish-translation.patch BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -219,7 +217,6 @@ translation-update-upstream %patch21 -p1 %patch22 -p1 %endif -%patch23 -p1 %build ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh From d869dcd7289d77203dcced6b5cb8be809692b2708cbc0c55f7df29767724e9b0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 8 Sep 2017 20:32:21 +0000 Subject: [PATCH 5/7] Accepting request 522339 from GNOME:Next 1 OBS-URL: https://build.opensuse.org/request/show/522339 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=359 --- gnome-control-center.changes | 6 +++ gnome-control-center.spec | 76 ++++++++++++++++++------------------ 2 files changed, 45 insertions(+), 37 deletions(-) diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 9b2e5db..d8b26e6 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -8,6 +8,12 @@ Mon Sep 4 15:49:10 UTC 2017 - zaitor@opensuse.org - Drop gnome-control-center-fix-finish-translation.patch: Fixed upstream. +------------------------------------------------------------------- +Fri Sep 1 13:51:26 UTC 2017 - zaitor@opensuse.org + +- Clean up the SLE patches structure, only keep what makes sense + for openSUSE, move the rest to patch tag PATCH-FEATURE-SLE. + ------------------------------------------------------------------- Fri Sep 1 12:51:26 UTC 2017 - zaitor@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 299fd16..e9f7476 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -36,22 +36,27 @@ License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org Source: https://download.gnome.org/sources/gnome-control-center/3.25/%{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-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-NEEDS-REBASE gnome-control-center-probe-radius-server-cert.patch bnc#574266 glin@suse.com -- network: Probe the RADIUS server certificate Was: PATCH-FIX-UPSTREAM +Patch0: 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 +Patch1: gnome-control-center-follow-polkit-permissions-for-tz.patch # PATCH-NEEDS-REBASE 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 was:PATCH-FIX-OPENSUSE -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 -# PATCH-FIX-OPENSUSE gnome-control-center-more-power-button-actions.patch bsc#993381 fezhang@suse.com -- power: Bring back the "shutdown" and "interactive" power button actions. -Patch22: gnome-control-center-more-power-button-actions.patch +Patch2: gnome-control-center-disable-error-message-for-NM.patch + +### SLE only patches get 1000 or more as number. + +# PATCH-FEATURE-SLE 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. +Patch1000: 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 +Patch1001: gnome-control-center-add-alacarte-for-sle.patch +# PATCH-FEATURE-SLE gnome-control-center-890979-change-remote-passwd.patch bnc#890979 dliang@suse.com -- user: Enable remote user to change password in user panel +Patch1002: gnome-control-center-890979-change-remote-passwd.patch +# PATCH-FEATURE-SLE 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. +Patch1003: gnome-control-center-info-never-use-gnome-software.patch +# PATCH-FEATURE-SLE gnome-control-center-more-power-button-actions.patch bsc#993381 fezhang@suse.com -- power: Bring back the "shutdown" and "interactive" power button actions. +Patch1004: gnome-control-center-more-power-button-actions.patch + BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -194,41 +199,38 @@ This package provides the online accounts onfiguration panel for GNOME control center. %lang_package + %prep %setup -q +%if %{with_cacert_patch} +%patch0 -p1 +%endif +%patch1 -p1 +# Needs rebase, again... +#patch2 -p1 +# SLE only patches 1000+ %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} == 1500 && 0%{?sle_version} -%patch100 -p1 -%endif -%if %{with_cacert_patch} -%patch16 -p1 -%endif -%patch17 -p1 -%if ! 0%{?is_opensuse} -%patch18 -p1 -%endif -# Needs rebase, again... -#patch20 -p1 -%if 0%{?suse_version} == 1500 -%patch21 -p1 -%patch22 -p1 +%patch1000 -p1 +%patch1001 -p1 +%patch1002 -p1 +%patch1003 -p1 +%patch1004 -p1 %endif %build ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh -%configure --with-pic\ - --disable-static\ - --disable-maintainer-mode\ +%configure \ + --with-pic \ + --disable-static \ + --disable-maintainer-mode \ %if %{with_ibus} - --enable-ibus + --enable-ibus \ %else - --disable-ibus + --ibus-disable \ %endif + %{nil} pushd panels/common make gsd-common-enums.h popd From 89c5bf09d73b3ca0453049c5eae5dccf1bf3f1e8880890466620f2bc0755f346 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 9 Sep 2017 10:26:16 +0000 Subject: [PATCH 6/7] Accepting request 522697 from home:jengelh:branches:GNOME:Factory - Remove --with-pic which is a no-op due to --disable-static. - Avoid running fdupes across hardlink boundaries. One summary grammar fix. OBS-URL: https://build.opensuse.org/request/show/522697 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=360 --- gnome-control-center.changes | 7 +++++++ gnome-control-center.spec | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gnome-control-center.changes b/gnome-control-center.changes index d8b26e6..4ac2a06 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Sep 9 00:04:41 UTC 2017 - jengelh@inai.de + +- Remove --with-pic which is a no-op due to --disable-static. +- Avoid running fdupes across hardlink boundaries. + One summary grammar fix. + ------------------------------------------------------------------- Mon Sep 4 15:49:10 UTC 2017 - zaitor@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index e9f7476..db71a8f 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -155,7 +155,7 @@ The control center is GNOME's main interface for configuration of various aspects of your desktop. %package user-faces -Summary: Login Managers user avatars +Summary: Login manager user avatars Group: System/GUI/GNOME %description user-faces @@ -222,7 +222,6 @@ translation-update-upstream ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh %configure \ - --with-pic \ --disable-static \ --disable-maintainer-mode \ %if %{with_ibus} @@ -269,7 +268,7 @@ rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules %if %{with_wacom} %suse_update_desktop_file -n gnome-wacom-panel X-SuSE-ControlCenter-Hardware %endif -%fdupes %{buildroot} +%fdupes %{buildroot}/%{_prefix} %files %defattr(-,root,root) From 3f3b23269a43a9a198b1f73170097b4265d1103a127fb68304b94c0dbbd28015 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 12 Sep 2017 11:04:55 +0000 Subject: [PATCH 7/7] Accepting request 523617 from GNOME:Next Update to 3.26.0 OBS-URL: https://build.opensuse.org/request/show/523617 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=361 --- gnome-control-center-3.25.92.1.tar.xz | 3 --- gnome-control-center-3.26.0.tar.xz | 3 +++ gnome-control-center.changes | 6 ++++++ gnome-control-center.spec | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 gnome-control-center-3.25.92.1.tar.xz create mode 100644 gnome-control-center-3.26.0.tar.xz diff --git a/gnome-control-center-3.25.92.1.tar.xz b/gnome-control-center-3.25.92.1.tar.xz deleted file mode 100644 index 25a746a..0000000 --- a/gnome-control-center-3.25.92.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9144c3890f2993760c9b256761003adc2ad3aa770b74cd1b1395eb6319457def -size 7465372 diff --git a/gnome-control-center-3.26.0.tar.xz b/gnome-control-center-3.26.0.tar.xz new file mode 100644 index 0000000..1021d4d --- /dev/null +++ b/gnome-control-center-3.26.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f519ce9bf268fd20cc81d46d23ad492cbc6975480c318d1ae4304c10d244c46f +size 7388184 diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 4ac2a06..978ffc4 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 12 09:18:26 UTC 2017 - dimstar@opensuse.org + +- Update to version 3.26.0: + + Updated translations. + ------------------------------------------------------------------- Sat Sep 9 00:04:41 UTC 2017 - jengelh@inai.de diff --git a/gnome-control-center.spec b/gnome-control-center.spec index db71a8f..c03af13 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.25.92.1 +Version: 3.26.0 Release: 0 Summary: The GNOME Control Center License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org -Source: https://download.gnome.org/sources/gnome-control-center/3.25/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnome-control-center/3.26/%{name}-%{version}.tar.xz # PATCH-NEEDS-REBASE gnome-control-center-probe-radius-server-cert.patch bnc#574266 glin@suse.com -- network: Probe the RADIUS server certificate Was: PATCH-FIX-UPSTREAM Patch0: gnome-control-center-probe-radius-server-cert.patch