pool/gnome-control-center
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 519344 from GNOME:Next

Browse Source 
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
This commit is contained in:
Dominique Leuenberger 2017-08-31 07:41:33 +00:00 committed by Git OBS Bridge
parent 46b96a0911
commit 81a98966e9
9 changed files with 278 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-control-center-3.24.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:43a4d2a4c222ee4a53428a4a720f823e157e4d4c597ea1a84e438d242596cca2
size 7302120

3
gnome-control-center-3.25.91.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:55540de3e04761635a58e3baf33b6f4866326a8ed9a3a0affc11e3a6bb166c06
size 7401528

77
gnome-control-center-allow-extra-tools-in-shell.patch
View File

@ -1,18 +1,8 @@
From 8469e4ac57f3b5d3efbf533ba23512612997ffff Mon Sep 17 00:00:00 2001 diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
From: Felix Zhang <fezhang@suse.com> index fc235fe..816cd1c 100644
Date: Fri, 2 Sep 2016 14:55:12 +0800 --- a/shell/cc-panel-loader.c
Subject: [PATCH] allow extra tools in shell +++ b/shell/cc-panel-loader.c
@@ -106,6 +106,12 @@ static struct {
---
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 {
#ifdef BUILD_WACOM #ifdef BUILD_WACOM
PANEL_TYPE("wacom", cc_wacom_panel_get_type ), PANEL_TYPE("wacom", cc_wacom_panel_get_type ),
#endif #endif
@ -25,9 +15,9 @@ Index: gnome-control-center-3.21.90/shell/cc-panel-loader.c
}; };
GList * GList *
@@ -146,7 +152,8 @@ parse_categories (GDesktopAppInfo *app) @@ -139,7 +145,8 @@ parse_categories (GDesktopAppInfo *app)
#else retval = CC_CATEGORY_HIDDEN;
if (g_strv_contains (const_strv (split), "HardwareSettings")) else if (g_strv_contains (const_strv (split), "HardwareSettings"))
retval = CC_CATEGORY_HARDWARE; 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"))
+ 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; retval = CC_CATEGORY_PERSONAL;
else if (g_strv_contains (const_strv (split), "X-GNOME-SystemSettings")) else if (g_strv_contains (const_strv (split), "X-GNOME-SystemSettings"))
retval = CC_CATEGORY_SYSTEM; 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; g_autoptr (GDesktopAppInfo) app;
char *desktop_name; g_autofree gchar *desktop_name = NULL;
+ char *name; + g_autofree gchar *name = NULL;
int category; gint category;
+#ifndef CC_PANEL_LOADER_NO_GTYPES +#ifndef CC_PANEL_LOADER_NO_GTYPES
+ if (all_panels[i].get_type == NULL) + 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); + name = g_strconcat (all_panels[i].name, NULL);
+ } + }
app = g_desktop_app_info_new (desktop_name); app = g_desktop_app_info_new (desktop_name);
g_free (desktop_name);
if (app == NULL) if (!app)
{ {
+ if (!g_str_has_prefix(name, "suse-")) + if (!g_str_has_prefix(name, "suse-"))
+ { + {
g_warning ("Ignoring broken panel %s (missing desktop file)", g_warning ("Ignoring broken panel %s (missing desktop file)", all_panels[i].name);
all_panels[i].name);
+ } + }
continue; continue;
} }
@@ -191,7 +214,8 @@ cc_panel_loader_fill_model (CcShellModel @@ -201,7 +225,7 @@ cc_panel_loader_fill_model (CcShellModel *model)
if (G_UNLIKELY (category < 0)) * that are only visible in the new Shell.
continue; */
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), all_panels[i].name);
+ cc_shell_model_add_item (model, category, G_APP_INFO (app), 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
=================================================================== diff --git a/shell/cc-window.c b/shell/cc-window.c
--- gnome-control-center-3.21.90.orig/shell/cc-window.c index 9f29c55..3be0d4e 100644
+++ gnome-control-center-3.21.90/shell/cc-window.c --- a/shell/cc-window.c
@@ -139,6 +139,41 @@ get_icon_name_from_g_icon (GIcon *gicon) +++ b/shell/cc-window.c
@@ -114,6 +114,41 @@ get_icon_name_from_g_icon (GIcon *gicon)
return NULL; return NULL;
} }
@ -125,7 +122,7 @@ Index: gnome-control-center-3.21.90/shell/cc-window.c
static gboolean static gboolean
activate_panel (CcWindow *self, activate_panel (CcWindow *self,
const gchar *id, const gchar *id,
@@ -151,6 +186,12 @@ activate_panel (CcWindow *self @@ -126,6 +161,12 @@ activate_panel (CcWindow *self,
if (!id) if (!id)
return FALSE; return FALSE;

101
gnome-control-center-disable-error-message-for-NM.patch
View File

@ -1,8 +1,19 @@
Index: gnome-control-center-3.20.1/panels/network/cc-network-panel.c diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
=================================================================== index ad019a380..9b5119b77 100644
--- gnome-control-center-3.20.1.orig/panels/network/cc-network-panel.c --- a/panels/network/cc-network-panel.c
+++ gnome-control-center-3.20.1/panels/network/cc-network-panel.c +++ b/panels/network/cc-network-panel.c
@@ -1286,10 +1286,23 @@ panel_check_network_manager_version (CcN @@ -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; GtkWidget *label;
gchar *markup; gchar *markup;
const gchar *version; 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); + state = g_variant_get_string (variant, NULL);
/* parse running version */ /* parse running version */
version = nm_client_get_version (panel->priv->client); version = nm_client_get_version (panel->client);
- if (version == NULL) { - if (version == NULL) {
+ if (version == NULL && g_strcmp0 (state, "inactive") == 0) { + if (version == NULL && g_strcmp0 (state, "inactive") == 0) {
gtk_container_remove (GTK_CONTAINER (panel), gtk_bin_get_child (GTK_BIN (panel))); gtk_container_remove (GTK_CONTAINER (panel), gtk_bin_get_child (GTK_BIN (panel)));
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20); 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); gtk_widget_show_all (box);
g_free (markup); g_free (markup);
+ } else if (g_strcmp0 (state, "active") == 0) { + } else if (g_strcmp0 (state, "active") == 0) {
+ GtkWidget *w; + gtk_widget_hide (panel->box_vpn1);
+ + gtk_widget_hide (panel->box_wired);
+ w = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, + gtk_widget_show (panel->label_NM_warning);
+ "devices_toolbar"));
+ gtk_widget_hide (w);
+ w = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
+ "label_NM_warning"));
+ gtk_widget_show (w);
} else { } else {
manager_running (panel->priv->client, NULL, panel); manager_running (panel->client, NULL, panel);
} }
+ +
+ g_object_unref (connection); + g_object_unref (connection);
@ -50,27 +56,46 @@ Index: gnome-control-center-3.20.1/panels/network/cc-network-panel.c
} }
static void static void
Index: gnome-control-center-3.20.1/panels/network/network.ui @@ -816,9 +839,11 @@ cc_network_panel_class_init (CcNetworkPanelClass *klass)
===================================================================
--- gnome-control-center-3.20.1.orig/panels/network/network.ui gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, box_proxy);
+++ gnome-control-center-3.20.1/panels/network/network.ui gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, box_vpn);
@@ -127,6 +127,19 @@ + gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, box_vpn1);
<property name="position">1</property> gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, box_wired);
</packing> 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 @@
</object>
</child>
<child>
- <object class="GtkBox">
+ <object class="GtkBox" id="box_vpn1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@@ -168,6 +168,14 @@
<property name="orientation">vertical</property>
</object>
</child>
+ <child>
+ <object class="GtkLabel" id="label_NM_warning">
+ <property name="visible">False</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Please use YaST2 to configure your network.</property>
+ </object>
+ </child>
</object>
</child> </child>
+ <child>
+ <object class="GtkLabel" id="label_NM_warning">
+ <property name="visible">False</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Please use YaST2 to configure your network.</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object> </object>
<packing> --
<property name="expand">True</property> 2.13.4

46
gnome-control-center-info-disc-size-for-btrfs.patch
View File

@ -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);
}

23
gnome-control-center-info-never-use-gnome-software.patch
View File

@ -1,25 +1,14 @@
From 0884359b9fe093f4023ee404274ed3cdf76b857e Mon Sep 17 00:00:00 2001 diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c
From: Felix Zhang <fezhang@suse.com> index 7a5879c..7b6c27b 100644
Date: Sat, 17 Sep 2016 00:33:20 +0800 --- a/panels/info/cc-info-overview-panel.c
Subject: [PATCH] info: never use gnome-software +++ b/panels/info/cc-info-overview-panel.c
@@ -829,7 +829,8 @@ info_overview_panel_setup_overview (CcInfoOverviewPanel *self)
---
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 static gboolean
does_gnome_software_exist (void) does_gnome_software_exist (void)
{ {
- return g_file_test (BINDIR "/gnome-software", G_FILE_TEST_EXISTS); - return g_file_test (BINDIR "/gnome-software", G_FILE_TEST_EXISTS);
+ /* no gnome-software for SLE */
+ return FALSE; + return FALSE;
} }
static gboolean static gboolean
--
2.6.6

16
gnome-control-center-more-power-button-actions.patch
View File

@ -1,18 +1,12 @@
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c 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 --- a/panels/power/cc-power-panel.c
+++ b/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; char *name;
GsdPowerButtonActionType value; GsdPowerButtonActionType value;
} actions[] = { } 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_("Shutdown"), GSD_POWER_BUTTON_ACTION_SHUTDOWN },
+ { N_("Suspend"), GSD_POWER_BUTTON_ACTION_SUSPEND } { N_("Suspend"), GSD_POWER_BUTTON_ACTION_SUSPEND },
}; { N_("Power Off"), GSD_POWER_BUTTON_ACTION_INTERACTIVE },
guint i; { N_("Hibernate"), GSD_POWER_BUTTON_ACTION_HIBERNATE },

153
gnome-control-center.changes
View File

@ -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 Sat Jul 22 17:31:23 UTC 2017 - zaitor@opensuse.org

37
gnome-control-center.spec
View File

@ -29,13 +29,13 @@
%define with_cacert_patch 0 %define with_cacert_patch 0
Name: gnome-control-center Name: gnome-control-center
Version: 3.24.3 Version: 3.25.91
Release: 0 Release: 0
Summary: The GNOME Control Center Summary: The GNOME Control Center
License: GPL-2.0+ License: GPL-2.0+
Group: System/GUI/GNOME Group: System/GUI/GNOME
Url: http://www.gnome.org 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. # 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 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 # 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 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 # 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 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 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. # 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 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. # 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 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: cups-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: fdupes BuildRequires: fdupes
@ -76,15 +74,15 @@ BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.23.0 BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.23.0
BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gl) 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(gmodule-2.0)
BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.18.2 BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.18.2
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.19.93 BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.19.93
BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.19.1 BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.25.90
BuildRequires: pkgconfig(goa-1.0) >= 3.21.5 BuildRequires: pkgconfig(goa-1.0) >= 3.25.3
BuildRequires: pkgconfig(goa-backend-1.0) BuildRequires: pkgconfig(goa-backend-1.0)
BuildRequires: pkgconfig(gobject-introspection-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(gsettings-desktop-schemas) >= 3.21.4
BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0
BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(gudev-1.0)
@ -205,7 +203,7 @@ translation-update-upstream
%endif %endif
%patch0 -p1 %patch0 -p1
# PATCH100 ONLY NEEDED FOR SLES AND TO BE APPLIED IMMEDIATELY AFTER PATCH0 # 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 %patch100 -p1
%endif %endif
%if %{with_cacert_patch} %if %{with_cacert_patch}
@ -215,12 +213,12 @@ translation-update-upstream
%if ! 0%{?is_opensuse} %if ! 0%{?is_opensuse}
%patch18 -p1 %patch18 -p1
%endif %endif
%patch20 -p1 # Needs rebase, again...
%if 0%{?suse_version} == 1315 #patch20 -p1
%if 0%{?suse_version} == 1500
%patch21 -p1 %patch21 -p1
%patch22 -p1 %patch22 -p1
%endif %endif
%patch23 -p1
%build %build
ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh 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 %endif
%fdupes %{buildroot} %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 %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README %doc AUTHORS COPYING ChangeLog NEWS README