Accepting request 246030 from GNOME:Next

Push GNOME 3.13.90 to the devel repo
(resub due to minor edit of .changes)

OBS-URL: https://build.opensuse.org/request/show/246030
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=248
This commit is contained in:
Dominique Leuenberger 2014-08-23 11:52:28 +00:00 committed by Git OBS Bridge
parent e8b09b15ed
commit 529d860e5c
6 changed files with 164 additions and 52 deletions

View File

@ -19,25 +19,25 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646187
panels/network/network-dialogs.h | 6 ++++--
7 files changed, 94 insertions(+), 9 deletions(-)
Index: gnome-control-center-3.11.1/configure.ac
Index: gnome-control-center-3.13.90/configure.ac
===================================================================
--- gnome-control-center-3.11.1.orig/configure.ac
+++ gnome-control-center-3.11.1/configure.ac
@@ -134,7 +134,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMO
--- gnome-control-center-3.13.90.orig/configure.ac
+++ gnome-control-center-3.13.90/configure.ac
@@ -137,7 +137,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMO
PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
-PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
+PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0)
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES)
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.99.0
Index: gnome-control-center-3.11.1/panels/network/cc-network-panel.c
Index: gnome-control-center-3.13.90/panels/network/cc-network-panel.c
===================================================================
--- gnome-control-center-3.11.1.orig/panels/network/cc-network-panel.c
+++ gnome-control-center-3.11.1/panels/network/cc-network-panel.c
@@ -24,6 +24,8 @@
--- gnome-control-center-3.13.90.orig/panels/network/cc-network-panel.c
+++ gnome-control-center-3.13.90/panels/network/cc-network-panel.c
@@ -23,6 +23,8 @@
#include <glib/gi18n.h>
#include <stdlib.h>
@ -46,7 +46,7 @@ Index: gnome-control-center-3.11.1/panels/network/cc-network-panel.c
#include "cc-network-panel.h"
#include "cc-network-resources.h"
@@ -87,6 +89,9 @@ struct _CcNetworkPanelPrivate
@@ -86,6 +88,9 @@ struct _CcNetworkPanelPrivate
gchar *arg_device;
gchar *arg_access_point;
gboolean operation_done;
@ -56,7 +56,7 @@ Index: gnome-control-center-3.11.1/panels/network/cc-network-panel.c
};
enum {
@@ -574,13 +579,13 @@ handle_argv_for_device (CcNetworkPanel *
@@ -582,13 +587,13 @@ handle_argv_for_device (CcNetworkPanel *
return TRUE;
} else if (g_strcmp0 (nm_object_get_path (NM_OBJECT (device)), priv->arg_device) == 0) {
if (priv->arg_operation == OPERATION_CONNECT_MOBILE) {
@ -72,7 +72,7 @@ Index: gnome-control-center-3.11.1/panels/network/cc-network-panel.c
reset_command_line_args (panel); /* done */
select_tree_iter (panel, iter);
return TRUE;
@@ -1355,6 +1360,9 @@ cc_network_panel_init (CcNetworkPanel *p
@@ -1400,6 +1405,9 @@ cc_network_panel_init (CcNetworkPanel *p
GtkWidget *widget;
GtkWidget *toplevel;
GDBusConnection *system_bus;
@ -82,7 +82,7 @@ Index: gnome-control-center-3.11.1/panels/network/cc-network-panel.c
panel->priv = NETWORK_PANEL_PRIVATE (panel);
g_resources_register (cc_network_get_resource ());
@@ -1458,4 +1466,32 @@ cc_network_panel_init (CcNetworkPanel *p
@@ -1503,4 +1511,32 @@ cc_network_panel_init (CcNetworkPanel *p
widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
"vbox1"));
gtk_container_add (GTK_CONTAINER (panel), widget);
@ -115,11 +115,11 @@ Index: gnome-control-center-3.11.1/panels/network/cc-network-panel.c
+{
+ return panel->priv->default_private;
}
Index: gnome-control-center-3.11.1/panels/network/cc-network-panel.h
Index: gnome-control-center-3.13.90/panels/network/cc-network-panel.h
===================================================================
--- gnome-control-center-3.11.1.orig/panels/network/cc-network-panel.h
+++ gnome-control-center-3.11.1/panels/network/cc-network-panel.h
@@ -67,6 +67,8 @@ GType cc_network_panel_get_type (void) G
--- gnome-control-center-3.13.90.orig/panels/network/cc-network-panel.h
+++ gnome-control-center-3.13.90/panels/network/cc-network-panel.h
@@ -66,6 +66,8 @@ GType cc_network_panel_get_type (void) G
GPtrArray *cc_network_panel_get_devices (CcNetworkPanel *panel);
@ -128,10 +128,10 @@ Index: gnome-control-center-3.11.1/panels/network/cc-network-panel.h
G_END_DECLS
#endif /* _CC_NETWORK_PANEL_H */
Index: gnome-control-center-3.11.1/panels/network/net-device-mobile.c
Index: gnome-control-center-3.13.90/panels/network/net-device-mobile.c
===================================================================
--- gnome-control-center-3.11.1.orig/panels/network/net-device-mobile.c
+++ gnome-control-center-3.11.1/panels/network/net-device-mobile.c
--- gnome-control-center-3.13.90.orig/panels/network/net-device-mobile.c
+++ gnome-control-center-3.13.90/panels/network/net-device-mobile.c
@@ -141,12 +141,15 @@ mobile_connection_changed_cb (GtkComboBo
COLUMN_ID, &object_path,
-1);
@ -149,11 +149,11 @@ Index: gnome-control-center-3.11.1/panels/network/net-device-mobile.c
goto out;
}
Index: gnome-control-center-3.11.1/panels/network/net-device-wifi.c
Index: gnome-control-center-3.13.90/panels/network/net-device-wifi.c
===================================================================
--- gnome-control-center-3.11.1.orig/panels/network/net-device-wifi.c
+++ gnome-control-center-3.11.1/panels/network/net-device-wifi.c
@@ -696,6 +696,9 @@ wireless_try_to_connect (NetDeviceWifi *
--- gnome-control-center-3.13.90.orig/panels/network/net-device-wifi.c
+++ gnome-control-center-3.13.90/panels/network/net-device-wifi.c
@@ -697,6 +697,9 @@ wireless_try_to_connect (NetDeviceWifi *
NMDevice *device;
NMSettingWireless *setting_wireless;
NMClient *client;
@ -163,7 +163,7 @@ Index: gnome-control-center-3.11.1/panels/network/net-device-wifi.c
if (device_wifi->priv->updating_device)
goto out;
@@ -747,10 +750,21 @@ wireless_try_to_connect (NetDeviceWifi *
@@ -748,10 +751,21 @@ wireless_try_to_connect (NetDeviceWifi *
/* create one, as it's missing */
g_debug ("no existing connection found for %s, creating", ssid_target);
@ -186,15 +186,15 @@ Index: gnome-control-center-3.11.1/panels/network/net-device-wifi.c
device, ap_object_path,
connection_add_activate_cb, device_wifi);
} else {
@@ -965,6 +979,7 @@ start_shared_connection (NetDeviceWifi *
GSList *l;
@@ -995,6 +1009,7 @@ start_shared_connection (NetDeviceWifi *
NMClient *client;
const char *mode;
NMDeviceWifiCapabilities caps;
+ CcNetworkPanel *panel;
device = net_device_get_nm_device (NET_DEVICE (device_wifi));
g_assert (nm_device_get_device_type (device) == NM_DEVICE_TYPE_WIFI);
@@ -1001,6 +1016,14 @@ start_shared_connection (NetDeviceWifi *
@@ -1031,6 +1046,14 @@ start_shared_connection (NetDeviceWifi *
"id", "Hotspot",
"autoconnect", FALSE,
NULL);
@ -209,10 +209,10 @@ Index: gnome-control-center-3.11.1/panels/network/net-device-wifi.c
nm_connection_add_setting (c, (NMSetting *)sc);
sw = (NMSettingWireless *)nm_setting_wireless_new ();
Index: gnome-control-center-3.11.1/panels/network/network-dialogs.c
Index: gnome-control-center-3.13.90/panels/network/network-dialogs.c
===================================================================
--- gnome-control-center-3.11.1.orig/panels/network/network-dialogs.c
+++ gnome-control-center-3.11.1/panels/network/network-dialogs.c
--- gnome-control-center-3.13.90.orig/panels/network/network-dialogs.c
+++ gnome-control-center-3.13.90/panels/network/network-dialogs.c
@@ -41,6 +41,7 @@ typedef struct {
NMClient *client;
NMRemoteSettings *settings;
@ -298,10 +298,10 @@ Index: gnome-control-center-3.11.1/panels/network/network-dialogs.c
caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device));
if (caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) {
Index: gnome-control-center-3.11.1/panels/network/network-dialogs.h
Index: gnome-control-center-3.13.90/panels/network/network-dialogs.h
===================================================================
--- gnome-control-center-3.11.1.orig/panels/network/network-dialogs.h
+++ gnome-control-center-3.11.1/panels/network/network-dialogs.h
--- gnome-control-center-3.13.90.orig/panels/network/network-dialogs.h
+++ gnome-control-center-3.13.90/panels/network/network-dialogs.h
@@ -38,11 +38,13 @@ void cc_network_panel_connect_to_8021x_n
NMClient *client,
NMRemoteSettings *settings,

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582
size 6866544

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8f37e500c63b25eb48c37fe9cb51884b1f189d68ff3217ccfad47d019f5330e7
size 6903416

View File

@ -8,10 +8,10 @@ Subject: [PATCH] allow extra tools in shell
shell/cc-window.c | 43 ++++++++++++++++++++++++++++++++++
2 files changed, 81 insertions(+), 23 deletions(-)
Index: gnome-control-center-3.12.1/shell/cc-panel-loader.c
Index: gnome-control-center-3.13.4/shell/cc-panel-loader.c
===================================================================
--- gnome-control-center-3.12.1.orig/shell/cc-panel-loader.c
+++ gnome-control-center-3.12.1/shell/cc-panel-loader.c
--- gnome-control-center-3.13.4.orig/shell/cc-panel-loader.c
+++ gnome-control-center-3.13.4/shell/cc-panel-loader.c
@@ -73,35 +73,42 @@ static struct {
GType (*get_type)(void);
#endif
@ -88,7 +88,7 @@ Index: gnome-control-center-3.12.1/shell/cc-panel-loader.c
+ desktop_name = g_strconcat (all_panels[i].name,
+ ".desktop", NULL);
+ name = g_strconcat ("suse-",all_panels[i].name, NULL);
+ }
+ }
+ else
+#endif
+ {
@ -117,11 +117,11 @@ Index: gnome-control-center-3.12.1/shell/cc-panel-loader.c
GOptionGroup *group = cc_panel_get_option_group (get_type(), builder);
if (group == NULL)
continue;
Index: gnome-control-center-3.12.1/shell/cc-window.c
Index: gnome-control-center-3.13.4/shell/cc-window.c
===================================================================
--- gnome-control-center-3.12.1.orig/shell/cc-window.c
+++ gnome-control-center-3.12.1/shell/cc-window.c
@@ -139,6 +139,41 @@ get_icon_name_from_g_icon (GIcon *gicon)
--- gnome-control-center-3.13.4.orig/shell/cc-window.c
+++ gnome-control-center-3.13.4/shell/cc-window.c
@@ -140,6 +140,41 @@ get_icon_name_from_g_icon (GIcon *gicon)
return NULL;
}
@ -163,7 +163,7 @@ Index: gnome-control-center-3.12.1/shell/cc-window.c
static gboolean
activate_panel (CcWindow *self,
const gchar *id,
@@ -152,6 +187,12 @@ activate_panel (CcWindow *self
@@ -153,6 +188,12 @@ activate_panel (CcWindow *self
if (!id)
return FALSE;

View File

@ -1,3 +1,115 @@
-------------------------------------------------------------------
Fri Aug 22 08:49:24 UTC 2014 - glin@suse.com
- Enable gnome-control-center-probe-radius-server-cert.patch since
the patch in NetworkManager-gnome was rebased.
-------------------------------------------------------------------
Tue Aug 19 19:17:19 UTC 2014 - dimstar@opensuse.org
- Update to version 3.13.90:
+ Color: Do not set the 'Details' button for virtual profiles.
+ Keyboard: Suggest to automatically set reverse bindings.
+ Network:
- Make broken configuration entries red.
- Create WPA protected AP hotspot if supported.
- Fix network icon names for newer versions.
- Remove "..." from dialogue titles.
- Add DNS to the keywords.
- Fix typo in NetworkManager version checking.
+ Printers: Allow to add AppSocket/HP JetDirect and LPD printers.
+ Privacy: Add location setting.
+ Search: add support for default disabled search providers.
+ Sharing:
- Fix crash in media preferences.
- Avoid truncated folders list in media sharing.
- Make it possible to share remote folders.
+ User Accounts:
- fix response sensitivity of photo dialog.
- allow password changing if old password isn't set or empty.
- Add restart notification.
- fix enterprise toggle.
- prefill domain entry.
- Rebase gcc-private-connection.patch.
-------------------------------------------------------------------
Thu Aug 7 12:31:31 UTC 2014 - dimstar@opensuse.org
- Update to version 3.13.4:
+ Use correct window icon.
+ Background:
- Several small fixes.
- Fix emblems on HiDPI.
- Re-add drag'n'drop support.
- Allow dropping colours as well.
- Remember added colours.
- Copy all the manually added backgrounds.
+ Info: Fix logo on HiDPI.
+ Keyboard: Allow "print screen" and "scroll lock" as compose key
options.
+ Mouse: Fix scroll test background on HiDPI.
+ Notifications: Fix duplicates in application list.
+ Power: Update automatic suspend label when CanHibernate is
false.
+ Region: Make it possible to add an input source by activating
its row.
+ Sharing:
- Add maximum height for the networks list box.
- Use the selected URI from the file chooser, instead of the
current directory.
+ User Accounts: Do not generate previews for directories.
+ Wacom:
- Fix x/y ranges' swapping when calibrating on rotated screens.
- Fix stylus back/forward button assignments.
+ Updated translations.
- Add pkgconfig(cairo-gobject) BuildRequires: new dependency.
-------------------------------------------------------------------
Thu Aug 7 12:31:30 UTC 2014 - dimstar@opensuse.org
- Update to version 3.13.3:
+ Fix automake warnings.
+ Fix compilation warnings in a number of panels.
+ Update Sharing panel for gnome-settings-daemon API change.
- Changes from version 3.13.2:
+ Use new RTL icons support in GTK+.
+ Background: Use higher resolution thumbnails on HiDpi displays.
+ Color: Update the UI if the ICC profile title changes.
+ Date & Time: Fix initial state when NTP isn't supported.
+ Details: Fix crash when using vboxvideo glx driver.
+ Display:
- Make monitor label look better.
- Add "Monitor" to keywords.
- Make the Apply button unsensitive for invalid configuration.
- Fix layout when rotating the left-most of the displays.
+ Keyboard: Add shortcut to launch gnome-control-center.
+ Network:
- Fix warning on startup.
- Hide the Virtualisation bridge.
+ Notifications: Drop the dep on libgnome-menu.
+ Online Accounts: Use a header bar for the "Add Account" dialog.
+ Privacy: Fix "Immediately" option not truthful.
+ Printers: Ellipsize long names and locations.
+ Sharing: Add per-network Media, File and Screen sharing.
+ Shell: Make search results sorting smarter.
+ User Accounts:
- Fix DateTime instance leaks.
- Fix wrong language being shown.
- Add filter to the avatar file chooser.
- Changes from version 3.13.1:
+ Use header bars in dialogs.
+ Color: Do not crash when toggling devices and reopening the
panel.
+ Details: Don't crash on Wayland.
+ Keyboard: Drop hard X dependency.
+ Network: Do not pretend we can overrule hardware rfkill.
+ Updated translations.
- Drop pkgconfig(libgnome-menu-3.0) BuildRequires: no longer
required.
- Rebase gcc-private-connection.patch.
- Disable gnome-control-center-probe-radius-server-cert.patch for
now: NetworkManager must have this capability rebased first.
-------------------------------------------------------------------
Thu Aug 7 12:31:29 UTC 2014 - fcrozat@suse.com

View File

@ -27,14 +27,14 @@
%endif
Name: gnome-control-center
Version: 3.12.1
Version: 3.13.90
Release: 0
# FIXME: in 12.3 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833)
Summary: The GNOME Control Center
License: GPL-2.0+
Group: System/GUI/GNOME
Url: http://www.gnome.org
Source: http://download.gnome.org/sources/gnome-control-center/3.12/%{name}-%{version}.tar.xz
Source: http://download.gnome.org/sources/gnome-control-center/3.13/%{name}-%{version}.tar.xz
# PATCH-FEATURE-OPENSUSE gnome-control-center-allow-extra-tools-in-shell.patch fezhang@suse.com -- Add dconf-editor, pkg-prefs, gnome-tweak-tool and tracker-preferences to gnome-control-center-allow-yast-in-shell.patch so that they can launch from g-c-c shell like YaST does. Also change the patch with a more generic name.
Patch0: gnome-control-center-allow-extra-tools-in-shell.patch
# 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...
@ -52,6 +52,7 @@ BuildRequires: krb5-devel
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(accountsservice) >= 0.6.30
BuildRequires: pkgconfig(cairo-gobject)
BuildRequires: pkgconfig(cheese)
BuildRequires: pkgconfig(cheese-gtk) >= 3.3.91
BuildRequires: pkgconfig(clutter-gtk-1.0)
@ -71,14 +72,13 @@ BuildRequires: pkgconfig(goa-1.0) >= 3.9.90
BuildRequires: pkgconfig(goa-backend-1.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(grilo-0.2)
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.9.91
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.13.91
BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.11.1
BuildRequires: pkgconfig(gtk+-3.0) >= 3.13.0
%if %{with_ibus}
BuildRequires: pkgconfig(ibus-1.0) >= 1.5.2
%endif
BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libgnome-menu-3.0)
BuildRequires: pkgconfig(libgtop-2.0)
BuildRequires: pkgconfig(libnm-glib) >= 0.9.8
BuildRequires: pkgconfig(libnm-glib-vpn) >= 0.9.8