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>

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 (file)
index 0000000..f7b85c9
--- /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 131e0beaee7aed7630f4d8059710a43a263fad3b..b1d7ff43dabc3b0d8c57fd99245635f6f3f08357 100644 (file)
--- 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() {