summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2020-06-13 11:01:11 +0200
committerBernard Cafarelli <voyageur@gentoo.org>2020-06-13 11:04:24 +0200
commita063bda4b1a5fb21f06f35a4548ff17e3725b253 (patch)
tree012aa2258c3d14d5a97683f7393e6e3b57372f7f /x11-plugins/wmpop3
parentx11-plugins/wmrecord: fix build with -fno-common (diff)
downloadgentoo-a063bda4b1a5fb21f06f35a4548ff17e3725b253.tar.gz
gentoo-a063bda4b1a5fb21f06f35a4548ff17e3725b253.tar.bz2
gentoo-a063bda4b1a5fb21f06f35a4548ff17e3725b253.zip
x11-plugins/wmpop3: fix build with -fno-common
Closes: https://bugs.gentoo.org/726250 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>
Diffstat (limited to 'x11-plugins/wmpop3')
-rw-r--r--x11-plugins/wmpop3/files/wmpop3-0.5.6a-fno-common.patch23
-rw-r--r--x11-plugins/wmpop3/wmpop3-0.5.6a-r1.ebuild4
2 files changed, 26 insertions, 1 deletions
diff --git a/x11-plugins/wmpop3/files/wmpop3-0.5.6a-fno-common.patch b/x11-plugins/wmpop3/files/wmpop3-0.5.6a-fno-common.patch
new file mode 100644
index 00000000000..6e6c3e60414
--- /dev/null
+++ b/x11-plugins/wmpop3/files/wmpop3-0.5.6a-fno-common.patch
@@ -0,0 +1,23 @@
+diff -Naur wmpop3-0.5.6a.orig/wmgeneral/wmgeneral.c wmpop3-0.5.6a/wmgeneral/wmgeneral.c
+--- wmpop3-0.5.6a.orig/wmgeneral/wmgeneral.c 1999-08-13 17:56:19.000000000 +0200
++++ wmpop3-0.5.6a/wmgeneral/wmgeneral.c 2020-06-13 11:00:02.036999257 +0200
+@@ -67,6 +67,7 @@
+ GC NormalGC;
+ XpmIcon wmgen;
+ Pixmap pixmask;
++Display *display;
+
+ /*****************/
+ /* Mouse Regions */
+diff -Naur wmpop3-0.5.6a.orig/wmgeneral/wmgeneral.h wmpop3-0.5.6a/wmgeneral/wmgeneral.h
+--- wmpop3-0.5.6a.orig/wmgeneral/wmgeneral.h 1999-08-13 17:56:19.000000000 +0200
++++ wmpop3-0.5.6a/wmgeneral/wmgeneral.h 2020-06-13 10:59:57.263995472 +0200
+@@ -36,7 +36,7 @@
+ /* Global variable */
+ /*******************/
+
+-Display *display;
++extern Display *display;
+
+ /***********************/
+ /* Function Prototypes */
diff --git a/x11-plugins/wmpop3/wmpop3-0.5.6a-r1.ebuild b/x11-plugins/wmpop3/wmpop3-0.5.6a-r1.ebuild
index 88f9dc57120..7a3f6094bc1 100644
--- a/x11-plugins/wmpop3/wmpop3-0.5.6a-r1.ebuild
+++ b/x11-plugins/wmpop3/wmpop3-0.5.6a-r1.ebuild
@@ -17,7 +17,9 @@ DEPEND="x11-wm/windowmaker
x11-libs/libXpm"
RDEPEND="${DEPEND}"
-PATCHES=( ${FILESDIR}/${P}-list.patch )
+PATCHES=( "${FILESDIR}"/${P}-list.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+ )
src_prepare() {
sed -e "s|cc |$(tc-getCC) |" \