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

Accepting request 196194 from home:dimstar:branches:GNOME:Factory

Browse Source 
Cleanup some old patches

OBS-URL: https://build.opensuse.org/request/show/196194
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=207
This commit is contained in:
Dominique Leuenberger 2013-08-24 19:06:40 +00:00 committed by Git OBS Bridge
parent 6afbe5bd0f
commit 3f5842f93a
6 changed files with 14 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gnome-control-center-build.patch
View File

@ -1,44 +0,0 @@
From 38a7a3fbe6cd5dba7cfd7ad706d03cccaa05823a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 26 Oct 2012 10:27:32 -0400
Subject: [PATCH] network: Fix the build with nma 0.9.6.2
This is a temporary bandaid until 0.9.6.4 is released.
---
panels/network/network-dialogs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/panels/network/network-dialogs.c b/panels/network/network-dialogs.c
index f9be79d..e6b0774 100644
--- a/panels/network/network-dialogs.c
+++ b/panels/network/network-dialogs.c
@@ -30,7 +30,7 @@
#include <nm-device-wifi.h>
#include "network-dialogs.h"
-#include "nm-wifi-dialog.h"
+#include "nm-wireless-dialog.h"
#include "nm-mobile-wizard.h"
typedef struct {
@@ -108,7 +108,7 @@ nag_dialog_response_cb (GtkDialog *nag_dialog,
gint response,
gpointer user_data)
{
- NMAWifiDialog *wireless_dialog = NMA_WIFI_DIALOG (user_data);
+ NMAWirelessDialog *wireless_dialog = NMA_WIRELESS_DIALOG (user_data);
if (response == GTK_RESPONSE_NO) { /* user opted not to correct the warning */
nma_wifi_dialog_set_nag_ignored (wireless_dialog, TRUE);
@@ -121,7 +121,7 @@ wireless_dialog_response_cb (GtkDialog *foo,
gint response,
gpointer user_data)
{
- NMAWifiDialog *dialog = NMA_WIFI_DIALOG (foo);
+ NMAWirelessDialog *dialog = NMA_WIRELESS_DIALOG (foo);
WirelessDialogClosure *closure = user_data;
NMConnection *connection, *fuzzy_match = NULL;
NMDevice *device;
--
1.7.12.1

95
gnome-control-center-fine-grained-tz-polkit.patch
View File

@ -1,95 +0,0 @@
commit 4300867b7bfc4f67a0e8b273aa7d2d13973ea7ac
Author: Vincent Untz <vuntz@gnome.org>
Date: Mon Mar 12 15:31:40 2012 +0100
datetime: Allow changing timezone without auth if action is allowed
As changing the time can have security implications, while changing the
timezone doesn't, it's not unusual to have a setup where
org.freedesktop.timedate1.set-timezone is allowed while other
time-related actions aren't.
Therefore, if org.freedesktop.timedate1.set-timezone is allowed, there's
no reason to require that the user unlocks the panel to enable him to
change the timezone.
https://bugzilla.gnome.org/show_bug.cgi?id=646185
Index: gnome-control-center-3.7.3/panels/datetime/cc-datetime-panel.c
===================================================================
--- gnome-control-center-3.7.3.orig/panels/datetime/cc-datetime-panel.c
+++ gnome-control-center-3.7.3/panels/datetime/cc-datetime-panel.c
@@ -88,6 +88,7 @@ struct _CcDateTimePanelPrivate
GCancellable *cancellable;
GPermission *permission;
+ GPermission *permission_tz;
};
static void update_time (CcDateTimePanel *self);
@@ -166,6 +167,12 @@ cc_date_time_panel_dispose (GObject *obj
priv->permission = NULL;
}
+ if (priv->permission_tz)
+ {
+ g_object_unref (priv->permission_tz);
+ priv->permission_tz = NULL;
+ }
+
G_OBJECT_CLASS (cc_date_time_panel_parent_class)->dispose (object);
}
@@ -818,19 +825,33 @@ on_permission_changed (GPermission *perm
gpointer data)
{
CcDateTimePanelPrivate *priv = CC_DATE_TIME_PANEL (data)->priv;
- gboolean allowed, using_ntp;
+ gboolean allowed, allowed_tz, using_ntp;
allowed = g_permission_get_allowed (permission);
+ allowed_tz = priv->permission_tz && g_permission_get_allowed (priv->permission_tz);
using_ntp = gtk_switch_get_active (GTK_SWITCH (W("network_time_switch")));
/* All the widgets but the lock button and the 24h setting */
- gtk_widget_set_sensitive (W("map-vbox"), allowed);
+ gtk_widget_set_sensitive (W("map-vbox"), allowed || allowed_tz);
gtk_widget_set_sensitive (W("hbox2"), allowed);
gtk_widget_set_sensitive (W("alignment2"), allowed);
update_widget_state_for_ntp (data, using_ntp);
}
static void
+on_permission_tz_changed (GPermission *permission,
+ GParamSpec *pspec,
+ gpointer data)
+{
+ CcDateTimePanelPrivate *priv = CC_DATE_TIME_PANEL (data)->priv;
+ gboolean allowed;
+
+ allowed = g_permission_get_allowed (permission) || g_permission_get_allowed (priv->permission);
+
+ gtk_widget_set_sensitive (W("map-vbox"), allowed);
+}
+
+static void
update_ntp_switch_from_system (CcDateTimePanel *self)
{
CcDateTimePanelPrivate *priv = self->priv;
@@ -1134,4 +1155,16 @@ cc_date_time_panel_init (CcDateTimePanel
g_signal_connect (priv->permission, "notify",
G_CALLBACK (on_permission_changed), self);
on_permission_changed (priv->permission, NULL, self);
+
+ priv->permission_tz = polkit_permission_new_sync ("org.freedesktop.timedate1.set-timezone", NULL, NULL, NULL);
+ if (priv->permission_tz == NULL)
+ {
+ g_warning ("Your system does not have the '%s' PolicyKit files installed. Please check your installation",
+ "org.freedesktop.timedate1.set-timezone");
+ return;
+ }
+
+ g_signal_connect (priv->permission_tz, "notify",
+ G_CALLBACK (on_permission_tz_changed), self);
+ on_permission_tz_changed (priv->permission_tz, NULL, self);
}

14
gnome-control-center-hide-region-system-tab.patch
View File

@ -1,14 +0,0 @@
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;

12
gnome-control-center-nma-nialog.patch
View File

@ -1,12 +0,0 @@
Index: gnome-control-center-3.7.90/panels/network/network-dialogs.c
===================================================================
--- gnome-control-center-3.7.90.orig/panels/network/network-dialogs.c
+++ gnome-control-center-3.7.90/panels/network/network-dialogs.c
@@ -29,6 +29,7 @@
#include <nm-device-wifi.h>
#include "network-dialogs.h"
+#include "nm-wifi-dialog.h"
#include "nm-wireless-dialog.h"
#include "nm-mobile-wizard.h"

14
gnome-control-center.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Sat Aug 24 17:42:00 UTC 2013 - dimstar@opensuse.org
- Drop gnome-control-center-fine-grained-tz-polkit.patch: the
Date & Time panel had a major overhaul and the patch in this form
does not make sense. The patch was disabled for some time
already.
- Drop gnome-control-center-hide-region-system-tab.patch: the
region panel had a major overhaul and the patch in this form does
not make sense. The patch was disabled for some time already.
- Drop gnome-control-center-nma-nialog.patch and
gnome-control-center-build.patch: these patches are long out of
service, as they targetted build fixes for NM 0.9.6.2.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 22 20:33:07 UTC 2013 - dimstar@opensuse.org Thu Aug 22 20:33:07 UTC 2013 - dimstar@opensuse.org

14
gnome-control-center.spec
View File

@ -34,18 +34,10 @@ Url: http://www.gnome.org
Source: http://download.gnome.org/sources/gnome-control-center/3.9/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/gnome-control-center/3.9/%{name}-%{version}.tar.xz
# PATCH-FEATURE-OPENSUSE gnome-control-center-allow-yast-in-shell.patch vuntz@opensuse.org -- Allow the launch of the yast shell from the g-c-c shell; it's quite ugly, but on the other hand, we don't want to change the behavior of the shell except for yast... # PATCH-FEATURE-OPENSUSE gnome-control-center-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 Patch0: gnome-control-center-allow-yast-in-shell.patch
# PATCH-NEEDS-REBASE 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 PATCH-FIX-UPSTREAM gnome-control-center-fine-grained-tz-polkit.patch bgo#646185 bnc#749453 vuntz@opensuse.org -- Allow changing timezone without requiring privileges to change time
Patch3: gnome-control-center-fine-grained-tz-polkit.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) # 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 Patch14: gnome-control-center-system-proxy-configuration.patch
# PATCH-NEEDS-REBASE PATCH-FIX-UPSTREAM gcc-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- network: create private connections if the user if not authorized # PATCH-NEEDS-REBASE PATCH-FIX-UPSTREAM gcc-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- network: create private connections if the user if not authorized
Patch15: gcc-private-connection.patch Patch15: gcc-private-connection.patch
# PATCH-FIX-UPSTREAM gnome-control-center-build.patch dimstar@opensuse.org -- Fix build with stable NM branch. Patch from distributors mailinglist.
Patch17: gnome-control-center-build.patch
# PATCH-FIX-UPSTREAM gnome-control-center-nma-nialog.patch dimstar@opensuse.org -- Fix includes. More complete rewrite already in git.
Patch18: gnome-control-center-nma-nialog.patch
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: fdupes BuildRequires: fdupes
@ -161,15 +153,9 @@ various aspects of your desktop.
%setup -q %setup -q
#ranslation-update-upstream #ranslation-update-upstream
%patch0 -p1 %patch0 -p1
#Needs rebase
#patch2 -p1
# Need rebase
#patch3 -p1
#NEEDS-REBASE #NEEDS-REBASE
#patch14 -p1 #patch14 -p1
#patch15 -p1 #patch15 -p1
%patch17 -p1
%patch18 -p1
%build %build
ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh