[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/

[David Seifert]

commit:     1785afa0aba9c8d46f05c9f0253c8e7985bf1816
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 19:46:18 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 19:46:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1785afa0

gnome-base/gnome-control-center: Fix GCC 10 / -fno-common

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...ontrol-center-3.32.2-fix-gcc10-fno-common.patch | 26 ++++++++++++++++++++++
 .../gnome-control-center-3.32.2.ebuild             |  2 ++
 2 files changed, 28 insertions(+)

diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.32.2-fix-gcc10-fno-common.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.32.2-fix-gcc10-fno-common.patch
new file mode 100644
index 00000000000..b0a7a702654
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.32.2-fix-gcc10-fno-common.patch
@@ -0,0 +1,26 @@
+From 901ef8b0ff2b05692cbaa119097f70615ea77ed4 Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@××××.com>
+Date: Thu, 9 Jan 2020 21:34:12 +0000
+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-base/gnome-control-center/gnome-control-center-3.32.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
index cac1b28a467..70a11f09240 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
@@ -123,6 +123,8 @@ PATCHES=(
 	# https://bugzilla.gnome.org/686840, 697478, 700145
 	# Fix some absolute paths to be appropriate for Gentoo
 	"${WORKDIR}"/patches/
+
+	"${FILESDIR}"/${PN}-3.32.2-fix-gcc10-fno-common.patch # fixed in 3.35.90
 )
 
 src_configure() {