summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2020-05-15 09:01:38 +0200
committerJeroen Roovers <jer@gentoo.org>2020-05-15 09:02:19 +0200
commitc1d2946ddacf91914438be47442f40dd613d9f19 (patch)
tree4c0478cdfb9840c72ce781bfc8449febd3312c17 /sys-fs/treesize
parentdev-python/google-apitools: Bump to 0.5.31 (diff)
downloadgentoo-c1d2946ddacf91914438be47442f40dd613d9f19.tar.gz
gentoo-c1d2946ddacf91914438be47442f40dd613d9f19.tar.bz2
gentoo-c1d2946ddacf91914438be47442f40dd613d9f19.zip
sys-fs/treesize: Fix building with CFLAGS=-fno-common
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Closes: https://bugs.gentoo.org/706844 Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Diffstat (limited to 'sys-fs/treesize')
-rw-r--r--sys-fs/treesize/files/0.54.1-amd64.patch4
-rw-r--r--sys-fs/treesize/files/0.54.1-fno-common.patch11
-rw-r--r--sys-fs/treesize/treesize-0.54.1-r1.ebuild7
3 files changed, 18 insertions, 4 deletions
diff --git a/sys-fs/treesize/files/0.54.1-amd64.patch b/sys-fs/treesize/files/0.54.1-amd64.patch
index c03df8a258e7..dd45436e75e5 100644
--- a/sys-fs/treesize/files/0.54.1-amd64.patch
+++ b/sys-fs/treesize/files/0.54.1-amd64.patch
@@ -1,5 +1,5 @@
---- a/src/ui-util.c 2007-11-16 22:08:01.000000000 +0100
-+++ b/src/ui-util.c 2009-05-09 11:34:59.000000000 +0200
+--- a/src/ui-util.c
++++ b/src/ui-util.c
@@ -18,6 +18,7 @@
#include "ui-util.h"
diff --git a/sys-fs/treesize/files/0.54.1-fno-common.patch b/sys-fs/treesize/files/0.54.1-fno-common.patch
new file mode 100644
index 000000000000..7001b4ba8b37
--- /dev/null
+++ b/sys-fs/treesize/files/0.54.1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/main.c
++++ b/src/main.c
+@@ -39,7 +39,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
+-GdkPixbuf* gdkTreeSize;
++extern GdkPixbuf* gdkTreeSize;
+ GtkMenu *TreeSizeMenuGlobal;
+ GtkWidget *mainWindow;
+
diff --git a/sys-fs/treesize/treesize-0.54.1-r1.ebuild b/sys-fs/treesize/treesize-0.54.1-r1.ebuild
index 315e9e86c23f..90940c262473 100644
--- a/sys-fs/treesize/treesize-0.54.1-r1.ebuild
+++ b/sys-fs/treesize/treesize-0.54.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,10 @@ KEYWORDS="amd64 x86"
RDEPEND="x11-libs/gtk+:2"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/${PV}-amd64.patch" )
+PATCHES=(
+ "${FILESDIR}"/${PV}-amd64.patch
+ "${FILESDIR}"/${PV}-fno-common.patch
+)
src_prepare() {
default