summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2020-02-26 20:46:18 +0100
committerDavid Seifert <soap@gentoo.org>2020-02-26 20:46:18 +0100
commit1785afa0aba9c8d46f05c9f0253c8e7985bf1816 (patch)
tree048e90141f86da4801b7bda8a72042ea13011f23 /gnome-base/gnome-control-center
parentnet-firewall/nftables-0.9.3-r1: Add python3_8 (diff)
downloadgentoo-1785afa0aba9c8d46f05c9f0253c8e7985bf1816.tar.gz
gentoo-1785afa0aba9c8d46f05c9f0253c8e7985bf1816.tar.bz2
gentoo-1785afa0aba9c8d46f05c9f0253c8e7985bf1816.zip
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@gentoo.org>
Diffstat (limited to 'gnome-base/gnome-control-center')
-rw-r--r--gnome-base/gnome-control-center/files/gnome-control-center-3.32.2-fix-gcc10-fno-common.patch26
-rw-r--r--gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild2
2 files changed, 28 insertions, 0 deletions
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@suse.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() {