Accepting request 699584 from GNOME:Factory

replace libgnomekbd to gnomekbd-tools (forwarded request 696580 from mlin7442)

OBS-URL: https://build.opensuse.org/request/show/699584
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=177
This commit is contained in:
Dominique Leuenberger 2019-05-03 20:18:46 +00:00 committed by Git OBS Bridge
commit e9de864714
6 changed files with 181 additions and 105 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:39615b45fee4b9662f9263d70ad4ad112cf828d5041c30ee1c00ed852b0b303e
size 5889900

View File

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

View File

@ -1,7 +1,7 @@
Index: gnome-control-center-3.30.3/panels/network/cc-network-panel.c Index: gnome-control-center-3.32.0.1/panels/network/cc-network-panel.c
=================================================================== ===================================================================
--- gnome-control-center-3.30.3.orig/panels/network/cc-network-panel.c --- gnome-control-center-3.32.0.1.orig/panels/network/cc-network-panel.c
+++ gnome-control-center-3.30.3/panels/network/cc-network-panel.c +++ gnome-control-center-3.32.0.1/panels/network/cc-network-panel.c
@@ -769,10 +769,24 @@ panel_check_network_manager_version (CcN @@ -769,10 +769,24 @@ panel_check_network_manager_version (CcN
GtkWidget *label; GtkWidget *label;
gchar *markup; gchar *markup;
@ -56,10 +56,10 @@ Index: gnome-control-center-3.30.3/panels/network/cc-network-panel.c
} }
static void static void
Index: gnome-control-center-3.30.3/panels/network/cc-wifi-panel.c Index: gnome-control-center-3.32.0.1/panels/network/cc-wifi-panel.c
=================================================================== ===================================================================
--- gnome-control-center-3.30.3.orig/panels/network/cc-wifi-panel.c --- gnome-control-center-3.32.0.1.orig/panels/network/cc-wifi-panel.c
+++ gnome-control-center-3.30.3/panels/network/cc-wifi-panel.c +++ gnome-control-center-3.32.0.1/panels/network/cc-wifi-panel.c
@@ -183,21 +183,41 @@ static void @@ -183,21 +183,41 @@ static void
check_main_stack_page (CcWifiPanel *self) check_main_stack_page (CcWifiPanel *self)
{ {
@ -103,11 +103,11 @@ Index: gnome-control-center-3.30.3/panels/network/cc-wifi-panel.c
} }
static void static void
Index: gnome-control-center-3.30.3/panels/network/cc-wifi-panel.ui Index: gnome-control-center-3.32.0.1/panels/network/cc-wifi-panel.ui
=================================================================== ===================================================================
--- gnome-control-center-3.30.3.orig/panels/network/cc-wifi-panel.ui --- gnome-control-center-3.32.0.1.orig/panels/network/cc-wifi-panel.ui
+++ gnome-control-center-3.30.3/panels/network/cc-wifi-panel.ui +++ gnome-control-center-3.32.0.1/panels/network/cc-wifi-panel.ui
@@ -331,6 +331,48 @@ @@ -315,6 +315,48 @@
<property name="name">nm-not-running</property> <property name="name">nm-not-running</property>
</packing> </packing>
</child> </child>
@ -156,3 +156,19 @@ Index: gnome-control-center-3.30.3/panels/network/cc-wifi-panel.ui
</object> </object>
</child> </child>
Index: gnome-control-center-3.32.0.1/tests/meson.build
===================================================================
--- gnome-control-center-3.32.0.1.orig/tests/meson.build
+++ gnome-control-center-3.32.0.1/tests/meson.build
@@ -1,8 +1,11 @@
subdir('common')
subdir('datetime')
+# Disable tests for network panel, boo#1128195
+if false
if host_is_linux
subdir('network')
endif
+endif
subdir('interactive-panels')

View File

@ -1,83 +0,0 @@
From 26287234bd9152fbe95baa82b9d55b8064d789c2 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Wed, 13 Mar 2019 15:49:33 +0100
Subject: [PATCH] info: Fix crashes when retrieving disk size
Info panel crashes has been fixed by !387 on master branch, however,
gnome-3-30 is still affected as the same fix can't be used there, because
its complexity and changed dependencies. The panel crashes because
GUnixMountPoint is by mistake used as GUnixMountEntry. Let's find
and use corresponing GUnixMountEntry to simply fix those crashes for
gnome-3-30.
Closes: #411
---
panels/info/cc-info-overview-panel.c | 33 +++++++++++++++++++++++-----
1 file changed, 28 insertions(+), 5 deletions(-)
diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c
index 7758271b1..fa9510b06 100644
--- a/panels/info/cc-info-overview-panel.c
+++ b/panels/info/cc-info-overview-panel.c
@@ -546,10 +546,30 @@ get_primary_disc_info_start (CcInfoOverviewPanel *self)
self);
}
+static GList *
+convert_points_to_entries (GList *points)
+{
+ GList *entries = NULL;
+ GList *p;
+
+ for (p = points; p != NULL; p = p->next)
+ {
+ GUnixMountPoint *point = p->data;
+ GUnixMountEntry *mount;
+ const gchar *mount_path = g_unix_mount_point_get_mount_path (point);
+
+ mount = g_unix_mount_at (mount_path, NULL);
+ if (mount)
+ entries = g_list_append (entries, mount);
+ }
+
+ return entries;
+}
+
static void
get_primary_disc_info (CcInfoOverviewPanel *self)
{
- GList *points;
+ GList *points, *entries = NULL;
GList *p;
GHashTable *hash;
CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self);
@@ -557,11 +577,14 @@ get_primary_disc_info (CcInfoOverviewPanel *self)
hash = g_hash_table_new (g_str_hash, g_str_equal);
points = g_unix_mount_points_get (NULL);
+ entries = convert_points_to_entries (points);
+ g_list_free_full (points, (GDestroyNotify) g_unix_mount_point_free);
+
/* If we do not have /etc/fstab around, try /etc/mtab */
- if (points == NULL)
- points = g_unix_mounts_get (NULL);
+ if (entries == NULL)
+ entries = g_unix_mounts_get (NULL);
- for (p = points; p != NULL; p = p->next)
+ for (p = entries; p != NULL; p = p->next)
{
GUnixMountEntry *mount = p->data;
const char *mount_path;
@@ -586,7 +609,7 @@ get_primary_disc_info (CcInfoOverviewPanel *self)
priv->primary_mounts = g_list_prepend (priv->primary_mounts, mount);
g_hash_table_insert (hash, (gpointer) device_path, (gpointer) device_path);
}
- g_list_free (points);
+ g_list_free (entries);
g_hash_table_destroy (hash);
priv->cancellable = g_cancellable_new ();
--
2.18.1

View File

@ -1,9 +1,53 @@
-------------------------------------------------------------------
Mon Apr 22 07:49:48 UTC 2019 - Max Lin <mlin@suse.com>
- Since libgomekbd has followed SLPP standard, replaced requires
libgnomekbd to gnomekbd-tools.
-------------------------------------------------------------------
Mon Apr 1 08:56:29 UTC 2019 - Jonathan Kang <sckang@suse.com>
- Modified gnome-control-center-disable-error-message-for-NM.patch:
Disable tests for network panel.
-------------------------------------------------------------------
Fri Mar 29 15:20:33 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 3.32.1:
+ Add shadows to application icons.
+ Applications: Fix wrong IDs being passed to portal permission
store.
+ Display: Various bugfixes to multimonitor setups.
+ Mouse & Touchpad: Sync touchpad scrolling switch states
correctly.
+ Network: Only show Bluetooth devices in Bluetooth section.
+ Online Accounts: Fix invisible widgets.
+ Wi-Fi: Fix connection names with markup not showing up.
+ Updated translations.
-------------------------------------------------------------------
Fri Mar 22 17:56:33 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Refresh patches with refresh_service osc service.
- Disable meson_test as
gnome-control-center-disable-error-message-for-NM.patch breaks
the tests.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 19 02:20:35 UTC 2019 - sckang@suse.com Tue Mar 19 02:20:35 UTC 2019 - sckang@suse.com
- Rebase gnome-control-center-disable-error-message-for-NM.patch - Rebase gnome-control-center-disable-error-message-for-NM.patch
(bsc#1128195). (bsc#1128195).
-------------------------------------------------------------------
Mon Mar 18 09:56:32 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 3.32.0.1:
+ Emergency release with a fix for broken translations and the
Display panel.
- Drop gnome-control-center-fix-crash-retrive-disksize.patch: Fixed
upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 18 09:55:17 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com> Mon Mar 18 09:55:17 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
@ -12,6 +56,26 @@ Mon Mar 18 09:55:17 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
branch, to be dropped when switching to 3.32 branch as the issue branch, to be dropped when switching to 3.32 branch as the issue
is fixed in a different way there. is fixed in a different way there.
-------------------------------------------------------------------
Mon Mar 11 15:39:41 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 3.32.0:
+ Updated translations.
-------------------------------------------------------------------
Tue Mar 5 06:10:42 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 3.31.92:
+ Revert making Settings responsive; it needs more polish to
reach the quality we want.
+ User Accounts:
- Improve behavior when dealing with very long names.
- Fix crashes.
- Remove custom file size limit for avatars.
- Allow bigger custom avatars.
+ Updated translations.
- Add pkgconfig(udisks2) BuildRequires: New dependency.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 27 02:50:29 UTC 2019 - sckang@suse.com Wed Feb 27 02:50:29 UTC 2019 - sckang@suse.com
@ -19,6 +83,81 @@ Wed Feb 27 02:50:29 UTC 2019 - sckang@suse.com
network: disable the "Apply" button until a change has been made network: disable the "Apply" button until a change has been made
(glgo#GNOME/gnome-control-center!402 bsc#1040054). (glgo#GNOME/gnome-control-center!402 bsc#1040054).
-------------------------------------------------------------------
Thu Feb 21 11:19:56 UTC 2019 - bjorn.lie@gmail.com
- Update to version 3.31.90:
+ Make Settings and various panels responsive.
+ Various accessibility fixes.
+ Printers: Various cleanups.
+ Region and Language: Make rows reordetable with drag and drop.
+ Sound: Redesign the Sound panel.
+ User Accounts:
- Allow Remove User button to be focused.
- Round user images.
+ Updated translations.
- Add pkgconfig(gsound) BuildRequires: New dependency.
-------------------------------------------------------------------
Sat Feb 9 03:31:04 UTC 2019 - bjorn.lie@gmail.com
- Update to version 3.31.4:
+ Introduce the new Applications panel.
+ Panels can now expose a custom sidebar widget.
+ Improve CI image building scripts.
+ Applications: Introduce the new Applications panel.
+ Bluetooth: Cleanup and reorganize code.
+ Display: Add Night Light slider to set temperature.
+ Network:
- Allow Wi-Fi panel to reach narrower sizes.
- Cleanups and smaller performance improvement preparations.
+ Notifications: Use libhandy's HdyColumn.
+ Online Accounts: Use libhandy's HdyColumn.
+ Power: Label PENDING_CHARGE state as "Not Charging".
+ Printers: Cleanups and memory leaks plugs.
+ Privacy: Use libhandy's HdyColumn.
+ Thunderbolt: Fix double-free.
+ User Accounts: Rename classes.
+ Wacom: Map Wacom-driver-specific generic IDs to 0.
+ Updated translations.
- Add pkgconfig(libhandy-0.0) BuildRequires: New optional
dependency. This is needed to access widgets to make the shell
adaptive.
- Add bolt Recommends: Needed for the thunderbolt panel.
-------------------------------------------------------------------
Sat Feb 9 03:31:02 UTC 2019 - bjorn.lie@gmail.com
- Update to version 3.31.2:
+ Use X-GNOME-UsesNotifications on various desktop files.
+ Introduce new icon.
+ Add interative test panels.
+ Date & Time: Grey out automatic timezone.
+ Display:
- Correctly add minor axis to snapping.
- Correctly snap on various situations.
+ Network: Cleanup many classes.
+ Online Accounts: Track lifecycle of CcGoaPanel across async
calls.
+ Privacy: Use templates.
+ Region and Language:
- Use a popover instead of a dialog for input options.
- Redesign language chooser widget.
- Plug various leaks.
- Major cleanups.
+ Sharing: Bind hostname entry.
+ User Accounts:
- Use templates.
- Do not crash when libpwquality fails.
+ Wacom:
- Port calibrator UI to GTK.
- Remove clutter-gtk dependency.
+ Updated translations.
- Add python3-dbusmock and python3-pytest-xvfb BuildRequires:
Needed to run tests during build.
- Drop explicit pkgconfig(clutter-gtk-1.0) BuildRequires: Only
needed for cheese, and that should pull it in on it's own.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 8 07:57:07 UTC 2019 - bjorn.lie@gmail.com Fri Feb 8 07:57:07 UTC 2019 - bjorn.lie@gmail.com
@ -2229,7 +2368,7 @@ Fri Sep 27 15:02:06 UTC 2013 - idonmez@suse.com
- Introduce with_wacom defines, set to 0 on s390{x}, otherwise 1: - Introduce with_wacom defines, set to 0 on s390{x}, otherwise 1:
+ Disable wacom support on s390{x}, those machines have no + Disable wacom support on s390{x}, those machines have no
viable input ports. viable input ports.
+ Have pkgconfig(libwacom) BuildRequries depend on with_wacom. + Have pkgconfig(libwacom) BuildRequires depend on with_wacom.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 24 13:42:05 UTC 2013 - dimstar@opensuse.org Tue Sep 24 13:42:05 UTC 2013 - dimstar@opensuse.org

View File

@ -26,13 +26,13 @@
%endif %endif
Name: gnome-control-center Name: gnome-control-center
Version: 3.30.3 Version: 3.32.1
Release: 0 Release: 0
Summary: The GNOME Control Center Summary: The GNOME Control Center
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/GUI/GNOME Group: System/GUI/GNOME
URL: https://www.gnome.org URL: https://www.gnome.org
Source: http://download.gnome.org/sources/gnome-control-center/3.30/%{name}-%{version}.tar.xz Source0: https://download.gnome.org/sources/gnome-control-center/3.32/%{name}-%{version}.tar.xz
# PATCH-NEEDS-OPENSUSE gnome-control-center-disable-error-message-for-NM.patch bsc#989801 sckang@suse.com -- network: Improve the check for whether NM or wicked is running # PATCH-NEEDS-OPENSUSE gnome-control-center-disable-error-message-for-NM.patch bsc#989801 sckang@suse.com -- network: Improve the check for whether NM or wicked is running
Patch0: gnome-control-center-disable-error-message-for-NM.patch Patch0: gnome-control-center-disable-error-message-for-NM.patch
@ -40,8 +40,6 @@ Patch0: gnome-control-center-disable-error-message-for-NM.patch
Patch1: control-center-network-add-domain-suffix-match.patch Patch1: control-center-network-add-domain-suffix-match.patch
# PATCH-FIX-UPSTREAM control-center-network-fix-ce-apply-button.patch glgo#GNOME/gnome-control-center!402 bsc#1040054 sckang@suse.com -- network: disable the "Apply" button until a change has been made # PATCH-FIX-UPSTREAM control-center-network-fix-ce-apply-button.patch glgo#GNOME/gnome-control-center!402 bsc#1040054 sckang@suse.com -- network: disable the "Apply" button until a change has been made
Patch2: control-center-network-fix-ce-apply-button.patch Patch2: control-center-network-fix-ce-apply-button.patch
# PATCH-FIX-UPSTREAM gnome-control-center-fix-crash-retrive-disksize.patch -- info: Fix crashes when retrieving disk size
Patch3: gnome-control-center-fix-crash-retrive-disksize.patch
### patches for Leap >= 15 plus SLE >= 15, but not TW ### patches for Leap >= 15 plus SLE >= 15, but not TW
# PATCH-FEATURE-SLE 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-FEATURE-SLE 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.
@ -58,13 +56,14 @@ BuildRequires: intltool
BuildRequires: krb5-devel BuildRequires: krb5-devel
BuildRequires: meson BuildRequires: meson
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python3-dbusmock
BuildRequires: python3-pytest-xvfb
BuildRequires: translation-update-upstream BuildRequires: translation-update-upstream
BuildRequires: xsltproc BuildRequires: xsltproc
BuildRequires: pkgconfig(accountsservice) >= 0.6.39 BuildRequires: pkgconfig(accountsservice) >= 0.6.39
BuildRequires: pkgconfig(cairo-gobject) BuildRequires: pkgconfig(cairo-gobject)
BuildRequires: pkgconfig(cheese) >= 3.28.0 BuildRequires: pkgconfig(cheese) >= 3.28.0
BuildRequires: pkgconfig(cheese-gtk) >= 3.5.91 BuildRequires: pkgconfig(cheese-gtk) >= 3.5.91
BuildRequires: pkgconfig(clutter-gtk-1.0)
BuildRequires: pkgconfig(colord) >= 0.1.34 BuildRequires: pkgconfig(colord) >= 0.1.34
BuildRequires: pkgconfig(colord-gtk) >= 0.1.24 BuildRequires: pkgconfig(colord-gtk) >= 0.1.24
BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(fontconfig)
@ -82,12 +81,14 @@ BuildRequires: pkgconfig(goa-backend-1.0)
BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(grilo-0.3) >= 0.3.0 BuildRequires: pkgconfig(grilo-0.3) >= 0.3.0
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.27.2 BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.31.0
BuildRequires: pkgconfig(gsound)
BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gthread-2.0)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.20 BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.20
BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libgtop-2.0) BuildRequires: pkgconfig(libgtop-2.0)
BuildRequires: pkgconfig(libhandy-0.0) >= 0.0.9
BuildRequires: pkgconfig(libnm) >= 1.10.0 BuildRequires: pkgconfig(libnm) >= 1.10.0
BuildRequires: pkgconfig(libnma) >= 1.8.0 BuildRequires: pkgconfig(libnma) >= 1.8.0
BuildRequires: pkgconfig(libpulse) >= 2.0 BuildRequires: pkgconfig(libpulse) >= 2.0
@ -99,6 +100,7 @@ BuildRequires: pkgconfig(mm-glib) >= 0.7
BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103 BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103
BuildRequires: pkgconfig(pwquality) >= 1.2.2 BuildRequires: pkgconfig(pwquality) >= 1.2.2
BuildRequires: pkgconfig(smbclient) BuildRequires: pkgconfig(smbclient)
BuildRequires: pkgconfig(udisks2)
BuildRequires: pkgconfig(upower-glib) >= 0.99.6 BuildRequires: pkgconfig(upower-glib) >= 0.99.6
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xcursor)
@ -110,7 +112,10 @@ Requires: gnome-themes-accessibility
Requires: gnome-version Requires: gnome-version
Requires: iso-codes Requires: iso-codes
# Needed for showing keyboard layout, boo#898096 # Needed for showing keyboard layout, boo#898096
Requires: libgnomekbd # Require the package providing /usr/bin/gkbd-keyboard-display
Requires: gnomekbd-tools
# For the thunderbolt panel
Recommends: bolt
Recommends: %{name}-lang Recommends: %{name}-lang
Recommends: %{name}-user-faces Recommends: %{name}-user-faces
# cups-pk-helper should only be recommended, rather than a hard Requires, see boo#904047 # cups-pk-helper should only be recommended, rather than a hard Requires, see boo#904047
@ -193,7 +198,6 @@ GNOME control center.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
translation-update-upstream po gnome-control-center-2.0 translation-update-upstream po gnome-control-center-2.0
# patches for Leap >= 15 plus SLE >= 15, but not TW # patches for Leap >= 15 plus SLE >= 15, but not TW