Hello community,

here is the log from the commit of package gnome-control-center for 
openSUSE:Leap:15.2 checked in at 2020-01-30 14:50:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/gnome-control-center (Old)
 and      /work/SRC/openSUSE:Leap:15.2/.gnome-control-center.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gnome-control-center"

Thu Jan 30 14:50:13 2020 rev:51 rq:758549 version:3.34.2

Changes:
--------
--- 
/work/SRC/openSUSE:Leap:15.2/gnome-control-center/gnome-control-center.changes  
    2020-01-15 15:04:31.865876016 +0100
+++ 
/work/SRC/openSUSE:Leap:15.2/.gnome-control-center.new.26092/gnome-control-center.changes
   2020-01-30 14:51:16.862930565 +0100
@@ -1,0 +2,166 @@
+Thu Dec 12 02:25:20 UTC 2019 - Xiaoguang Wang <xw...@suse.com>
+
+- Add gnome-control-center-Initialize-GError-to-NULL-before-use.patch:
+  backport upstream commit 54caab7b, initialize GError* to NULL
+  before use, fix g-c-c crash.
+
+-------------------------------------------------------------------
+Fri Dec  6 09:21:09 UTC 2019 - QK ZHU <qk...@suse.com>
+
+- Rebase gnome-control-center-more-power-button-actions.patch for 3.34:
+  Rename 'Shutdown' to 'Force Off' and adjust the order by severity
+  (bsc#1091796, bsc#1158476).
+
+-------------------------------------------------------------------
+Thu Dec  5 01:45:59 UTC 2019 - Xiaoguang Wang <xw...@suse.com>
+
+- Add gnome-control-center-can-not-find-usermod.patch:
+  g-c-c use command usermod to verify user is valid, usermod is in
+  /usr/sbin, environment PATH doesn't include this path, so g-c-c
+  can't find this command. Upstream commit c6be204
+  (bsc#1158341 glgo#GNOME/gnome-control-center!653).
+
+-------------------------------------------------------------------
+Mon Nov 25 15:22:25 UTC 2019 - Bjørn Lie <bjorn....@gmail.com>
+
+- Update to version 3.34.2:
+  + Applications: Fix a memory leak.
+  + Background: Fix crash if a BgRecentSource is unreffed during an
+    async operation.
+  + Display: Use correct mode for supported scale checking.
+  + Printer: Provide a scheme to address parser.
+  + User Accounts: Fix password dialog crashes and hangs.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Tue Nov 19 08:19:16 UTC 2019 - Alynx Zhou <alynx.z...@suse.com>
+
+- Drop patches fixed upstream:
+  + control-center-fix-crash-due-to-object-name-clashes.patch
+  + control-center-fix-crash-opening-hidden-network.patch
+  + control-center-sharing-fix-margin-issue.patch
+  + gnome-control-center-fix-users-crash.patch
+  + gnome-control-center-periodic-wifi-scan.patch
+  + gnome-control-center-users-empty-state.patch
+
+-------------------------------------------------------------------
+Fri Nov 15 04:40:33 UTC 2019 - Alynx Zhou <alynx.z...@suse.com>
+
+- Rebase gnome-control-center-bring-back-firewall-zone.patch
+
+-------------------------------------------------------------------
+Thu Nov 14 08:15:55 UTC 2019 - Yifan Jiang <yfji...@suse.com>
+
+- BuildRequires /usr/bin/Xvfb instead of the xorg-x11-server-Xvfb
+  package. This is for the compatibility with older X packages where
+  Xvfb is not splitted.
+
+-------------------------------------------------------------------
+Sat Oct  5 14:34:11 UTC 2019 - Bjørn Lie <bjorn....@gmail.com>
+
+- Update to version 3.34.1:
+  + Background:
+    - Allow load background file relative to XML file.
+    - Update clock in both preview modes.
+  + Date & Time: Allow changing the timezone when auto-update is
+    prohibited.
+  + Network:
+    - Disable the "Apply" button until a change has been made.
+    - Fix Add Connection dialog.
+    - Accept empty values for the cloned mac address.
+  + Online Accounts: Fix a crash.
+  + Printers:
+    - Give printer name fewer characters in width.
+    - Check whether URI is valid while searching for printers.
+  + Region & Language: Fix crash in keyboard layout population.
+  + Search: Fix crash on clicking 'Search Locations'.
+  + Sharing: Set new shared folder visible as soon as it gets
+    added.
+  + Sound: Remove leftover canberra-gtk header inclusion.
+  + Updated translations.
+- Drop patches fixed upstream:
+  + gnome-control-center-Remove-leftover-canberra-gtk.patch.
+  + control-center-network-fix-ce-apply-button.patch.
+
+-------------------------------------------------------------------
+Sat Sep 21 09:38:32 UTC 2019 - Bjørn Lie <bjorn....@gmail.com>
+
+- Add gnome-control-center-Remove-leftover-canberra-gtk.patch:
+  sound: Remove leftover canberra-gtk header inclusion. Following
+  this, drop pkgconfig(libcanberra-gtk3) BuildRequires: No longer
+  needed, nor used.
+- Add explicit xorg-x11-server-Xvfb BuildRequires: Previously
+  pulled in by libcanberra-gtk3. Needed for tests to succeed.
+
+-------------------------------------------------------------------
+Mon Sep  9 14:46:21 CDT 2019 - mgo...@suse.com
+
+- Update to version 3.34.0.1:
+  + Sound: fix sliders not behaving properly.
+  + Changes in version 3.34.0:
+  + Updated translations.
+
+-------------------------------------------------------------------
+Wed Sep  4 15:28:03 NZST 2019 - l...@ljones.dev
+
+- Update to version 3.33.90:
+  + Background: Clarify remove background button.
+  + Display: Various bugfixes.
+  + Search:
+    - Introduce Drag n' Drop
+    - Visual polishment.
+  + Updated translations.
+- Changes from version 3.33.3:
+  + Various minor improvements from the Every Detail Matters
+    session.
+  + Add shadows to application icons
+  + Documented Communication Guidelines
+  + Development builds with Flatpak working again
+  + Background: Redesigned panel.
+  + Display: Move Night Light to a tab, instead of a dialog.
+  + Keyboard Shortcuts:
+    - Panel renamed from "Keyboard".
+    - Minor UI adjustments.
+  + Mouse & Touchpad: Reinstate keyboard navitation.
+  + Power: Don't treat all batteries as laptop batteries.
+  + Sharing: Use a HdyLeaflet.
+  + User Accounts: Present the default avatar in the avatar
+    popover.
+  + Wacom: Ensure calibrator UI CSS only applies to its UI.
+  + Updated translations.
+- Remove control-center-fix-mtu-label.patch
+- Remove control-center-network-add-domain-suffix-match.patch
+- Remove gnome-control-center-disable-error-message-for-NM.patch
+
+-------------------------------------------------------------------
+Fri Aug 02 19:21:27 UTC 2019 - bjorn....@gmail.com
+
+- Update to version 3.32.2+9:
+  + display:
+    - Add guards for NULL display configuration.
+    - Add failure returns into CcDisplayConfig.
+  + universal-access:
+    - Don't use widget names for GSettings keys.
+    - Fix leaks checking settings.
+    - Fix duplicate settings call.
+  + Updated translations.
+- Switch to git checkout via source service, upstream is lacking in
+  stable releases. In the future we will use a stable tag when
+  possible, but when upstream slacks off, we will use a checkout of
+  the stable branch.
+
+-------------------------------------------------------------------
+Fri May 24 23:40:28 UTC 2019 - Bjørn Lie <bjorn....@gmail.com>
+
+- Update to version 3.32.2:
+  + Applications: Use larger icons.
+  + Display:
+    - Set Night Light screen temperature strings as translatable.
+    - Fix crash if a monitor has no preferred mode.
+  + Mouse & Touchpad: Reinstate keyboard navigation in the panel.
+  + Power: Correct the value of 90 minutes to 5400.
+  + Region & Language: Fix input source options not being applied.
+  + Sound: Clean up labels of devices without origin.
+  + Updated translations.
+
+-------------------------------------------------------------------
@@ -9 +175 @@
-Thu May 16 09:40:46 UTC 2019 - Jonathan Kang <sck...@suse.com>
+Thu May 16 08:57:24 UTC 2019 - Jonathan Kang <sck...@suse.com>
@@ -17,0 +184,85 @@
+Thu May  9 06:52:13 UTC 2019 - Jonathan Kang <sck...@suse.com>
+
+- Modified gnome-control-center-disable-error-message-for-NM.patch:
+  Only prompt users to use Yast to configure network when
+  NetworkManager is not running (boo#1134381).
+
+-------------------------------------------------------------------
+Mon Apr 22 07:49:48 UTC 2019 - Max Lin <m...@suse.com>
+
+- Since libgomekbd has followed SLPP standard, replaced requires
+  libgnomekbd to gnomekbd-tools.
+
+-------------------------------------------------------------------
+Mon Apr  1 08:56:29 UTC 2019 - Jonathan Kang <sck...@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....@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
++++ 423 more lines (skipped)
++++ between 
/work/SRC/openSUSE:Leap:15.2/gnome-control-center/gnome-control-center.changes
++++ and 
/work/SRC/openSUSE:Leap:15.2/.gnome-control-center.new.26092/gnome-control-center.changes

Old:
----
  control-center-fix-crash-due-to-object-name-clashes.patch
  control-center-fix-crash-opening-hidden-network.patch
  control-center-fix-mtu-label.patch
  control-center-ignore-unmanaged-wifi-devices.patch
  control-center-network-add-domain-suffix-match.patch
  control-center-network-fix-ce-apply-button.patch
  control-center-sharing-fix-margin-issue.patch
  gnome-control-center-3.26.2.tar.xz
  gnome-control-center-disable-error-message-for-NM.patch
  gnome-control-center-fix-users-crash.patch
  gnome-control-center-follow-polkit-permissions-for-tz.patch
  gnome-control-center-periodic-wifi-scan.patch
  gnome-control-center-remove-implicit-language-setting.patch
  gnome-control-center-users-empty-state.patch

New:
----
  _service
  gnome-control-center-3.34.2.obscpio
  gnome-control-center-Initialize-GError-to-NULL-before-use.patch
  gnome-control-center-can-not-find-usermod.patch
  gnome-control-center.obsinfo

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-control-center.spec ++++++
--- /var/tmp/diff_new_pack.8BBlmC/_old  2020-01-30 14:51:17.526930919 +0100
+++ /var/tmp/diff_new_pack.8BBlmC/_new  2020-01-30 14:51:17.530930921 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-control-center
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,120 +12,93 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 # Allow to enable/disable ibus, as GNOME is rather strict on new versions.
-%define with_ibus 1
-
+%bcond_without  ibus
 # Wacom input support
 %ifarch s390 s390x
-%define with_wacom 0
+%bcond_with     wacom
 %else
-%define with_wacom 1
+%bcond_without  wacom
 %endif
 
 Name:           gnome-control-center
-Version:        3.26.2
+Version:        3.34.2
 Release:        0
 Summary:        The GNOME Control Center
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/GUI/GNOME
-Url:            http://www.gnome.org
-Source:         
http://download.gnome.org/sources/gnome-control-center/3.26/%{name}-%{version}.tar.xz
-
-# PATCH-FEATURE-OPENSUSE 
gnome-control-center-follow-polkit-permissions-for-tz.patch boo#904058 
badshah...@gmail.com -- Follow polkit permissions for allowing/locking timezone 
setting changes
-Patch1:         gnome-control-center-follow-polkit-permissions-for-tz.patch
-# PATCH-FIX-OPENSUSE gnome-control-center-disable-error-message-for-NM.patch 
bsc#989801 sck...@suse.com -- network: Improve the check for whether NM or 
wicked is running was:PATCH-FIX-OPENSUSE
-Patch2:         gnome-control-center-disable-error-message-for-NM.patch
-# PATCH-FIX-UPSTREAM control-center-network-add-domain-suffix-match.patch 
bgo#787882 bsc#1047509 sck...@suse.com -- wifi: Add domain-suffix-match entry
-Patch3:         control-center-network-add-domain-suffix-match.patch
-# PATCH-FIX-UPSTREAM gnome-control-center-users-empty-state.patch bsc#1087583 
mgo...@suse.com -- add an empty state to the user accounts panel.
-Patch4:         gnome-control-center-users-empty-state.patch
-# PATCH-FIX-UPSTREAM gnome-control-center-fix-users-crash.patch bsc#1087583 
mgo...@suse.com -- fix crash opening users when run as root.
-Patch5:         gnome-control-center-fix-users-crash.patch
-# PATCH-FIX-UPSTREAM control-center-fix-crash-due-to-object-name-clashes.patch 
bsc#1083668 bgo#785099 sck...@suse.com -- network: Fix crash due to object name 
clashes in NM and g-c-c
-Patch6:         control-center-fix-crash-due-to-object-name-clashes.patch
-# PATCH-FIX-UPSTREAM control-center-fix-crash-opening-hidden-network.patch 
bsc#1083668 bgo#785099 sck...@suse.com -- network: Fix crash opening "Hidden 
network" dialogue
-Patch7:         control-center-fix-crash-opening-hidden-network.patch
-# PATCH-FIX-UPSTREAM control-center-sharing-fix-margin-issue.patch bsc#1087134 
sck...@suse.com -- sharing: set end margin for labels in Networks list box
-Patch8:         control-center-sharing-fix-margin-issue.patch
-# PATCH-FIX-UPSTREAM control-center-ignore-unmanaged-wifi-devices.patch 
bsc#1079320 glgo#GNOME/gnome-control-center#54 sck...@suse.com -- wifi: only 
manage Wi-Fi devices managed by NM
-Patch9:         control-center-ignore-unmanaged-wifi-devices.patch
-# PATCH-FIX-UPSTREAM 
gnome-control-center-remove-implicit-language-setting.patch bsc#1078968 
yfji...@suse.com -- user-accounts: remove implicit language setting when a new 
user navigating the user panel at the first time (commit a1066a2)
-Patch10:        gnome-control-center-remove-implicit-language-setting.patch
-# PATCH-FIX-UPSTREAM gnome-control-center-periodic-wifi-scan.patch 
bsc#1097347, bgo#793647 sck...@suse.com -- network: Request periodic Wi-Fi scans
-Patch11:        gnome-control-center-periodic-wifi-scan.patch
-# PATCH-FIX-UPSTREAM control-center-network-fix-ce-apply-button.patch 
glgo#GNOME/gnome-control-center!402 bsc#1040054 sck...@suse.com -- network: 
disable the "Apply" button until a change has been made
-Patch12:         control-center-network-fix-ce-apply-button.patch
-# PATCH-FIX-UPSTREAM control-center-fix-mtu-label.patch 
glgo#GNOME/gnome-control-center!475 bsc#1040055 sck...@suse.com -- network: Fix 
mtu label not requesting enough space
-Patch13:         control-center-fix-mtu-label.patch
+URL:            https://www.gnome.org
+Source0:        %{name}-%{version}.tar.xz
 
+# PATCH-FIX-UPSTREAM gnome-control-center-can-not-find-usermod.patch 
bsc#1158341 glgo#GNOME/gnome-control-center!653 xw...@suse.com -- 
user-accounts: can't find command usermod
+Patch1:         gnome-control-center-can-not-find-usermod.patch
+# PATCH-FIX-UPSTREAM 
gnome-control-center-Initialize-GError-to-NULL-before-use.patch xw...@suse.com 
-- user-accounts: Initialize GError* to NULL before use
+Patch2:         gnome-control-center-Initialize-GError-to-NULL-before-use.patch
 ### patches for Leap >= 15 plus SLE >= 15, but not TW
-
 # PATCH-FEATURE-SLE gnome-control-center-info-never-use-gnome-software.patch 
bsc#999336 fezh...@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.
-Patch1003:      gnome-control-center-info-never-use-gnome-software.patch
+Patch1001:      gnome-control-center-info-never-use-gnome-software.patch
 # PATCH-FEATURE-SLE gnome-control-center-more-power-button-actions.patch 
bsc#993381 fezh...@suse.com -- power: Bring back the "shutdown" and 
"interactive" power button actions.
-Patch1004:      gnome-control-center-more-power-button-actions.patch
+Patch1002:      gnome-control-center-more-power-button-actions.patch
 # PATCH-FEATURE-SLE gnome-control-center-bring-back-firewall-zone.patch 
fate#316719 sck...@suse.com -- network: Bring back the firewall zone combo box 
to select proper firewall zone for each connection.
-Patch1005:      gnome-control-center-bring-back-firewall-zone.patch
+Patch1003:      gnome-control-center-bring-back-firewall-zone.patch
 
-BuildRequires:  cups-devel
+BuildRequires:  /usr/bin/Xvfb
+BuildRequires:  cups-devel >= 1.4
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
-BuildRequires:  gnome-common
 BuildRequires:  intltool
 BuildRequires:  krb5-devel
-%if 0%{?sle_version} >= 150000
+BuildRequires:  meson
+BuildRequires:  pkgconfig
+BuildRequires:  python3-dbusmock
+BuildRequires:  python3-pytest-xvfb
 BuildRequires:  translation-update-upstream
-%endif
-BuildRequires:  update-desktop-files
+BuildRequires:  xsltproc
 BuildRequires:  pkgconfig(accountsservice) >= 0.6.39
 BuildRequires:  pkgconfig(cairo-gobject)
-BuildRequires:  pkgconfig(cheese)
-BuildRequires:  pkgconfig(cheese-gtk) >= 3.3.91
-BuildRequires:  pkgconfig(clutter-gtk-1.0)
+BuildRequires:  pkgconfig(cheese) >= 3.28.0
+BuildRequires:  pkgconfig(cheese-gtk) >= 3.5.91
 BuildRequires:  pkgconfig(colord) >= 0.1.34
 BuildRequires:  pkgconfig(colord-gtk) >= 0.1.24
 BuildRequires:  pkgconfig(fontconfig)
-BuildRequires:  pkgconfig(gconf-2.0)
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0) >= 2.23.0
+BuildRequires:  pkgconfig(gdk-wayland-3.0)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.53.0
 BuildRequires:  pkgconfig(gmodule-2.0)
 BuildRequires:  pkgconfig(gnome-bluetooth-1.0) >= 3.18.2
-BuildRequires:  pkgconfig(gnome-desktop-3.0) >= 3.19.93
-BuildRequires:  pkgconfig(gnome-settings-daemon) >= 3.25.92
+BuildRequires:  pkgconfig(gnome-desktop-3.0) >= 3.27.90
+BuildRequires:  pkgconfig(gnome-settings-daemon) >= 3.25.90
 BuildRequires:  pkgconfig(goa-1.0) >= 3.25.3
 BuildRequires:  pkgconfig(goa-backend-1.0)
+BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
-BuildRequires:  pkgconfig(grilo-0.3) >= 0.2.12
-BuildRequires:  pkgconfig(gsettings-desktop-schemas) >= 3.21.4
-BuildRequires:  pkgconfig(gtk+-3.0) >= 3.22.0
+BuildRequires:  pkgconfig(grilo-0.3) >= 0.3.0
+BuildRequires:  pkgconfig(gsettings-desktop-schemas) >= 3.31.0
+BuildRequires:  pkgconfig(gsound)
+BuildRequires:  pkgconfig(gthread-2.0)
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.22.20
 BuildRequires:  pkgconfig(gudev-1.0)
-%if %{with_ibus}
-BuildRequires:  pkgconfig(ibus-1.0) >= 1.5.2
-%endif
-BuildRequires:  pkgconfig(libcanberra-gtk3)
 BuildRequires:  pkgconfig(libgtop-2.0)
-BuildRequires:  pkgconfig(libnm) >= 1.2
-BuildRequires:  pkgconfig(libnm-glib-vpn) >= 1.2
-BuildRequires:  pkgconfig(libnm-gtk) >= 1.2
-BuildRequires:  pkgconfig(libnma) >= 1.2
+BuildRequires:  pkgconfig(libhandy-0.0) >= 0.0.9
+BuildRequires:  pkgconfig(libnm) >= 1.10.0
+BuildRequires:  pkgconfig(libnma) >= 1.8.0
 BuildRequires:  pkgconfig(libpulse) >= 2.0
-BuildRequires:  pkgconfig(libpulse-mainloop-glib) >= 2.0
+BuildRequires:  pkgconfig(libpulse-mainloop-glib)
+BuildRequires:  pkgconfig(libsecret-1)
 BuildRequires:  pkgconfig(libsoup-2.4)
-%if %{with_wacom}
-BuildRequires:  pkgconfig(libwacom) >= 0.7
-%endif
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(mm-glib) >= 0.7
 BuildRequires:  pkgconfig(polkit-gobject-1) >= 0.103
 BuildRequires:  pkgconfig(pwquality) >= 1.2.2
 BuildRequires:  pkgconfig(smbclient)
-BuildRequires:  pkgconfig(upower-glib) >= 0.99.0
+BuildRequires:  pkgconfig(udisks2)
+BuildRequires:  pkgconfig(upower-glib) >= 0.99.6
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xcursor)
 BuildRequires:  pkgconfig(xft)
@@ -136,7 +109,10 @@
 Requires:       gnome-version
 Requires:       iso-codes
 # 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}-user-faces
 # cups-pk-helper should only be recommended, rather than a hard Requires, see 
boo#904047
@@ -156,8 +132,13 @@
 Obsoletes:      gnome-control-center-branding <= 12.3
 Obsoletes:      gnome-control-center-branding-openSUSE <= 12.3
 Obsoletes:      gnome-control-center-branding-upstream <= 12.3
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%glib2_gsettings_schema_requires
+%if %{with wacom}
+BuildRequires:  pkgconfig(clutter-1.0) >= 1.11.3
+BuildRequires:  pkgconfig(libwacom) >= 0.7
+%endif
+%if %{with ibus}
+BuildRequires:  pkgconfig(ibus-1.0) >= 1.5.2
+%endif
 
 %description
 The control center is GNOME's main interface for configuration of
@@ -211,66 +192,49 @@
 
 %prep
 %setup -q
+translation-update-upstream po gnome-control-center-2.0
+
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-
 # patches for Leap >= 15 plus SLE >= 15, but not TW
 %if 0%{?sle_version} >= 150000
-translation-update-upstream
+%patch1001 -p1
+%patch1002 -p1
 %patch1003 -p1
-%patch1004 -p1
-%patch1005 -p1
 %endif
 
 %build
-ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh
-
-%configure \
-       --disable-static \
-       --disable-maintainer-mode \
-%if %{with_ibus}
-       --enable-ibus \
-%else
-       --ibus-disable \
-%endif
+%meson \
+       -Dcheese=true \
+       -Ddocumentation=true \
+       %{!?with_ibus: -Dibus=false} \
        %{nil}
-pushd panels/common
-make gsd-common-enums.h
-popd
-make %{?_smp_mflags}
+%meson_build
 
-%install
-%make_install
-find %{buildroot} -type f -name "*.la" -delete -print
+%check
+%meson_test
 
-# We do not package gnome-control-center.rules (bnc#804966)
-rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
+%install
+%meson_install
 %find_lang %{name}-2.0 %{?no_lang_C}
 %find_lang %{name}-2.0-timezones %{name}-2.0.lang
 %fdupes %{buildroot}/%{_prefix}
 
+# We do not package gnome-control-center.rules (bnc#804966)
+rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
+
 %files
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%license COPYING
+%doc NEWS README.md
 %{_bindir}/*
-%{_datadir}/appdata/gnome-control-center.appdata.xml
+%{_datadir}/metainfo/gnome-control-center.appdata.xml
 %exclude %{_datadir}/applications/gnome-color-panel.desktop
 %exclude %{_datadir}/applications/gnome-online-accounts-panel.desktop
 %{_datadir}/applications/*.desktop
 %{_datadir}/bash-completion/completions/gnome-control-center
 %{_datadir}/dbus-1/services/org.gnome.ControlCenter.service
 %{_datadir}/dbus-1/services/org.gnome.ControlCenter.SearchProvider.service
+%{_datadir}/glib-2.0/schemas/org.gnome.ControlCenter.gschema.xml
 %{_datadir}/gnome-control-center/
 %dir %{_datadir}/gnome-shell/
 %dir %{_datadir}/gnome-shell/search-providers/
@@ -288,27 +252,25 @@
 %{_datadir}/sounds/gnome/default/alerts/*.ogg
 %{_libexecdir}/cc-remote-login-helper
 %{_libexecdir}/gnome-control-center-search-provider
-
 %{_mandir}/man1/gnome-control-center.1%{?ext_man}
 
-%files lang -f %{name}-2.0.lang
-
 %files user-faces
-%defattr (-, root, root)
 %{_datadir}/pixmaps/faces/
 
 %files color
-%defattr(-,root,root)
 %{_datadir}/applications/gnome-color-panel.desktop
 
 %files goa
-%defattr(-,root,root)
 %{_datadir}/applications/gnome-online-accounts-panel.desktop
 
 %files devel
-%defattr (-, root, root)
+%doc gnome-control-center.doap
 %{_datadir}/pkgconfig/gnome-keybindings.pc
 %{_datadir}/gettext/its/gnome-keybindings.its
 %{_datadir}/gettext/its/gnome-keybindings.loc
+%{_datadir}/gettext/its/sounds.its
+%{_datadir}/gettext/its/sounds.loc
+
+%files lang -f %{name}-2.0.lang
 
 %changelog

++++++ _service ++++++
<services>
  <service name="obs_scm" mode="disabled">
    <param name="scm">git</param>
    <param 
name="url">https://gitlab.gnome.org/GNOME/gnome-control-center.git</param>
    <param name="revision">refs/tags/3.34.2</param>
    <param name="versionformat">@PARENT_TAG@</param>
  </service>
  <service name="tar" mode="buildtime"/>
  <service name="recompress" mode="buildtime">
    <param name="file">*.tar</param>
    <param name="compression">xz</param>
  </service>
  <service name="set_version" mode="disabled" />
</services>

++++++ gnome-control-center-Initialize-GError-to-NULL-before-use.patch ++++++
>From 54caab7b0762b553e1e6663f416474fce77e4c51 Mon Sep 17 00:00:00 2001
From: Ting-Wei Lan <la...@src.gnome.org>
Date: Thu, 29 Aug 2019 11:58:02 +0800
Subject: [PATCH] user-accounts: Initialize GError* to NULL before use

Otherwise, it causes warnings to be shown on the terminal when it is
used and quickly leads to a crash.
---
 panels/user-accounts/user-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panels/user-accounts/user-utils.c 
b/panels/user-accounts/user-utils.c
index dfd3a2949..72401e40b 100644
--- a/panels/user-accounts/user-utils.c
+++ b/panels/user-accounts/user-utils.c
@@ -458,7 +458,7 @@ is_valid_username_async (const gchar *username,
         isValidUsernameData *data;
         gchar *argv[6];
         GPid pid;
-        GError *error;
+        GError *error = NULL;
 
         task = g_task_new (NULL, cancellable, callback, callback_data);
         g_task_set_source_tag (task, is_valid_username_async);
-- 
2.16.4

++++++ gnome-control-center-bring-back-firewall-zone.patch ++++++
--- /var/tmp/diff_new_pack.8BBlmC/_old  2020-01-30 14:51:17.558930936 +0100
+++ /var/tmp/diff_new_pack.8BBlmC/_new  2020-01-30 14:51:17.562930938 +0100
@@ -17,23 +17,22 @@
  panels/network/connection-editor/vpn-page.ui       |  39 +++++++
  10 files changed, 299 insertions(+)
 
-Index: gnome-control-center-3.26.2/panels/network/connection-editor/Makefile.am
+Index: gnome-control-center-3.34.1/panels/network/connection-editor/meson.build
 ===================================================================
---- 
gnome-control-center-3.26.2.orig/panels/network/connection-editor/Makefile.am
-+++ gnome-control-center-3.26.2/panels/network/connection-editor/Makefile.am
-@@ -28,6 +28,8 @@ libconnection_editor_la_SOURCES =            \
-       ce-page-vpn.c                           \
-       vpn-helpers.h                           \
-       vpn-helpers.c                           \
-+      firewall-helpers.h                      \
-+      firewall-helpers.c                      \
-       ui-helpers.h                            \
-       ui-helpers.c
- 
-Index: 
gnome-control-center-3.26.2/panels/network/connection-editor/ce-page-ethernet.c
+--- 
gnome-control-center-3.34.1.orig/panels/network/connection-editor/meson.build
++++ gnome-control-center-3.34.1/panels/network/connection-editor/meson.build
+@@ -10,6 +10,7 @@ sources = files(
+   'ce-page-vpn.c',
+   'ce-page-wifi.c',
+   'ce-page.c',
++  'firewall-helpers.c',
+   'net-connection-editor.c',
+   'ui-helpers.c',
+   'vpn-helpers.c'
+Index: 
gnome-control-center-3.34.1/panels/network/connection-editor/ce-page-ethernet.c
 ===================================================================
---- 
gnome-control-center-3.26.2.orig/panels/network/connection-editor/ce-page-ethernet.c
-+++ 
gnome-control-center-3.26.2/panels/network/connection-editor/ce-page-ethernet.c
+--- 
gnome-control-center-3.34.1.orig/panels/network/connection-editor/ce-page-ethernet.c
++++ 
gnome-control-center-3.34.1/panels/network/connection-editor/ce-page-ethernet.c
 @@ -28,6 +28,7 @@
  #include <NetworkManager.h>
  
@@ -68,7 +67,7 @@
  }
  
  static void
-@@ -108,6 +118,9 @@ ui_to_setting (CEPageEthernet *page)
+@@ -110,6 +120,9 @@ ui_to_setting (CEPageEthernet *page)
                        NM_SETTING_CONNECTION_ID, gtk_entry_get_text 
(page->name),
                        NULL);
  
@@ -78,10 +77,10 @@
          g_free (cloned_mac);
          g_free (device_mac);
  }
-Index: 
gnome-control-center-3.26.2/panels/network/connection-editor/ce-page-security.c
+Index: 
gnome-control-center-3.34.1/panels/network/connection-editor/ce-page-security.c
 ===================================================================
---- 
gnome-control-center-3.26.2.orig/panels/network/connection-editor/ce-page-security.c
-+++ 
gnome-control-center-3.26.2/panels/network/connection-editor/ce-page-security.c
+--- 
gnome-control-center-3.34.1.orig/panels/network/connection-editor/ce-page-security.c
++++ 
gnome-control-center-3.34.1/panels/network/connection-editor/ce-page-security.c
 @@ -28,6 +28,7 @@
  
  #include "wireless-security.h"
@@ -138,10 +137,10 @@
          return valid;
  }
  
-Index: 
gnome-control-center-3.26.2/panels/network/connection-editor/ce-page-security.h
+Index: 
gnome-control-center-3.34.1/panels/network/connection-editor/ce-page-security.h
 ===================================================================
---- 
gnome-control-center-3.26.2.orig/panels/network/connection-editor/ce-page-security.h
-+++ 
gnome-control-center-3.26.2/panels/network/connection-editor/ce-page-security.h
+--- 
gnome-control-center-3.34.1.orig/panels/network/connection-editor/ce-page-security.h
++++ 
gnome-control-center-3.34.1/panels/network/connection-editor/ce-page-security.h
 @@ -45,6 +45,8 @@ struct _CEPageSecurity
  
          GtkComboBox *security_combo;
@@ -151,10 +150,10 @@
          GtkSizeGroup *group;
          gboolean     adhoc;
  };
-Index: 
gnome-control-center-3.26.2/panels/network/connection-editor/ce-page-vpn.c
+Index: 
gnome-control-center-3.34.1/panels/network/connection-editor/ce-page-vpn.c
 ===================================================================
---- 
gnome-control-center-3.26.2.orig/panels/network/connection-editor/ce-page-vpn.c
-+++ gnome-control-center-3.26.2/panels/network/connection-editor/ce-page-vpn.c
+--- 
gnome-control-center-3.34.1.orig/panels/network/connection-editor/ce-page-vpn.c
++++ gnome-control-center-3.34.1/panels/network/connection-editor/ce-page-vpn.c
 @@ -28,6 +28,7 @@
  
  #include "ce-page-vpn.h"
@@ -195,11 +194,51 @@
  
          if (!nm_setting_verify (NM_SETTING (self->setting_connection), NULL, 
error))
                  return FALSE;
-Index: 
gnome-control-center-3.26.2/panels/network/connection-editor/firewall-helpers.c
+Index: 
gnome-control-center-3.34.1/panels/network/connection-editor/ethernet-page.ui
+===================================================================
+--- 
gnome-control-center-3.34.1.orig/panels/network/connection-editor/ethernet-page.ui
++++ 
gnome-control-center-3.34.1/panels/network/connection-editor/ethernet-page.ui
+@@ -219,5 +219,35 @@
+     <child>
+       <placeholder/>
+     </child>
++    <child>
++      <object class="GtkLabel" id="heading_zone">
++        <property name="visible">True</property>
++        <property name="can_focus">False</property>
++        <property name="xalign">1</property>
++        <property name="label" translatable="yes">Firewall _Zone</property>
++        <property name="use_underline">True</property>
++        <property name="mnemonic_widget">combo_zone</property>
++      </object>
++      <packing>
++        <property name="left_attach">0</property>
++        <property name="top_attach">4</property>
++        <property name="width">1</property>
++        <property name="height">1</property>
++      </packing>
++    </child>
++    <child>
++      <object class="GtkComboBoxText" id="combo_zone">
++        <property name="visible">True</property>
++        <property name="can_focus">False</property>
++        <property name="entry_text_column">0</property>
++        <property name="id_column">1</property>
++      </object>
++      <packing>
++        <property name="left_attach">1</property>
++        <property name="top_attach">4</property>
++        <property name="width">1</property>
++        <property name="height">1</property>
++      </packing>
++    </child>
+   </object>
+ </interface>
+Index: 
gnome-control-center-3.34.1/panels/network/connection-editor/firewall-helpers.c
 ===================================================================
 --- /dev/null
-+++ 
gnome-control-center-3.26.2/panels/network/connection-editor/firewall-helpers.c
-@@ -0,0 +1,114 @@
++++ 
gnome-control-center-3.34.1/panels/network/connection-editor/firewall-helpers.c
+@@ -0,0 +1,125 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
 + * This program is free software; you can redistribute it and/or modify
@@ -232,38 +271,20 @@
 +        GtkWidget *label;
 +} GetZonesReplyData;
 +
-+void
-+firewall_ui_setup (NMSettingConnection *setting,
-+                   GtkWidget           *combo,
-+                   GtkWidget           *label,
-+                   GCancellable        *cancellable)
++static void
++get_zones_reply (GObject      *source,
++                 GAsyncResult *res,
++                 gpointer      user_data)
 +{
++        GDBusConnection *bus = G_DBUS_CONNECTION (source);
++        GetZonesReplyData *d = user_data;
++        GVariant *ret;
++        GError *error = NULL;
 +        const gchar **zones;
 +        gint idx;
 +        gint i;
-+        GDBusConnection *bus;
-+        GetZonesReplyData *d;
-+        GError *error = NULL;
-+        GVariant *variant;
 +
-+        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
-+
-+        d = g_new0 (GetZonesReplyData, 1);
-+        d->zone = g_strdup (nm_setting_connection_get_zone (setting));
-+        d->combo = combo;
-+        d->label = label;
-+
-+        variant = g_dbus_connection_call_sync (bus,
-+                                               "org.fedoraproject.FirewallD1",
-+                                               
"/org/fedoraproject/FirewallD1",
-+                                               
"org.fedoraproject.FirewallD1.zone",
-+                                               "getZones",
-+                                               NULL,
-+                                               NULL,
-+                                               0,
-+                                               G_MAXINT,
-+                                               cancellable,
-+                                               &error);
++        ret = g_dbus_connection_call_finish (bus, res, &error);
 +
 +        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (d->combo),
 +                                        C_("Firewall zone", "Default"));
@@ -278,7 +299,7 @@
 +        else {
 +                gtk_widget_show (d->combo);
 +                gtk_widget_show (d->label);
-+                g_variant_get (variant, "(^a&s)", &zones);
++                g_variant_get (ret, "(^a&s)", &zones);
 +
 +                for (i = 0; zones[i]; i++) {
 +                        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT 
(d->combo),
@@ -291,12 +312,41 @@
 +                                                        d->zone);
 +                        idx = i + 1;
 +                }
-+                g_variant_unref (variant);
++                g_variant_unref (ret);
 +        }
 +        gtk_combo_box_set_active (GTK_COMBO_BOX (d->combo), idx);
 +
 +        g_free (d->zone);
 +        g_free (d);
++}
++
++void
++firewall_ui_setup (NMSettingConnection *setting,
++                   GtkWidget           *combo,
++                   GtkWidget           *label,
++                   GCancellable        *cancellable)
++{
++        GDBusConnection *bus;
++        GetZonesReplyData *d;
++
++        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
++
++        d = g_new0 (GetZonesReplyData, 1);
++        d->zone = g_strdup (nm_setting_connection_get_zone (setting));
++        d->combo = combo;
++        d->label = label;
++
++        g_dbus_connection_call (bus,
++                                "org.fedoraproject.FirewallD1",
++                                "/org/fedoraproject/FirewallD1",
++                                "org.fedoraproject.FirewallD1.zone",
++                                "getZones",
++                                NULL,
++                                NULL,
++                                0,
++                                G_MAXINT,
++                                cancellable,
++                                get_zones_reply, d);
 +        g_object_unref (bus);
 +}
 +
@@ -314,10 +364,10 @@
 +        g_object_set (setting, NM_SETTING_CONNECTION_ZONE, zone, NULL);
 +        g_free (zone);
 +}
-Index: 
gnome-control-center-3.26.2/panels/network/connection-editor/firewall-helpers.h
+Index: 
gnome-control-center-3.34.1/panels/network/connection-editor/firewall-helpers.h
 ===================================================================
 --- /dev/null
-+++ 
gnome-control-center-3.26.2/panels/network/connection-editor/firewall-helpers.h
++++ 
gnome-control-center-3.34.1/panels/network/connection-editor/firewall-helpers.h
 @@ -0,0 +1,33 @@
 +/*
 + * This program is free software; you can redistribute it and/or modify
@@ -352,10 +402,10 @@
 +
 +
 +#endif  /* _FIREWALL_HELPERS_H_ */
-Index: 
gnome-control-center-3.26.2/panels/network/connection-editor/security-page.ui
+Index: 
gnome-control-center-3.34.1/panels/network/connection-editor/security-page.ui
 ===================================================================
---- 
gnome-control-center-3.26.2.orig/panels/network/connection-editor/security-page.ui
-+++ 
gnome-control-center-3.26.2/panels/network/connection-editor/security-page.ui
+--- 
gnome-control-center-3.34.1.orig/panels/network/connection-editor/security-page.ui
++++ 
gnome-control-center-3.34.1/panels/network/connection-editor/security-page.ui
 @@ -63,6 +63,38 @@
              <property name="height">1</property>
            </packing>
@@ -395,10 +445,10 @@
        </object>
      </child>
      <child type="tab">
-Index: gnome-control-center-3.26.2/panels/network/connection-editor/vpn-page.ui
+Index: gnome-control-center-3.34.1/panels/network/connection-editor/vpn-page.ui
 ===================================================================
---- 
gnome-control-center-3.26.2.orig/panels/network/connection-editor/vpn-page.ui
-+++ gnome-control-center-3.26.2/panels/network/connection-editor/vpn-page.ui
+--- 
gnome-control-center-3.34.1.orig/panels/network/connection-editor/vpn-page.ui
++++ gnome-control-center-3.34.1/panels/network/connection-editor/vpn-page.ui
 @@ -51,6 +51,45 @@
        </packing>
      </child>
@@ -445,43 +495,3 @@
        <object class="GtkLabel" id="failure_label">
          <property name="visible">True</property>
          <property name="can_focus">False</property>
-Index: 
gnome-control-center-3.26.2/panels/network/connection-editor/ethernet-page.ui
-===================================================================
---- 
gnome-control-center-3.26.2.orig/panels/network/connection-editor/ethernet-page.ui
-+++ 
gnome-control-center-3.26.2/panels/network/connection-editor/ethernet-page.ui
-@@ -214,5 +214,35 @@
-     <child>
-       <placeholder/>
-     </child>
-+    <child>
-+      <object class="GtkLabel" id="heading_zone">
-+        <property name="visible">True</property>
-+        <property name="can_focus">False</property>
-+        <property name="xalign">1</property>
-+        <property name="label" translatable="yes">Firewall _Zone</property>
-+        <property name="use_underline">True</property>
-+        <property name="mnemonic_widget">combo_zone</property>
-+      </object>
-+      <packing>
-+        <property name="left_attach">0</property>
-+        <property name="top_attach">4</property>
-+        <property name="width">1</property>
-+        <property name="height">1</property>
-+      </packing>
-+    </child>
-+    <child>
-+      <object class="GtkComboBoxText" id="combo_zone">
-+        <property name="visible">True</property>
-+        <property name="can_focus">False</property>
-+        <property name="entry_text_column">0</property>
-+        <property name="id_column">1</property>
-+      </object>
-+      <packing>
-+        <property name="left_attach">1</property>
-+        <property name="top_attach">4</property>
-+        <property name="width">1</property>
-+        <property name="height">1</property>
-+      </packing>
-+    </child>
-   </object>
- </interface>

++++++ gnome-control-center-can-not-find-usermod.patch ++++++
>From c6be204af030f23905ec7a69ab02c88a80f4a4f5 Mon Sep 17 00:00:00 2001
From: Xiaoguang Wang <xw...@suse.com>
Date: Wed, 11 Dec 2019 15:30:33 +0800
Subject: [PATCH] user-accounts: Use absolute path of command usermod

On distro openSUSE Tumbleweed and SUSE Linux Enterprise the path
of command usermod is not in environment variable PATH, we need to
use absolute path to find command.
---
 panels/user-accounts/user-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: gnome-control-center-3.34.2/panels/user-accounts/user-utils.c
===================================================================
--- gnome-control-center-3.34.2.orig/panels/user-accounts/user-utils.c
+++ gnome-control-center-3.34.2/panels/user-accounts/user-utils.c
@@ -486,7 +486,7 @@ is_valid_username_async (const gchar *us
          * future, so it would be nice to have some official way for this
          * instead of relying on the current "--login" implementation.
          */
-        argv[0] = "usermod";
+        argv[0] = "/usr/sbin/usermod";
         argv[1] = "--login";
         argv[2] = data->username;
         argv[3] = "--";
++++++ gnome-control-center-more-power-button-actions.patch ++++++
--- /var/tmp/diff_new_pack.8BBlmC/_old  2020-01-30 14:51:17.570930942 +0100
+++ /var/tmp/diff_new_pack.8BBlmC/_new  2020-01-30 14:51:17.570930942 +0100
@@ -1,8 +1,8 @@
 diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
-index e32d965..c3dadc7 100644
+index c31249c..5718c98 100644
 --- a/panels/power/cc-power-panel.c
 +++ b/panels/power/cc-power-panel.c
-@@ -2060,10 +2060,11 @@ populate_power_button_model (GtkTreeModel *model,
+@@ -2169,10 +2169,11 @@ populate_power_button_model (GtkTreeModel *model,
      char *name;
      GsdPowerButtonActionType value;
    } actions[] = {

++++++ gnome-control-center.obsinfo ++++++
name: gnome-control-center
version: 3.34.2
mtime: 1574693011
commit: 049df20eca021449eadc61960770e8d9709da16e


Reply via email to