diff --git a/gnome-control-center-fno-common.patch b/gnome-control-center-fno-common.patch new file mode 100644 index 0000000..2578032 --- /dev/null +++ b/gnome-control-center-fno-common.patch @@ -0,0 +1,26 @@ +From 92b50d6037ff4d6ccd888beb5b01b55c50bc33ed Mon Sep 17 00:00:00 2001 +From: Mike Gorse +Date: Thu, 9 Jan 2020 14:11:40 -0600 +Subject: [PATCH] Thunderbolt: make BoltError enum a typedef + +Fixes error when compiled with -fno-common +--- + panels/thunderbolt/bolt-error.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/panels/thunderbolt/bolt-error.h b/panels/thunderbolt/bolt-error.h +index 39b3eee98..7d3823d35 100644 +--- a/panels/thunderbolt/bolt-error.h ++++ b/panels/thunderbolt/bolt-error.h +@@ -31,7 +31,7 @@ G_BEGIN_DECLS + * + * Error codes used inside Bolt. + */ +-enum { ++typedef enum { + BOLT_ERROR_FAILED = 0, + BOLT_ERROR_UDEV, + BOLT_ERROR_NOKEY, +-- +2.24.1 + diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 14a6d71..252954c 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 9 20:24:39 UTC 2020 - Michael Gorse + +- Add gnome-control-center-fno-common.patch: fix build with + -fno-common (boo#1160393 glgo#GNOME/gnome-control-center!681). + ------------------------------------------------------------------- Thu Dec 12 02:25:20 UTC 2019 - Xiaoguang Wang diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 7741f93..477f7fd 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-control-center # -# Copyright (c) 2019 SUSE LLC. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,6 +38,8 @@ Source0: %{name}-%{version}.tar.xz Patch1: gnome-control-center-can-not-find-usermod.patch # PATCH-FIX-UPSTREAM gnome-control-center-Initialize-GError-to-NULL-before-use.patch xwang@suse.com -- user-accounts: Initialize GError* to NULL before use Patch2: gnome-control-center-Initialize-GError-to-NULL-before-use.patch +# PATCH-FIX-UPSTREAM gnome-control-center-fno-common.patch boo#1160393 mgorse@suse.com -- fix build with -fno-common. +Patch3: gnome-control-center-fno-common.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 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. Patch1001: gnome-control-center-info-never-use-gnome-software.patch @@ -196,6 +198,7 @@ translation-update-upstream po gnome-control-center-2.0 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # patches for Leap >= 15 plus SLE >= 15, but not TW %if 0%{?sle_version} >= 150000 %patch1001 -p1