gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-17 02:39:08 -07:00
Code Issues Projects Releases Wiki Activity

x11-plugins/wmgrabimage: fix build with -fno-common

Browse Source 
Closes: https://bugs.gentoo.org/706836
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>
This commit is contained in:
Bernard Cafarelli
2020-02-02 12:27:33 +01:00
parent 7a7ae297c5
commit feb96a00dc
2 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
x11-plugins/wmgrabimage/files/wmgrabimage-0.72-gcc-10.patch Normal file
View File

@@ -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;
/***********************/

9
x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
View File

@@ -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() {