diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2020-01-30 01:49:54 +0100 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2020-01-30 01:50:07 +0100 |
| commit | 0cdaafbc70e98049d121e700b32d29006dd4f7c6 (patch) | |
| tree | 9c8f38819e3db4fa408525830fb023be051055d6 /x11-plugins/wmmand | |
| parent | x11-base/xcb-proto: Drop support for Python 2.7. (diff) | |
| download | gentoo-0cdaafbc70e98049d121e700b32d29006dd4f7c6.tar.gz gentoo-0cdaafbc70e98049d121e700b32d29006dd4f7c6.tar.bz2 gentoo-0cdaafbc70e98049d121e700b32d29006dd4f7c6.zip | |
x11-plugins/wmmand: fix build with -fno-common
Closes: https://bugs.gentoo.org/706826
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>
Diffstat (limited to 'x11-plugins/wmmand')
| -rw-r--r-- | x11-plugins/wmmand/files/wmmand-1.3.2-gcc-10.patch | 39 | ||||
| -rw-r--r-- | x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild | 5 |
2 files changed, 43 insertions, 1 deletions
diff --git a/x11-plugins/wmmand/files/wmmand-1.3.2-gcc-10.patch b/x11-plugins/wmmand/files/wmmand-1.3.2-gcc-10.patch new file mode 100644 index 000000000000..3d47e700e681 --- /dev/null +++ b/x11-plugins/wmmand/files/wmmand-1.3.2-gcc-10.patch @@ -0,0 +1,39 @@ +diff -Naur wmMand-1.3.2.orig/wmgeneral/wmgeneral.c wmMand-1.3.2/wmgeneral/wmgeneral.c +--- wmMand-1.3.2.orig/wmgeneral/wmgeneral.c 2006-10-16 20:56:44.000000000 +0200 ++++ wmMand-1.3.2/wmgeneral/wmgeneral.c 2020-01-30 01:48:11.662044413 +0100 +@@ -45,6 +45,13 @@ + Pixel back_pix, fore_pix; + char *Geometry = ""; + Pixmap pixmask; ++Display *display; ++Window *Root; ++int d_depth; ++GC NormalGC; ++XpmIcon wmgen; ++Window iconwin, win; ++ + + /*****************/ + /* Mouse Regions */ +diff -Naur wmMand-1.3.2.orig/wmgeneral/wmgeneral.h wmMand-1.3.2/wmgeneral/wmgeneral.h +--- wmMand-1.3.2.orig/wmgeneral/wmgeneral.h 2006-10-16 20:56:44.000000000 +0200 ++++ wmMand-1.3.2/wmgeneral/wmgeneral.h 2020-01-30 01:47:43.262040337 +0100 +@@ -28,12 +28,12 @@ + /* Global variable */ + /*******************/ + +-Display *display; +-Window Root; +-int d_depth; +-GC NormalGC; +-XpmIcon wmgen; +-Window iconwin, win; ++extern Display *display; ++extern Window *Root; ++extern int d_depth; ++extern GC NormalGC; ++extern XpmIcon wmgen; ++extern Window iconwin, win; + + + /***********************/ diff --git a/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild b/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild index 95d390651648..fb66e91df2b3 100644 --- a/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild +++ b/x11-plugins/wmmand/wmmand-1.3.2-r1.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=6 @@ -28,6 +28,9 @@ DOCS=( ../{BUGS,changelog,TODO} ) src_prepare() { default gunzip wmMand.6.gz || die + + pushd "${WORKDIR}"/${MY_P} || die + eapply "${FILESDIR}"/${P}-gcc-10.patch } src_compile() { |