Accepting request 481377 from GNOME:Factory

Update to 3.24.0 (forwarded request 481313 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/481377
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=151
This commit is contained in:
Dominique Leuenberger 2017-03-22 22:07:10 +00:00 committed by Git OBS Bridge
commit 39a43d4818
5 changed files with 63 additions and 76 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5d69295bc43176392d65b3bdbe60eb85cdcac95b1ef76b86933f3ba9cf48091a
size 7206136

View File

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

View File

@ -1,66 +0,0 @@
From 8da6fa28e1c5e6eab551585ecdbd914b08936d5e Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Fri, 23 Sep 2016 13:36:20 +0200
Subject: display: Fix possible crash on startup
If no items are added to the GVariantBuilder, g_variant_builder_close()
would throw a critical, g_variant_builder_end() would throw a
segmentation fault.
As this can only happen when there are no items added to the output_ids
hashtable, this should only happen if there are no displays known to
libgnome-desktop (and therefore mutter).
See https://bugzilla.redhat.com/show_bug.cgi?id=1280075
https://bugzilla.gnome.org/show_bug.cgi?id=771875
---
panels/display/cc-display-panel.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c
index 72720fa..5edec89 100644
--- a/panels/display/cc-display-panel.c
+++ b/panels/display/cc-display-panel.c
@@ -123,12 +123,12 @@ monitor_labeler_show (CcDisplayPanel *self)
GnomeRROutput *output;
GVariantBuilder builder;
gint number;
+ gboolean has_outputs;
if (!priv->shell_proxy)
return;
- g_variant_builder_init (&builder, G_VARIANT_TYPE_TUPLE);
- g_variant_builder_open (&builder, G_VARIANT_TYPE_ARRAY);
+ has_outputs = FALSE;
infos = gnome_rr_config_get_outputs (priv->current_configuration);
for (info = infos; *info; info++)
@@ -137,6 +137,13 @@ monitor_labeler_show (CcDisplayPanel *self)
if (number == 0)
continue;
+ if (!has_outputs)
+ {
+ g_variant_builder_init (&builder, G_VARIANT_TYPE_TUPLE);
+ g_variant_builder_open (&builder, G_VARIANT_TYPE_ARRAY);
+ has_outputs = TRUE;
+ }
+
output = gnome_rr_screen_get_output_by_name (priv->screen,
gnome_rr_output_info_get_name (*info));
g_variant_builder_add (&builder, "{uv}",
@@ -144,6 +151,9 @@ monitor_labeler_show (CcDisplayPanel *self)
g_variant_new_int32 (number));
}
+ if (!has_outputs)
+ return;
+
g_variant_builder_close (&builder);
g_dbus_proxy_call (priv->shell_proxy,
--
cgit v0.12

View File

@ -1,3 +1,59 @@
-------------------------------------------------------------------
Mon Mar 20 13:08:28 UTC 2017 - dimstar@opensuse.org
- Update to version 3.24.0:
+ Updated translations.
-------------------------------------------------------------------
Wed Mar 15 13:07:29 UTC 2017 - zaitor@opensuse.org
- Update to version 3.23.92:
+ Universal Access: Add cursor size configuration.
+ Network:
- Fix SSID not changing when enabling hotspot.
- Fix initial state of Wi-Fi device when using hotspot.
+ Notifications: Forward notification settings to portal.
+ Printers:
- Improve panel layout.
- Allow printer model label to ellipsize.
- Don't block on the network in the jobs dialogue.
+ Updated translations.
-------------------------------------------------------------------
Wed Mar 1 11:19:19 UTC 2017 - zaitor@opensuse.org
- Update to version 3.23.91:
+ Display:
- Bump dependencies for Night Light schemas.
- Really fix typo in "Tomorrow".
- Tweak night light dialog UI to match latest mockups.
+ Online Accounts: New panel design.
+ Printers:
- Make the printer address always sensitive.
- Do not apply rename/location changes in focus-out-event.
- Don't block when renaming printers.
- Ellipsize the "Details Dialog" title and the "location" in
the printer entry.
- Tweak the printer supply level bar.
- Subscribe to jobs notifications.
- Count only current user's jobs.
+ Privacy: Set destructive-action for confirmation buttons only.
+ User Accounts: Fix crash when name is changed and dialogue
closed.
+ Updated translations.
-------------------------------------------------------------------
Wed Feb 15 09:27:42 UTC 2017 - dimstar@opensuse.org
- Update to version 3.23.90:
+ New Printers, User Accounts and Online Accounts designs.
+ Keyboard shortcuts bug fixes.
+ Add "Night Light" functionality to Display settings.
+ Add Wayland support to Wacom settings, and update design.
- Drop
gnome-control-center-display-fix-possible-crash-on-startup.patch:
fixed upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 11 14:49:53 UTC 2016 - zaitor@opensuse.org Tue Oct 11 14:49:53 UTC 2016 - zaitor@opensuse.org

View File

@ -1,7 +1,7 @@
# #
# spec file for package gnome-control-center # spec file for package gnome-control-center
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -29,13 +29,13 @@
%define with_cacert_patch 0 %define with_cacert_patch 0
Name: gnome-control-center Name: gnome-control-center
Version: 3.22.1 Version: 3.24.0
Release: 0 Release: 0
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.22/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/gnome-control-center/3.24/%{name}-%{version}.tar.xz
# PATCH-FEATURE-OPENSUSE gnome-control-center-allow-extra-tools-in-shell.patch fezhang@suse.com -- Add dconf-editor, gnome-tweak-tool, pkg-prefs, itweb-settings, tracker-preferences and Yast to g-c-c. # PATCH-FEATURE-OPENSUSE gnome-control-center-allow-extra-tools-in-shell.patch fezhang@suse.com -- Add dconf-editor, gnome-tweak-tool, pkg-prefs, itweb-settings, tracker-preferences and Yast to g-c-c.
Patch0: gnome-control-center-allow-extra-tools-in-shell.patch Patch0: gnome-control-center-allow-extra-tools-in-shell.patch
# PATCH-FEATURE-SLE gnome-control-center-add-alacarte-for-sle.patch badshah400@gmail.com -- Add back alacarte for SLE since they require it for their classic mode, on the other hand for TW and other openSUSE versions it should be enough that alacarte is still available from shell overview, just not in the g-c-c shell. This patch must be applied only if required and then immediately after gnome-control-center-allow-extra-tools-in-shell.patch # PATCH-FEATURE-SLE gnome-control-center-add-alacarte-for-sle.patch badshah400@gmail.com -- Add back alacarte for SLE since they require it for their classic mode, on the other hand for TW and other openSUSE versions it should be enough that alacarte is still available from shell overview, just not in the g-c-c shell. This patch must be applied only if required and then immediately after gnome-control-center-allow-extra-tools-in-shell.patch
@ -50,8 +50,6 @@ Patch18: gnome-control-center-890979-change-remote-passwd.patch
Patch20: gnome-control-center-disable-error-message-for-NM.patch Patch20: gnome-control-center-disable-error-message-for-NM.patch
# PATCH-FIX-OPENSUSE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer. # PATCH-FIX-OPENSUSE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer.
Patch21: gnome-control-center-info-never-use-gnome-software.patch Patch21: gnome-control-center-info-never-use-gnome-software.patch
# PATCH-FIX-UPSTREAM gnome-control-center-display-fix-possible-crash-on-startup.patch bgo#771875 zaitor@opensuse.org -- Display: Fix possible crash on startup
Patch23: gnome-control-center-display-fix-possible-crash-on-startup.patch
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: fdupes BuildRequires: fdupes
@ -79,7 +77,7 @@ BuildRequires: pkgconfig(gmodule-2.0)
BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.18.2 BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.18.2
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.19.93 BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.19.93
BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.19.1 BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.19.1
BuildRequires: pkgconfig(goa-1.0) >= 3.15.1 BuildRequires: pkgconfig(goa-1.0) >= 3.21.5
BuildRequires: pkgconfig(goa-backend-1.0) BuildRequires: pkgconfig(goa-backend-1.0)
BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(grilo-0.3) BuildRequires: pkgconfig(grilo-0.3)
@ -217,7 +215,6 @@ translation-update-upstream
%if 0%{?suse_version} == 1315 %if 0%{?suse_version} == 1315
%patch21 -p1 %patch21 -p1
%endif %endif
%patch23 -p1
%build %build
ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh