commit: c1d2946ddacf91914438be47442f40dd613d9f19 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Fri May 15 07:01:38 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Fri May 15 07:02:19 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d2946d
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 <AT> gentoo.org> sys-fs/treesize/files/0.54.1-amd64.patch | 4 ++-- sys-fs/treesize/files/0.54.1-fno-common.patch | 11 +++++++++++ sys-fs/treesize/treesize-0.54.1-r1.ebuild | 7 +++++-- 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 c03df8a258e..dd45436e75e 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 00000000000..7001b4ba8b3 --- /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 315e9e86c23..90940c26247 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
