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
This commit is contained in:
Dominique Leuenberger 2016-09-05 14:29:37 +00:00 committed by Git OBS Bridge
parent 3c01e29ae8
commit 6789e3390c
3 changed files with 31 additions and 12 deletions

View File

@ -1,12 +1,24 @@
Index: gnome-control-center-3.18.2/shell/cc-panel-loader.c From df1f2a24bc6d8ff3be90e4c7d810fe13bdce8780 Mon Sep 17 00:00:00 2001
=================================================================== From: Felix Zhang <fezhang@suse.com>
--- gnome-control-center-3.18.2.orig/shell/cc-panel-loader.c Date: Sun, 4 Sep 2016 00:08:10 +0800
+++ gnome-control-center-3.18.2/shell/cc-panel-loader.c Subject: [PATCH] add alacarte for sle
@@ -103,6 +103,7 @@ static struct {
PANEL_TYPE("wacom", cc_wacom_panel_get_type ), ---
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 #endif
PANEL_TYPE("ca.desrt.dconf-editor", NULL ), + PANEL_TYPE("alacarte", NULL ),
+ PANEL_TYPE("alacarte", NULL ), PANEL_TYPE("ca.desrt.dconf-editor", NULL ),
PANEL_TYPE("gpk-prefs", NULL ), PANEL_TYPE("gnome-tweak-tool", NULL ),
PANEL_TYPE("tracker-preferences", NULL ), PANEL_TYPE("gpk-prefs", NULL ),
PANEL_TYPE("itweb-settings", NULL ), --
2.6.6

View File

@ -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 Fri Sep 2 13:03:45 UTC 2016 - fezhang@suse.com

View File

@ -42,7 +42,7 @@ Patch0: gnome-control-center-allow-extra-tools-in-shell.patch
Patch100: gnome-control-center-add-alacarte-for-sle.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 # 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 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 Patch14: gnome-control-center-system-proxy-configuration.patch
# PATCH-NEEDS-REBASE gcc-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- network: create private connections if the user if not authorized (WAS: PATCH-FIX-UPSTREAM) # PATCH-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 Patch15: gcc-private-connection.patch