Accepting request 88856 from GNOME:Factory

Disable system tab in region panel (forwarded request 88815 from vuntz)

OBS-URL: https://build.opensuse.org/request/show/88856
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=68
This commit is contained in:
Stephan Kulow 2011-10-21 14:11:42 +00:00 committed by Git OBS Bridge
commit 438b3908b0
4 changed files with 28 additions and 22 deletions

View File

@ -0,0 +1,14 @@
Index: gnome-control-center-3.2.1/panels/region/gnome-region-panel-system.c
===================================================================
--- gnome-control-center-3.2.1.orig/panels/region/gnome-region-panel-system.c
+++ gnome-control-center-3.2.1/panels/region/gnome-region-panel-system.c
@@ -415,7 +415,8 @@ setup_system (GtkBuilder *dialog)
GDBusConnection *bus;
GtkWidget *button;
- localed_permission = polkit_permission_new_sync ("org.freedesktop.locale1.set-locale", NULL, NULL, NULL);
+ //localed_permission = polkit_permission_new_sync ("org.freedesktop.locale1.set-locale", NULL, NULL, NULL);
+ localed_permission = NULL;
if (localed_permission == NULL) {
GtkWidget *tab_widget, *notebook;
int num;

View File

@ -1,22 +0,0 @@
From fafc200c9017d152da2ce59c34130456133a2de6 Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <chingpang@gmail.com>
Date: Thu, 6 Oct 2011 12:16:59 +0800
Subject: [PATCH] network: allocate nm-connection for nma-wireless-dialog
---
panels/network/network-dialogs.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
Index: gnome-control-center-3.2.1/panels/network/network-dialogs.c
===================================================================
--- gnome-control-center-3.2.1.orig/panels/network/network-dialogs.c
+++ gnome-control-center-3.2.1/panels/network/network-dialogs.c
@@ -283,6 +283,8 @@ cc_network_panel_connect_to_8021x_networ
connection = nm_connection_new ();
+ connection = nm_connection_new ();
+
/* Need a UUID for the "always ask" stuff in the Dialog of Doom */
s_con = (NMSettingConnection *) nm_setting_connection_new ();
uuid = nm_utils_uuid_generate ();

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Oct 20 08:25:40 UTC 2011 - vuntz@opensuse.org
- Add gnome-control-center-hide-region-system-tab.patch: hide
system tab in region panel until we really use the same files as
systemd for setting the system-wide locale configuration. See
bnc#703833 for more details.
- Really drop
gnome-control-center-network-allocate-nm-connection.patch.
-------------------------------------------------------------------
Mon Oct 17 18:10:24 CEST 2011 - dimstar@opensuse.org

View File

@ -66,12 +66,15 @@ Obsoletes: fontilus themus acme
Provides: fontilus themus acme
Version: 3.2.1
Release: 1
# FIXME: in 12.2 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833)
Summary: The GNOME Control Center
Source: http://download.gnome.org/sources/gnome-control-center/3.2/%{name}-%{version}.tar.bz2
# PATCH-FEATURE-OPENSUSE gnome-control-center-allow-yast-in-shell.patch vuntz@opensuse.org -- Allow the launch of the yast shell from the g-c-c shell; it's quite ugly, but on the other hand, we don't want to change the behavior of the shell except for yast...
Patch0: gnome-control-center-allow-yast-in-shell.patch
# PATCH-FIX-UPSTREAM gnome-control-center-shell-no-crash.patch vuntz@opensuse.org -- Do not crash on search when a .desktop has no Comment
Patch1: gnome-control-center-shell-no-crash.patch
# PATCH-HACK-OPENSUSE gnome-control-center-hide-region-system-tab.patch vuntz@opensuse.org -- Hide system tab in region panel until we really use the right files for system settings (see bnc#703833)
Patch2: gnome-control-center-hide-region-system-tab.patch
# PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream - docs at http://en.opensuse.org/GNOME/Proxy_configuration (was PATCH-FEATURE-OPENSUSE)
Patch14: gnome-control-center-system-proxy-configuration.patch
Url: http://www.gnome.org
@ -155,6 +158,7 @@ various aspects of your desktop.
translation-update-upstream
%patch0 -p1
%patch1 -p1
%patch2 -p1
#NEEDS-REBASE
#%patch14 -p1