commit: 0350cf07cd09845a3a6f8675034bac59d178fd67 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Sun Mar 29 11:30:21 2020 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Sun Mar 29 11:35:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0350cf07
x11-plugins/wmifinfo: fix build with -fno-common Closes: https://bugs.gentoo.org/708034 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> .../wmifinfo/files/wmifinfo-0.10-fno-common.patch | 35 ++++++++++++++++++++++ x11-plugins/wmifinfo/wmifinfo-0.10-r1.ebuild | 4 ++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/x11-plugins/wmifinfo/files/wmifinfo-0.10-fno-common.patch b/x11-plugins/wmifinfo/files/wmifinfo-0.10-fno-common.patch new file mode 100644 index 00000000000..296c88a3541 --- /dev/null +++ b/x11-plugins/wmifinfo/files/wmifinfo-0.10-fno-common.patch @@ -0,0 +1,35 @@ +diff -Naur dockapps.orig/xutils.c dockapps/xutils.c +--- dockapps.orig/xutils.c 2014-12-09 20:31:13.000000000 +0100 ++++ dockapps/xutils.c 2020-03-29 13:29:01.027698381 +0200 +@@ -54,6 +54,11 @@ + XpmIcon wmgen; + Pixmap pixmask; + ++Display *display; ++Window Root; ++Window iconwin, win; ++int screen; ++int DisplayDepth; + + + +diff -Naur dockapps.orig/xutils.h dockapps/xutils.h +--- dockapps.orig/xutils.h 2014-12-09 20:31:13.000000000 +0100 ++++ dockapps/xutils.h 2020-03-29 13:29:10.728695410 +0200 +@@ -18,11 +18,11 @@ + /* + * Global variable + */ +-Display *display; +-Window Root; +-Window iconwin, win; +-int screen; +-int DisplayDepth; ++extern Display *display; ++extern Window Root; ++extern Window iconwin, win; ++extern int screen; ++extern int DisplayDepth; + + + diff --git a/x11-plugins/wmifinfo/wmifinfo-0.10-r1.ebuild b/x11-plugins/wmifinfo/wmifinfo-0.10-r1.ebuild index a8cc36e93ef..f02294e77cd 100644 --- a/x11-plugins/wmifinfo/wmifinfo-0.10-r1.ebuild +++ b/x11-plugins/wmifinfo/wmifinfo-0.10-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,6 +18,8 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND} x11-base/xorg-proto" +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + S="${WORKDIR}/dockapps" src_compile() {
