commit: 9869d748199f7fad1746a27248990e10436df568 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Sun Mar 8 11:22:00 2020 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Sun Mar 8 11:27:31 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9869d748
x11-plugins/wmmon+smp: fix build with -fno-common Closes: https://bugs.gentoo.org/707216 Package-Manager: Portage-2.3.92, Repoman-2.3.20 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> .../wmmon+smp/files/wmmon+smp-1.0-fno-common.patch | 24 ++++++++++++++++++++++ x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild | 4 +++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-fno-common.patch b/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-fno-common.patch new file mode 100644 index 00000000000..6ec3ba03520 --- /dev/null +++ b/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-fno-common.patch @@ -0,0 +1,24 @@ +diff -Naur wmmon.app.orig/wmgeneral/wmgeneral.h wmmon.app/wmgeneral/wmgeneral.h +--- wmmon.app.orig/wmgeneral/wmgeneral.h 1999-06-07 03:09:36.000000000 +0200 ++++ wmmon.app/wmgeneral/wmgeneral.h 2020-03-08 12:20:10.345121264 +0100 +@@ -36,7 +36,7 @@ + /* Global variable */ + /*******************/ + +-Display *display; ++extern Display *display; + + /***********************/ + /* Function Prototypes */ +diff -Naur wmmon.app.orig/wmmon/wmmon.c wmmon.app/wmmon/wmmon.c +--- wmmon.app.orig/wmmon/wmmon.c 1999-06-07 05:49:45.000000000 +0200 ++++ wmmon.app/wmmon/wmmon.c 2020-03-08 12:20:18.657124944 +0100 +@@ -19,6 +19,8 @@ + int wmmon_mask_width = 64; + int wmmon_mask_height = 64; + ++Display *display; ++ + void usage(void); + void drawstat(int *, int, int, int, int); + void wmmon_routine(int, char **); diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild index b1e2679d8c7..e16511eaf5b 100644 --- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild +++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild @@ -22,7 +22,9 @@ DEPEND="${RDEPEND} S="${WORKDIR}/wmmon.app/wmmon" -PATCHES=( "${FILESDIR}"/${P}-list.patch ) +PATCHES=( "${FILESDIR}"/${P}-list.patch + "${FILESDIR}"/${P}-fno-common.patch + ) src_prepare() { tc-export CC
