summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2020-02-02 12:27:33 +0100
committerBernard Cafarelli <voyageur@gentoo.org>2020-02-02 12:29:38 +0100
commitfeb96a00dc2f2e990b28203e459cb65d91c7a4b5 (patch)
tree2163496381df010edebbe2c5df35b821b4d99abe /x11-plugins/wmgrabimage
parentapp-forensics/honggfuzz: tweak for binutils-2.34, bug #707846 (diff)
downloadgentoo-feb96a00dc2f2e990b28203e459cb65d91c7a4b5.tar.gz
gentoo-feb96a00dc2f2e990b28203e459cb65d91c7a4b5.tar.bz2
gentoo-feb96a00dc2f2e990b28203e459cb65d91c7a4b5.zip
x11-plugins/wmgrabimage: fix build with -fno-common
Closes: https://bugs.gentoo.org/706836 Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>
Diffstat (limited to 'x11-plugins/wmgrabimage')
-rw-r--r--x11-plugins/wmgrabimage/files/wmgrabimage-0.72-gcc-10.patch32
-rw-r--r--x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild9
2 files changed, 38 insertions, 3 deletions
diff --git a/x11-plugins/wmgrabimage/files/wmgrabimage-0.72-gcc-10.patch b/x11-plugins/wmgrabimage/files/wmgrabimage-0.72-gcc-10.patch
new file mode 100644
index 000000000000..f7b85c9d1bc5
--- /dev/null
+++ b/x11-plugins/wmgrabimage/files/wmgrabimage-0.72-gcc-10.patch
@@ -0,0 +1,32 @@
+diff -Naur wmGrabImage-0.72.orig/wmgeneral/wmgeneral.c wmGrabImage-0.72/wmgeneral/wmgeneral.c
+--- wmGrabImage-0.72.orig/wmgeneral/wmgeneral.c 2001-05-27 21:02:18.000000000 +0200
++++ wmGrabImage-0.72/wmgeneral/wmgeneral.c 2020-02-02 12:25:53.013879815 +0100
+@@ -47,6 +47,10 @@
+ char *Geometry = "";
+ Window iconwin, win;
+ Pixmap pixmask;
++Display *display;
++Window Root;
++GC NormalGC;
++XpmIcon wmgen;
+
+ /*****************/
+ /* Mouse Regions */
+diff -Naur wmGrabImage-0.72.orig/wmgeneral/wmgeneral.h wmGrabImage-0.72/wmgeneral/wmgeneral.h
+--- wmGrabImage-0.72.orig/wmgeneral/wmgeneral.h 2001-05-27 21:02:18.000000000 +0200
++++ wmGrabImage-0.72/wmgeneral/wmgeneral.h 2020-02-02 12:25:31.926869125 +0100
+@@ -28,10 +28,10 @@
+ /* Global variable */
+ /*******************/
+
+-Display *display;
+-Window Root;
+-GC NormalGC;
+-XpmIcon wmgen;
++extern Display *display;
++extern Window Root;
++extern GC NormalGC;
++extern XpmIcon wmgen;
+
+
+ /***********************/
diff --git a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
index 131e0beaee7a..b1d7ff43dabc 100644
--- a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
+++ b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.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
@@ -29,9 +29,12 @@ S=${WORKDIR}/${MY_PN}-${PV}/${MY_PN}
PATCHES=( "${FILESDIR}"/${PN}-noman.patch )
src_prepare() {
- sed -i -e 's/-geom /-geometry /' GrabImage || die "sed failed."
- sed -i -e 's/install -s -m /install -m /' Makefile || die "sed failed."
+ sed -i -e 's/-geom /-geometry /' GrabImage || die
+ sed -i -e 's/install -s -m /install -m /' Makefile || die
default
+
+ pushd "${WORKDIR}"/${MY_PN}-${PV} || die
+ eapply "${FILESDIR}"/${P}-gcc-10.patch
}
src_compile() {