forked from pool/gnome-control-center
Accepting request 133592 from GNOME:Next
Addressing comments OBS-URL: https://build.opensuse.org/request/show/133592 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=155
This commit is contained in:
parent
6c6eea5cdc
commit
587234ba13
@ -16,25 +16,25 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646187
|
|||||||
panels/network/network-dialogs.c | 16 ++++++++
|
panels/network/network-dialogs.c | 16 ++++++++
|
||||||
4 files changed, 91 insertions(+), 2 deletions(-)
|
4 files changed, 91 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
Index: gnome-control-center-3.4.2/configure.ac
|
Index: gnome-control-center-3.5.4/configure.ac
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gnome-control-center-3.4.2.orig/configure.ac
|
--- gnome-control-center-3.5.4.orig/configure.ac
|
||||||
+++ gnome-control-center-3.4.2/configure.ac
|
+++ gnome-control-center-3.5.4/configure.ac
|
||||||
@@ -105,7 +105,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMO
|
@@ -108,7 +108,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMO
|
||||||
PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
|
PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
|
||||||
PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
|
PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
|
||||||
gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
|
gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
|
||||||
-PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
|
-PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
|
||||||
+PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES
|
+PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES
|
||||||
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
|
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
|
||||||
PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0)
|
PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
|
||||||
PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
|
PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
|
||||||
gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
|
gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
|
||||||
Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c
|
Index: gnome-control-center-3.5.4/panels/network/cc-network-panel.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gnome-control-center-3.4.2.orig/panels/network/cc-network-panel.c
|
--- gnome-control-center-3.5.4.orig/panels/network/cc-network-panel.c
|
||||||
+++ gnome-control-center-3.4.2/panels/network/cc-network-panel.c
|
+++ gnome-control-center-3.5.4/panels/network/cc-network-panel.c
|
||||||
@@ -24,6 +24,8 @@
|
@@ -25,6 +25,8 @@
|
||||||
#include <netinet/ether.h>
|
#include <netinet/ether.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
@ -43,7 +43,7 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c
|
|||||||
#include "cc-network-panel.h"
|
#include "cc-network-panel.h"
|
||||||
|
|
||||||
#include "nm-remote-settings.h"
|
#include "nm-remote-settings.h"
|
||||||
@@ -85,6 +87,9 @@ struct _CcNetworkPanelPrivate
|
@@ -88,6 +90,9 @@ struct _CcNetworkPanelPrivate
|
||||||
gchar *arg_device;
|
gchar *arg_device;
|
||||||
gchar *arg_access_point;
|
gchar *arg_access_point;
|
||||||
gboolean operation_done;
|
gboolean operation_done;
|
||||||
@ -53,7 +53,7 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c
|
|||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
@@ -2827,8 +2832,10 @@ wireless_ap_changed_cb (GtkComboBox *com
|
@@ -3000,8 +3005,10 @@ wireless_ap_changed_cb (GtkComboBox *com
|
||||||
NetObject *object;
|
NetObject *object;
|
||||||
NMConnection *connection;
|
NMConnection *connection;
|
||||||
NMConnection *connection_activate = NULL;
|
NMConnection *connection_activate = NULL;
|
||||||
@ -64,7 +64,7 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c
|
|||||||
|
|
||||||
if (panel->priv->updating_device)
|
if (panel->priv->updating_device)
|
||||||
goto out;
|
goto out;
|
||||||
@@ -2897,8 +2904,17 @@ wireless_ap_changed_cb (GtkComboBox *com
|
@@ -3070,8 +3077,17 @@ wireless_ap_changed_cb (GtkComboBox *com
|
||||||
/* create one, as it's missing */
|
/* create one, as it's missing */
|
||||||
g_debug ("no existing connection found for %s, creating",
|
g_debug ("no existing connection found for %s, creating",
|
||||||
ssid_target);
|
ssid_target);
|
||||||
@ -83,7 +83,7 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c
|
|||||||
device, object_path,
|
device, object_path,
|
||||||
connection_add_activate_cb, panel);
|
connection_add_activate_cb, panel);
|
||||||
out:
|
out:
|
||||||
@@ -3150,6 +3166,11 @@ start_shared_connection (CcNetworkPanel
|
@@ -3323,6 +3339,11 @@ start_shared_connection (CcNetworkPanel
|
||||||
"id", "Hotspot",
|
"id", "Hotspot",
|
||||||
"autoconnect", FALSE,
|
"autoconnect", FALSE,
|
||||||
NULL);
|
NULL);
|
||||||
@ -95,7 +95,7 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c
|
|||||||
nm_connection_add_setting (c, (NMSetting *)sc);
|
nm_connection_add_setting (c, (NMSetting *)sc);
|
||||||
|
|
||||||
sw = (NMSettingWireless *)nm_setting_wireless_new ();
|
sw = (NMSettingWireless *)nm_setting_wireless_new ();
|
||||||
@@ -3373,6 +3394,24 @@ network_add_shell_header_widgets_cb (gpo
|
@@ -3548,6 +3569,24 @@ network_add_shell_header_widgets_cb (gpo
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -120,7 +120,7 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c
|
|||||||
cc_network_panel_init (CcNetworkPanel *panel)
|
cc_network_panel_init (CcNetworkPanel *panel)
|
||||||
{
|
{
|
||||||
DBusGConnection *bus = NULL;
|
DBusGConnection *bus = NULL;
|
||||||
@@ -3387,6 +3426,9 @@ cc_network_panel_init (CcNetworkPanel *p
|
@@ -3562,6 +3601,9 @@ cc_network_panel_init (CcNetworkPanel *p
|
||||||
GtkTreeSortable *sortable;
|
GtkTreeSortable *sortable;
|
||||||
GtkWidget *widget;
|
GtkWidget *widget;
|
||||||
GtkWidget *toplevel;
|
GtkWidget *toplevel;
|
||||||
@ -130,7 +130,7 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c
|
|||||||
|
|
||||||
panel->priv = NETWORK_PANEL_PRIVATE (panel);
|
panel->priv = NETWORK_PANEL_PRIVATE (panel);
|
||||||
|
|
||||||
@@ -3666,6 +3708,28 @@ cc_network_panel_init (CcNetworkPanel *p
|
@@ -3841,6 +3883,28 @@ cc_network_panel_init (CcNetworkPanel *p
|
||||||
|
|
||||||
/* add kill switch widgets when dialog activated */
|
/* add kill switch widgets when dialog activated */
|
||||||
panel->priv->add_header_widgets_idle = g_idle_add (network_add_shell_header_widgets_cb, panel);
|
panel->priv->add_header_widgets_idle = g_idle_add (network_add_shell_header_widgets_cb, panel);
|
||||||
@ -159,7 +159,7 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@@ -3676,3 +3740,9 @@ cc_network_panel_register (GIOModule *mo
|
@@ -3851,3 +3915,9 @@ cc_network_panel_register (GIOModule *mo
|
||||||
CC_TYPE_NETWORK_PANEL,
|
CC_TYPE_NETWORK_PANEL,
|
||||||
"network", 0);
|
"network", 0);
|
||||||
}
|
}
|
||||||
@ -169,10 +169,10 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.c
|
|||||||
+{
|
+{
|
||||||
+ return panel->priv->default_private;
|
+ return panel->priv->default_private;
|
||||||
+}
|
+}
|
||||||
Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.h
|
Index: gnome-control-center-3.5.4/panels/network/cc-network-panel.h
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gnome-control-center-3.4.2.orig/panels/network/cc-network-panel.h
|
--- gnome-control-center-3.5.4.orig/panels/network/cc-network-panel.h
|
||||||
+++ gnome-control-center-3.4.2/panels/network/cc-network-panel.h
|
+++ gnome-control-center-3.5.4/panels/network/cc-network-panel.h
|
||||||
@@ -67,6 +67,8 @@ GType cc_network_panel_get_type (void) G
|
@@ -67,6 +67,8 @@ GType cc_network_panel_get_type (void) G
|
||||||
|
|
||||||
void cc_network_panel_register (GIOModule *module);
|
void cc_network_panel_register (GIOModule *module);
|
||||||
@ -182,10 +182,10 @@ Index: gnome-control-center-3.4.2/panels/network/cc-network-panel.h
|
|||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* _CC_NETWORK_PANEL_H */
|
#endif /* _CC_NETWORK_PANEL_H */
|
||||||
Index: gnome-control-center-3.4.2/panels/network/network-dialogs.c
|
Index: gnome-control-center-3.5.4/panels/network/network-dialogs.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gnome-control-center-3.4.2.orig/panels/network/network-dialogs.c
|
--- gnome-control-center-3.5.4.orig/panels/network/network-dialogs.c
|
||||||
+++ gnome-control-center-3.4.2/panels/network/network-dialogs.c
|
+++ gnome-control-center-3.5.4/panels/network/network-dialogs.c
|
||||||
@@ -41,6 +41,7 @@ typedef struct {
|
@@ -41,6 +41,7 @@ typedef struct {
|
||||||
NMClient *client;
|
NMClient *client;
|
||||||
NMRemoteSettings *settings;
|
NMRemoteSettings *settings;
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:efc72bf8af07b439f5f0e9135d1b2c5237e649e6a0f1ff3cf32bdd710421042a
|
|
||||||
size 4267688
|
|
3
gnome-control-center-3.5.91.tar.xz
Normal file
3
gnome-control-center-3.5.91.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:f18986c1b783b550d8121189abdec7370b2b4e22f0d92ca07c9826eae79a37bd
|
||||||
|
size 4702224
|
@ -1,27 +0,0 @@
|
|||||||
From ae5b16f873869bce935cfaafad1964340f47e7d3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jon McCann <jmccann@redhat.com>
|
|
||||||
Date: Wed, 28 Mar 2012 19:10:32 +0000
|
|
||||||
Subject: background: Escape wallpaper filename before display
|
|
||||||
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=673015
|
|
||||||
---
|
|
||||||
diff --git a/panels/background/cc-background-panel.c b/panels/background/cc-background-panel.c
|
|
||||||
index 1ec9188..47a920e 100644
|
|
||||||
--- a/panels/background/cc-background-panel.c
|
|
||||||
+++ b/panels/background/cc-background-panel.c
|
|
||||||
@@ -340,8 +340,12 @@ update_preview (CcBackgroundPanelPrivate *priv,
|
|
||||||
if (priv->current_background)
|
|
||||||
{
|
|
||||||
GdkColor pcolor, scolor;
|
|
||||||
+ char *escaped;
|
|
||||||
+
|
|
||||||
+ escaped = g_markup_escape_text (cc_background_item_get_name (priv->current_background), -1);
|
|
||||||
+ markup = g_strdup_printf ("<b>%s</b>", escaped);
|
|
||||||
+ g_free (escaped);
|
|
||||||
|
|
||||||
- markup = g_strdup_printf ("<b>%s</b>", cc_background_item_get_name (priv->current_background));
|
|
||||||
gtk_label_set_markup (GTK_LABEL (WID ("background-label")), markup);
|
|
||||||
g_free (markup);
|
|
||||||
|
|
||||||
--
|
|
||||||
cgit v0.9.0.2
|
|
@ -1,11 +1,12 @@
|
|||||||
Index: gnome-control-center-3.2.0/shell/gnome-control-center.c
|
Index: gnome-control-center-3.5.90/shell/gnome-control-center.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gnome-control-center-3.2.0.orig/shell/gnome-control-center.c
|
--- gnome-control-center-3.5.90.orig/shell/gnome-control-center.c
|
||||||
+++ gnome-control-center-3.2.0/shell/gnome-control-center.c
|
+++ gnome-control-center-3.5.90/shell/gnome-control-center.c
|
||||||
@@ -110,6 +110,39 @@ get_icon_name_from_g_icon (GIcon *gicon)
|
@@ -172,6 +172,39 @@ get_icon_name_from_g_icon (GIcon *gicon)
|
||||||
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
+static void
|
||||||
+suse_activate_desktop (GnomeControlCenter *shell,
|
+suse_activate_desktop (GnomeControlCenter *shell,
|
||||||
+ const gchar *id,
|
+ const gchar *id,
|
||||||
+ const gchar *desktop_file)
|
+ const gchar *desktop_file)
|
||||||
@ -38,20 +39,19 @@ Index: gnome-control-center-3.2.0/shell/gnome-control-center.c
|
|||||||
+ g_object_unref (appinfo);
|
+ g_object_unref (appinfo);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+static void
|
static gboolean
|
||||||
activate_panel (GnomeControlCenter *shell,
|
activate_panel (GnomeControlCenter *shell,
|
||||||
const gchar *id,
|
const gchar *id,
|
||||||
const gchar **argv,
|
@@ -195,6 +228,12 @@ activate_panel (GnomeControlCenter *shel
|
||||||
@@ -127,6 +160,12 @@ activate_panel (GnomeControlCenter *shel
|
if (!id)
|
||||||
if (!desktop_file)
|
return FALSE;
|
||||||
return;
|
|
||||||
|
|
||||||
+ if (g_strcmp0 (id, "YaST.desktop") == 0)
|
+ if (g_strcmp0 (id, "YaST.desktop") == 0)
|
||||||
+ {
|
+ {
|
||||||
+ suse_activate_desktop (shell, id, desktop_file);
|
+ suse_activate_desktop (shell, id, desktop_file);
|
||||||
+ return;
|
+ return TRUE;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
if (id)
|
for (l = panels; l != NULL; l = l->next)
|
||||||
{
|
{
|
||||||
|
GIOExtension *extension;
|
||||||
|
@ -1,44 +0,0 @@
|
|||||||
commit 8631717b3d1cb85bf21b0e0d648b784e8e7c3f8f
|
|
||||||
Author: Dan Williams <dcbw@redhat.com>
|
|
||||||
Date: Fri Apr 20 11:48:17 2012 -0500
|
|
||||||
|
|
||||||
network: don't crash on hidden SSIDs
|
|
||||||
|
|
||||||
APs that don't broadcast their SSID will return NULL from
|
|
||||||
nm_access_point_get_ssid() (since that's easier to check in C
|
|
||||||
using an if statement than returning a zero-length GByteArray).
|
|
||||||
Thus the code shouldn't try to dereference the SSID byte array
|
|
||||||
since it could be NULL.
|
|
||||||
|
|
||||||
But in fact, the panel shouldn't be showing hidden APs anywhere
|
|
||||||
in the UI, since the user needs to manually enter the SSID to
|
|
||||||
connect to it anyway. So just ignore hidden APs like nm-applet
|
|
||||||
does.
|
|
||||||
|
|
||||||
Signed-off-by: Dan Williams <dcbw@redhat.com>
|
|
||||||
Signed-off-by: Richard Hughes <richard@hughsie.com>
|
|
||||||
|
|
||||||
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
|
|
||||||
index c8cbd78..d5ab951 100644
|
|
||||||
--- a/panels/network/cc-network-panel.c
|
|
||||||
+++ b/panels/network/cc-network-panel.c
|
|
||||||
@@ -1124,13 +1124,19 @@ panel_get_strongest_unique_aps (const GPtrArray *aps)
|
|
||||||
if (aps != NULL)
|
|
||||||
for (i = 0; i < aps->len; i++) {
|
|
||||||
ap = NM_ACCESS_POINT (g_ptr_array_index (aps, i));
|
|
||||||
+
|
|
||||||
+ /* Hidden SSIDs don't get shown in the list */
|
|
||||||
ssid = nm_access_point_get_ssid (ap);
|
|
||||||
+ if (!ssid)
|
|
||||||
+ continue;
|
|
||||||
+
|
|
||||||
add_ap = TRUE;
|
|
||||||
|
|
||||||
/* get already added list */
|
|
||||||
for (j=0; j<aps_unique->len; j++) {
|
|
||||||
ap_tmp = NM_ACCESS_POINT (g_ptr_array_index (aps_unique, j));
|
|
||||||
ssid_tmp = nm_access_point_get_ssid (ap_tmp);
|
|
||||||
+ g_assert (ssid_tmp);
|
|
||||||
|
|
||||||
/* is this the same type and data? */
|
|
||||||
if (nm_utils_same_ssid (ssid, ssid_tmp, TRUE)) {
|
|
@ -1,84 +0,0 @@
|
|||||||
From 570478bcae6c872a4903118fdae25cb72cb5a027 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Giovanni Campagna <gcampagna@src.gnome.org>
|
|
||||||
Date: Fri, 08 Jun 2012 21:01:10 +0000
|
|
||||||
Subject: screen: Fix for gnome-settings-daemon changes
|
|
||||||
|
|
||||||
g-s-d changed its DBus interface, and that made all
|
|
||||||
external changes to brightness invisible to the panel. Update
|
|
||||||
accordingly.
|
|
||||||
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=662117
|
|
||||||
---
|
|
||||||
Index: gnome-control-center-3.4.2/panels/screen/cc-screen-panel.c
|
|
||||||
===================================================================
|
|
||||||
--- gnome-control-center-3.4.2.orig/panels/screen/cc-screen-panel.c
|
|
||||||
+++ gnome-control-center-3.4.2/panels/screen/cc-screen-panel.c
|
|
||||||
@@ -169,33 +169,6 @@ cc_screen_panel_class_finalize (CcScreen
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
-on_signal (GDBusProxy *proxy,
|
|
||||||
- gchar *sender_name,
|
|
||||||
- gchar *signal_name,
|
|
||||||
- GVariant *parameters,
|
|
||||||
- gpointer user_data)
|
|
||||||
-{
|
|
||||||
- CcScreenPanel *self = CC_SCREEN_PANEL (user_data);
|
|
||||||
-
|
|
||||||
- if (g_strcmp0 (signal_name, "BrightnessChanged") == 0)
|
|
||||||
- {
|
|
||||||
- guint brightness;
|
|
||||||
- GtkRange *range;
|
|
||||||
-
|
|
||||||
- /* changed, but ignoring */
|
|
||||||
- if (self->priv->setting_brightness)
|
|
||||||
- return;
|
|
||||||
-
|
|
||||||
- /* update the bar */
|
|
||||||
- g_variant_get (parameters,
|
|
||||||
- "(u)",
|
|
||||||
- &brightness);
|
|
||||||
- range = GTK_RANGE (WID ("screen_brightness_hscale"));
|
|
||||||
- gtk_range_set_value (range, brightness);
|
|
||||||
- }
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-static void
|
|
||||||
set_brightness_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
|
|
||||||
{
|
|
||||||
GError *error = NULL;
|
|
||||||
@@ -276,6 +249,34 @@ get_brightness_cb (GObject *source_objec
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
+on_signal (GDBusProxy *proxy,
|
|
||||||
+ gchar *sender_name,
|
|
||||||
+ gchar *signal_name,
|
|
||||||
+ GVariant *parameters,
|
|
||||||
+ gpointer user_data)
|
|
||||||
+{
|
|
||||||
+ CcScreenPanel *self = CC_SCREEN_PANEL (user_data);
|
|
||||||
+
|
|
||||||
+ if (g_strcmp0 (signal_name, "Changed") == 0)
|
|
||||||
+ {
|
|
||||||
+ /* changed, but ignoring */
|
|
||||||
+ if (self->priv->setting_brightness)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ /* retrieve the value again from g-s-d */
|
|
||||||
+ g_dbus_proxy_call (self->priv->proxy,
|
|
||||||
+ "GetPercentage",
|
|
||||||
+ NULL,
|
|
||||||
+ G_DBUS_CALL_FLAGS_NONE,
|
|
||||||
+ 200, /* we don't want to randomly move the bar */
|
|
||||||
+ self->priv->cancellable,
|
|
||||||
+ get_brightness_cb,
|
|
||||||
+ user_data);
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+static void
|
|
||||||
got_power_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
|
|
||||||
{
|
|
||||||
GError *error = NULL;
|
|
@ -1,68 +0,0 @@
|
|||||||
From 8560cf39a214d973e24667fcc82a192fd18251c4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bastien Nocera <hadess@hadess.net>
|
|
||||||
Date: Mon, 16 Jul 2012 16:03:36 +0000
|
|
||||||
Subject: shell: Fix not being able to assign Ctrl+Q to a shortcut
|
|
||||||
|
|
||||||
Because the shell window was capturing it before the key editing
|
|
||||||
cell had a change to get to it.
|
|
||||||
|
|
||||||
s/g_signal_connect/g_signal_connect_after/
|
|
||||||
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=671448
|
|
||||||
---
|
|
||||||
diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c
|
|
||||||
index b1c66b3..d046033 100644
|
|
||||||
--- a/shell/gnome-control-center.c
|
|
||||||
+++ b/shell/gnome-control-center.c
|
|
||||||
@@ -1115,8 +1115,8 @@ gnome_control_center_init (GnomeControlCenter *self)
|
|
||||||
/* connect various signals */
|
|
||||||
priv->window = W (priv->builder, "main-window");
|
|
||||||
g_signal_connect_swapped (priv->window, "delete-event", G_CALLBACK (g_object_unref), self);
|
|
||||||
- g_signal_connect (priv->window, "key_press_event",
|
|
||||||
- G_CALLBACK (window_key_press_event), self);
|
|
||||||
+ g_signal_connect_after (priv->window, "key_press_event",
|
|
||||||
+ G_CALLBACK (window_key_press_event), self);
|
|
||||||
|
|
||||||
priv->notebook = W (priv->builder, "notebook");
|
|
||||||
priv->scrolled_window = W (priv->builder, "scrolledwindow1");
|
|
||||||
--
|
|
||||||
cgit v0.9.0.2
|
|
||||||
|
|
||||||
From e5bfcb23d31310e73dc73c2af5a6230e772d115f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bastien Nocera <hadess@hadess.net>
|
|
||||||
Date: Mon, 16 Jul 2012 17:05:04 +0000
|
|
||||||
Subject: shell: Don't handle shortcuts with excess modifiers
|
|
||||||
|
|
||||||
Ctrl+Alt+W shouldn't be handled the same way as Ctrl+W.
|
|
||||||
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=675475
|
|
||||||
---
|
|
||||||
diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c
|
|
||||||
index d046033..195a0a1 100644
|
|
||||||
--- a/shell/gnome-control-center.c
|
|
||||||
+++ b/shell/gnome-control-center.c
|
|
||||||
@@ -1058,12 +1058,20 @@ window_key_press_event (GtkWidget *win,
|
|
||||||
GdkEventKey *event,
|
|
||||||
GnomeControlCenter *self)
|
|
||||||
{
|
|
||||||
+ GdkKeymap *keymap;
|
|
||||||
gboolean retval;
|
|
||||||
+ GdkModifierType state;
|
|
||||||
+
|
|
||||||
+ if (event->state == 0)
|
|
||||||
+ return FALSE;
|
|
||||||
|
|
||||||
retval = FALSE;
|
|
||||||
+ state = event->state;
|
|
||||||
+ keymap = gdk_keymap_get_default ();
|
|
||||||
+ gdk_keymap_add_virtual_modifiers (keymap, &state);
|
|
||||||
+ state = state & gtk_accelerator_get_default_mod_mask ();
|
|
||||||
|
|
||||||
- if (event->state != 0 &&
|
|
||||||
- (event->state & GDK_CONTROL_MASK))
|
|
||||||
+ if (state == GDK_CONTROL_MASK)
|
|
||||||
{
|
|
||||||
switch (event->keyval)
|
|
||||||
{
|
|
||||||
--
|
|
||||||
cgit v0.9.0.2
|
|
@ -1,3 +1,248 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Sep 4 21:32:36 UTC 2012 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 3.5.91:
|
||||||
|
+ Common:
|
||||||
|
- Fix memory leaks in language sorting
|
||||||
|
- Fix too big editable labels
|
||||||
|
+ Date & Time:
|
||||||
|
- Make map look unsensitive when the panel is locked
|
||||||
|
+ Display:
|
||||||
|
- Fix possible warning on exit
|
||||||
|
- Make 'Mirrored Displays' string consistent with
|
||||||
|
GnomeRRLabeler
|
||||||
|
+ Info:
|
||||||
|
- Add PolicyKit rules for hostname setting
|
||||||
|
- Set related mime types when changing preferred apps
|
||||||
|
+ Mouse:
|
||||||
|
- New testing area
|
||||||
|
- Remove italics from test page
|
||||||
|
- Fix left/right mouse-handedness radio buttons in RTL
|
||||||
|
languages
|
||||||
|
+ Network:
|
||||||
|
- Ignore unrecognised device types
|
||||||
|
- Fix wired and mobile activations
|
||||||
|
- Don't try to activate slave connections
|
||||||
|
+ Printers:
|
||||||
|
- Redesign the "new printer" dialogue
|
||||||
|
+ Region & Language:
|
||||||
|
- Add Russian and Egyptian Arabic as common languages
|
||||||
|
- Don't use IBus in fallback mode
|
||||||
|
- Honor the 'show-all-sources' setting
|
||||||
|
- Don't block getting the IBus engines
|
||||||
|
- Expand the default list of input sources
|
||||||
|
+ User Accounts:
|
||||||
|
- Simplify some drawing code
|
||||||
|
- Fix login keyring password not getting updated
|
||||||
|
- Fix match icon not updating in some cases.
|
||||||
|
- Drop gnome-control-center-bgpanel.patch: fixed upstream.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Aug 21 20:47:06 UTC 2012 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 3.5.90:
|
||||||
|
+ Background:
|
||||||
|
- Implement new design
|
||||||
|
+ Bluetooth:
|
||||||
|
- Require a newer version of gnome-bluetooth
|
||||||
|
+ Keyboard:
|
||||||
|
- Add common keyboard layout related options to the shortcuts tab
|
||||||
|
+ Mouse:
|
||||||
|
- Implement new design, including support for natural scroll
|
||||||
|
+ Network:
|
||||||
|
- Improve the Wi-Fi page layout
|
||||||
|
+ Online Accounts:
|
||||||
|
- Allow opening a particular account from the command-line
|
||||||
|
- Avoid spurious "No online accounts configured" overlay
|
||||||
|
- Fix crash when loading the panel a second time
|
||||||
|
+ Shell:
|
||||||
|
- Remove animations, they were causing a number of problems,
|
||||||
|
but were a useful exercise for future developments.
|
||||||
|
+ Sound:
|
||||||
|
- Remove hardware page, and offer different connectors directly
|
||||||
|
from the input and output pages
|
||||||
|
+ Universal Access:
|
||||||
|
- Add zoom shader options, and reorganise zoom dialogue
|
||||||
|
+ User Accounts:
|
||||||
|
- UI changes for better remote accounts support
|
||||||
|
- Fix crash with incompatible versions of realmd
|
||||||
|
+ Wacom:
|
||||||
|
- Add support for "switch monitor" shortcut
|
||||||
|
+ Updated translations.
|
||||||
|
- Add gnome-control-center-bgpanel.patch: add missing includes.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Aug 8 18:09:34 UTC 2012 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 3.5.6:
|
||||||
|
+ Add man page
|
||||||
|
+ Brightness & Lock:
|
||||||
|
- Make "show notifications" available even if we don't lock
|
||||||
|
the screen automatically
|
||||||
|
+ Display:
|
||||||
|
- Fix possible error when the preferred mode is only
|
||||||
|
available on one of the two outputs in mirror mode
|
||||||
|
+ Info:
|
||||||
|
- Adapt for changed API in PackageKit
|
||||||
|
- Small UI bug fixes
|
||||||
|
+ Network:
|
||||||
|
- Refactoring for mobile broadband support and bug fixes
|
||||||
|
- Split the wireless panel
|
||||||
|
- Only show extra details for the active connection
|
||||||
|
- Add network strength to the details panel
|
||||||
|
- Only show the disconnect button when a device is fully
|
||||||
|
activated
|
||||||
|
- Fix crash with Access Points with non UTF-8 names
|
||||||
|
- Forget the last selected wireless network when the button is
|
||||||
|
clicked
|
||||||
|
- Improve hotspot dialogue
|
||||||
|
+ Printers:
|
||||||
|
- Add support for CUPS 1.6
|
||||||
|
- Don't restrict the PPD list to PPDs with DeviceIDs
|
||||||
|
- Cancel async operations correctly
|
||||||
|
- Move jobs to a separate dialogue
|
||||||
|
+ Region:
|
||||||
|
- Make ibus code more robust
|
||||||
|
- Handle being opened twice gracefully
|
||||||
|
- Require ibus 1.4.99 if ibus support is requested
|
||||||
|
+ User accounts:
|
||||||
|
- Update for realmd 0.6
|
||||||
|
- Strip remote D-Bus errors from user-visible messages
|
||||||
|
- Fix memory leaks
|
||||||
|
+ Wacom:
|
||||||
|
- Fix critical warning after calibration
|
||||||
|
- Only do calibration for the selected tool
|
||||||
|
+ Updated translations.
|
||||||
|
- Disable gcc-private-connection.patch for now: needs rebasing.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Aug 3 19:55:00 UTC 2012 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 3.5.5:
|
||||||
|
+ Brightness & Lock:
|
||||||
|
- Add a "Show Notifications" setting
|
||||||
|
+ Keyboard:
|
||||||
|
- Fix a memory leak
|
||||||
|
- Fix some shortcuts used by the shell not being available for
|
||||||
|
capture
|
||||||
|
+ Network:
|
||||||
|
- Fix a number of crashers that occurred after the network
|
||||||
|
panel was closed
|
||||||
|
- Make mobile broadband support usable
|
||||||
|
- Sort Wi-Fi access points by strength
|
||||||
|
- Fix VPN information
|
||||||
|
+ Printers:
|
||||||
|
- Allow users to change printer's PPD file
|
||||||
|
- Add "Options" dialogue with more options than available
|
||||||
|
readily
|
||||||
|
+ Power and User Accounts:
|
||||||
|
- Port to use GtkLevelBar
|
||||||
|
+ Region:
|
||||||
|
- Add support for IBus input sources
|
||||||
|
+ Sound:
|
||||||
|
- Move input streams when the default source changes
|
||||||
|
- Add backend code to track inputs and outputs in PulseAudio
|
||||||
|
2.0
|
||||||
|
+ Wacom:
|
||||||
|
- Apply display rotation to devices
|
||||||
|
- Destroy the display mapping dialogue on unplug
|
||||||
|
- Show a mark when calibration succeeds.
|
||||||
|
- Add pkgconfig(ibus-1.0) BuildRequires: new dependency.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Aug 3 19:37:04 UTC 2012 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 3.5.4:
|
||||||
|
+ Wacom:
|
||||||
|
- Fix crasher related to display matching.
|
||||||
|
- Rebase gcc-private-connection.patch.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Aug 3 09:23:06 UTC 2012 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 3.5.3:
|
||||||
|
+ All:
|
||||||
|
- Use '&' instead of 'and', keeping the names shorter but also
|
||||||
|
keep the user focused on other words which compose the name
|
||||||
|
+ Background:
|
||||||
|
- Make sure background can get cancelled
|
||||||
|
- Avoid escaped wallpaper name in the UI
|
||||||
|
+ Brightness & Lock:
|
||||||
|
- Update slider when changing the brightness via keyboard keys
|
||||||
|
+ Info:
|
||||||
|
- Add software media to "other media" dialogue
|
||||||
|
- Add title for the "other media" dialog
|
||||||
|
+ Network:
|
||||||
|
- Don't crash on hidden SSIDs
|
||||||
|
- Fix packing order of children in the service dialog
|
||||||
|
- Add mnemonic for a number of controls
|
||||||
|
- Sort wireless first
|
||||||
|
- Make list of Access Points more similar to the shell menu
|
||||||
|
- Stop buttons jumping when switching between devices
|
||||||
|
+ Online Accounts:
|
||||||
|
- Updated "Add Account" dialogue design
|
||||||
|
- Improve layout when there are no configured accounts
|
||||||
|
+ Power:
|
||||||
|
- Fix reference to "Screen" settings
|
||||||
|
+ Shell:
|
||||||
|
- Fix crash when using keynav in overview
|
||||||
|
- Don't animate between overview and search pages
|
||||||
|
- Use GtkSearchEntry
|
||||||
|
- Crasher fixes
|
||||||
|
+ Sound:
|
||||||
|
- Add "audio" keyword
|
||||||
|
- Fix mouse scrolls and clicking behaviour on sliders
|
||||||
|
- Fix unmuting not working when dragging the event role slider
|
||||||
|
+ User accounts:
|
||||||
|
- Add support for remote Kerberos accounts
|
||||||
|
+ Wacom:
|
||||||
|
- Add keep aspect ratio option
|
||||||
|
- Cancel calibration if window loses focus.
|
||||||
|
- Add krb5-devel BuildRequires: new dependency.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Aug 2 22:04:28 UTC 2012 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 3.5.2:
|
||||||
|
+ Shell:
|
||||||
|
- Many layout improvements
|
||||||
|
- Format search results in 3 columns
|
||||||
|
- Animate page switches
|
||||||
|
- Add an app menu
|
||||||
|
+ User accounts:
|
||||||
|
- Make controls insensitive when no user selected
|
||||||
|
- Simplify generated password handling
|
||||||
|
- Use libpwquality for password quality checks
|
||||||
|
+ Backgrounds:
|
||||||
|
- Ignore screenshots
|
||||||
|
- Only show supported image types
|
||||||
|
+ Display:
|
||||||
|
- Translate the rotation drop-down again
|
||||||
|
+ Info:
|
||||||
|
- Ignore NFS and removable mounts for disk size
|
||||||
|
+ Network:
|
||||||
|
- Allow configuring wired network devices when not connected
|
||||||
|
+ Universal Access:
|
||||||
|
- Redesign for consistency and smallness
|
||||||
|
+ Printers:
|
||||||
|
- Set default media sizes
|
||||||
|
+ Region:
|
||||||
|
- Replace layouts tab with input sources tab
|
||||||
|
+ Wacom:
|
||||||
|
- Rename to "Wacom Tablet"
|
||||||
|
- Update ui on hotplug
|
||||||
|
- Disable on s390 and !linux
|
||||||
|
+ Updated translations.
|
||||||
|
- Rebase gnome-control-center-allow-yast-in-shell.patch.
|
||||||
|
- Drop upstream fixed patches:
|
||||||
|
+ gnome-control-center-fix-screen-brightness.patch
|
||||||
|
+ gnome-control-center-shortcut-assignment-fixes.patch
|
||||||
|
+ gnome-control-center-allow-wallpapers-with-weird-names.patch
|
||||||
|
+ gnome-control-center-fix-crash-on-hidden-ssid.patch
|
||||||
|
- Drop pkgconfig(libgnomekbd), pkgconfig(libgnomekbdui) and
|
||||||
|
pkgconfig(libxklavier) BuildRequires: no longer needed.
|
||||||
|
- Add pkgconfig(clutter-gtk-1.0) BuildRequires: new dependency.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Aug 2 13:50:51 UTC 2012 - badshah400@gmail.com
|
Thu Aug 2 13:50:51 UTC 2012 - badshah400@gmail.com
|
||||||
|
|
||||||
|
@ -21,14 +21,14 @@
|
|||||||
%define with_systemd 0
|
%define with_systemd 0
|
||||||
|
|
||||||
Name: gnome-control-center
|
Name: gnome-control-center
|
||||||
Version: 3.4.2
|
Version: 3.5.91
|
||||||
Release: 0
|
Release: 0
|
||||||
# FIXME: in 12.2 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833)
|
# 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
|
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.4/%{name}-%{version}.tar.xz
|
Source: http://download.gnome.org/sources/gnome-control-center/3.5/%{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-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)
|
# 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)
|
||||||
@ -37,58 +37,51 @@ Patch2: gnome-control-center-hide-region-system-tab.patch
|
|||||||
Patch3: gnome-control-center-fine-grained-tz-polkit.patch
|
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-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 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
|
||||||
# PATCH-FIX-UPSTREAM gnome-control-center-probe-radius-server-cert.patch bnc#574266 glin@suse.com -- network: Probe the RADIUS server certificate
|
# 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
|
Patch16: gnome-control-center-probe-radius-server-cert.patch
|
||||||
# PATCH-FIX-UPSTREAM gnome-control-center-fix-crash-on-hidden-ssid.patch glin@suse.com -- network: don't crash on hidden ssid
|
|
||||||
Patch17: gnome-control-center-fix-crash-on-hidden-ssid.patch
|
|
||||||
# PATCH-FIX-UPSTREAM gnome-control-center-fix-screen-brightness.patch bgo#662117 bnc#774190 badshah400@gmail.com -- Fix brightness slider not picking up right brightness settings values; patch came from upstream git
|
|
||||||
Patch18: gnome-control-center-fix-screen-brightness.patch
|
|
||||||
# PATCH-FIX-UPSTREAM gnome-control-center-shortcut-assignment-fixes.patch bgo#675475 bgo#671448 badshah400@gmail.com -- Fix not being able to assign odd keyboard shortcuts (Ctrl+Q, etc); patch came from upstream git
|
|
||||||
Patch19: gnome-control-center-shortcut-assignment-fixes.patch
|
|
||||||
# PATCH-FIX-UPSTREAM gnome-control-center-allow-wallpapers-with-weird-names.patch bgo#673015 badshah400@gmail.com -- Wallpapers with weird names involving special characters; patch came from upstream git
|
|
||||||
Patch20: gnome-control-center-allow-wallpapers-with-weird-names.patch
|
|
||||||
BuildRequires: cups-devel
|
BuildRequires: cups-devel
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gnome-common
|
BuildRequires: gnome-common
|
||||||
BuildRequires: intltool
|
BuildRequires: intltool
|
||||||
|
BuildRequires: krb5-devel
|
||||||
BuildRequires: translation-update-upstream
|
BuildRequires: translation-update-upstream
|
||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
BuildRequires: pkgconfig(cheese)
|
BuildRequires: pkgconfig(cheese)
|
||||||
BuildRequires: pkgconfig(cheese-gtk) >= 3.3.5
|
BuildRequires: pkgconfig(cheese-gtk) >= 3.3.5
|
||||||
|
BuildRequires: pkgconfig(clutter-gtk-1.0)
|
||||||
BuildRequires: pkgconfig(colord)
|
BuildRequires: pkgconfig(colord)
|
||||||
BuildRequires: pkgconfig(fontconfig)
|
BuildRequires: pkgconfig(fontconfig)
|
||||||
BuildRequires: pkgconfig(gconf-2.0)
|
BuildRequires: pkgconfig(gconf-2.0)
|
||||||
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
|
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
|
||||||
BuildRequires: pkgconfig(glib-2.0) >= 2.31.0
|
BuildRequires: pkgconfig(glib-2.0) >= 2.31.0
|
||||||
BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.3.4
|
BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.5.5
|
||||||
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.1.91
|
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.5.91
|
||||||
BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.3.91
|
BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.5.2
|
||||||
BuildRequires: pkgconfig(goa-1.0)
|
BuildRequires: pkgconfig(goa-1.0) >= 3.5.90
|
||||||
BuildRequires: pkgconfig(goa-backend-1.0)
|
BuildRequires: pkgconfig(goa-backend-1.0)
|
||||||
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.3.0
|
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.5.91
|
||||||
BuildRequires: pkgconfig(gstreamer-0.10)
|
BuildRequires: pkgconfig(gstreamer-0.10)
|
||||||
BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.5
|
BuildRequires: pkgconfig(gtk+-3.0) >= 3.5.13
|
||||||
|
BuildRequires: pkgconfig(ibus-1.0) >= 1.4.99
|
||||||
BuildRequires: pkgconfig(iso-codes)
|
BuildRequires: pkgconfig(iso-codes)
|
||||||
BuildRequires: pkgconfig(libcanberra-gtk3)
|
BuildRequires: pkgconfig(libcanberra-gtk3)
|
||||||
BuildRequires: pkgconfig(libgnome-menu-3.0)
|
BuildRequires: pkgconfig(libgnome-menu-3.0)
|
||||||
BuildRequires: pkgconfig(libgnomekbd)
|
|
||||||
BuildRequires: pkgconfig(libgnomekbdui)
|
|
||||||
BuildRequires: pkgconfig(libgtop-2.0)
|
BuildRequires: pkgconfig(libgtop-2.0)
|
||||||
BuildRequires: pkgconfig(libnm-glib) >= 0.8.992
|
BuildRequires: pkgconfig(libnm-glib) >= 0.8.992
|
||||||
BuildRequires: pkgconfig(libnm-gtk) >= 0.8.992
|
BuildRequires: pkgconfig(libnm-gtk) >= 0.8.992
|
||||||
BuildRequires: pkgconfig(libnotify) >= 0.7.3
|
BuildRequires: pkgconfig(libnotify) >= 0.7.3
|
||||||
BuildRequires: pkgconfig(libpulse)
|
BuildRequires: pkgconfig(libpulse) >= 2.0
|
||||||
BuildRequires: pkgconfig(libpulse-mainloop-glib)
|
BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 2.0
|
||||||
%if %{with_systemd}
|
%if %{with_systemd}
|
||||||
BuildRequires: pkgconfig(libsystemd-login)
|
BuildRequires: pkgconfig(libsystemd-login)
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: pkgconfig(libwacom) >= 0.3
|
BuildRequires: pkgconfig(libwacom) >= 0.5
|
||||||
BuildRequires: pkgconfig(libxklavier)
|
|
||||||
BuildRequires: pkgconfig(libxml-2.0)
|
BuildRequires: pkgconfig(libxml-2.0)
|
||||||
BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103
|
BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103
|
||||||
|
BuildRequires: pkgconfig(pwquality)
|
||||||
BuildRequires: pkgconfig(upower-glib)
|
BuildRequires: pkgconfig(upower-glib)
|
||||||
BuildRequires: pkgconfig(x11)
|
BuildRequires: pkgconfig(x11)
|
||||||
BuildRequires: pkgconfig(xcursor)
|
BuildRequires: pkgconfig(xcursor)
|
||||||
@ -171,12 +164,9 @@ translation-update-upstream
|
|||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
#NEEDS-REBASE
|
#NEEDS-REBASE
|
||||||
#%patch14 -p1
|
#%patch14 -p1
|
||||||
%patch15 -p1
|
#NEEDS-REBASE
|
||||||
|
#patch15 -p1
|
||||||
%patch16 -p1
|
%patch16 -p1
|
||||||
%patch17 -p1
|
|
||||||
%patch18 -p1
|
|
||||||
%patch19 -p1
|
|
||||||
%patch20 -p1
|
|
||||||
|
|
||||||
%if 0%{?BUILD_FROM_VCS}
|
%if 0%{?BUILD_FROM_VCS}
|
||||||
[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh
|
[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh
|
||||||
@ -248,10 +238,14 @@ rm -rf %{buildroot}
|
|||||||
%{_datadir}/icons/hicolor/*/*/*.png
|
%{_datadir}/icons/hicolor/*/*/*.png
|
||||||
%{_datadir}/icons/hicolor/*/*/*.svg
|
%{_datadir}/icons/hicolor/*/*/*.svg
|
||||||
%{_datadir}/polkit-1/actions/org.gnome.controlcenter.datetime.policy
|
%{_datadir}/polkit-1/actions/org.gnome.controlcenter.datetime.policy
|
||||||
|
%{_datadir}/polkit-1/actions/org.gnome.controlcenter.user-accounts.policy
|
||||||
|
%dir %{_datadir}/polkit-1/rules.d
|
||||||
|
%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
|
||||||
%dir %{_datadir}/sounds/gnome
|
%dir %{_datadir}/sounds/gnome
|
||||||
%dir %{_datadir}/sounds/gnome/default
|
%dir %{_datadir}/sounds/gnome/default
|
||||||
%dir %{_datadir}/sounds/gnome/default/alerts
|
%dir %{_datadir}/sounds/gnome/default/alerts
|
||||||
%{_datadir}/sounds/gnome/default/alerts/*.ogg
|
%{_datadir}/sounds/gnome/default/alerts/*.ogg
|
||||||
|
%{_mandir}/man1/gnome-control-center.1%{?ext_man}
|
||||||
|
|
||||||
%files branding-upstream
|
%files branding-upstream
|
||||||
%defattr (-, root, root)
|
%defattr (-, root, root)
|
||||||
|
Loading…
Reference in New Issue
Block a user