| 1 |
commit: 0cdaafbc70e98049d121e700b32d29006dd4f7c6 |
| 2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 30 00:49:54 2020 +0000 |
| 4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 30 00:50:07 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cdaafbc |
| 7 |
|
| 8 |
x11-plugins/wmmand: fix build with -fno-common |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/706826 |
| 11 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
| 12 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
| 13 |
|
| 14 |
x11-plugins/wmmand/files/wmmand-1.3.2-gcc-10.patch | 39 ++++++++++++++++++++++ |
| 15 |
x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild | 5 ++- |
| 16 |
2 files changed, 43 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..3d47e700e68 |
| 21 |
--- /dev/null |
| 22 |
+++ b/x11-plugins/wmmand/files/wmmand-1.3.2-gcc-10.patch |
| 23 |
@@ -0,0 +1,39 @@ |
| 24 |
+diff -Naur wmMand-1.3.2.orig/wmgeneral/wmgeneral.c wmMand-1.3.2/wmgeneral/wmgeneral.c |
| 25 |
+--- wmMand-1.3.2.orig/wmgeneral/wmgeneral.c 2006-10-16 20:56:44.000000000 +0200 |
| 26 |
++++ wmMand-1.3.2/wmgeneral/wmgeneral.c 2020-01-30 01:48:11.662044413 +0100 |
| 27 |
+@@ -45,6 +45,13 @@ |
| 28 |
+ Pixel back_pix, fore_pix; |
| 29 |
+ char *Geometry = ""; |
| 30 |
+ Pixmap pixmask; |
| 31 |
++Display *display; |
| 32 |
++Window *Root; |
| 33 |
++int d_depth; |
| 34 |
++GC NormalGC; |
| 35 |
++XpmIcon wmgen; |
| 36 |
++Window iconwin, win; |
| 37 |
++ |
| 38 |
+ |
| 39 |
+ /*****************/ |
| 40 |
+ /* Mouse Regions */ |
| 41 |
+diff -Naur wmMand-1.3.2.orig/wmgeneral/wmgeneral.h wmMand-1.3.2/wmgeneral/wmgeneral.h |
| 42 |
+--- wmMand-1.3.2.orig/wmgeneral/wmgeneral.h 2006-10-16 20:56:44.000000000 +0200 |
| 43 |
++++ wmMand-1.3.2/wmgeneral/wmgeneral.h 2020-01-30 01:47:43.262040337 +0100 |
| 44 |
+@@ -28,12 +28,12 @@ |
| 45 |
+ /* Global variable */ |
| 46 |
+ /*******************/ |
| 47 |
+ |
| 48 |
+-Display *display; |
| 49 |
+-Window Root; |
| 50 |
+-int d_depth; |
| 51 |
+-GC NormalGC; |
| 52 |
+-XpmIcon wmgen; |
| 53 |
+-Window iconwin, win; |
| 54 |
++extern Display *display; |
| 55 |
++extern Window *Root; |
| 56 |
++extern int d_depth; |
| 57 |
++extern GC NormalGC; |
| 58 |
++extern XpmIcon wmgen; |
| 59 |
++extern Window iconwin, win; |
| 60 |
+ |
| 61 |
+ |
| 62 |
+ /***********************/ |
| 63 |
|
| 64 |
diff --git a/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild b/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild |
| 65 |
index 95d39065164..fb66e91df2b 100644 |
| 66 |
--- a/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild |
| 67 |
+++ b/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild |
| 68 |
@@ -1,4 +1,4 @@ |
| 69 |
-# Copyright 1999-2018 Gentoo Foundation |
| 70 |
+# Copyright 1999-2020 Gentoo Authors |
| 71 |
# Distributed under the terms of the GNU General Public License v2 |
| 72 |
|
| 73 |
EAPI=6 |
| 74 |
@@ -28,6 +28,9 @@ DOCS=( ../{BUGS,changelog,TODO} ) |
| 75 |
src_prepare() { |
| 76 |
default |
| 77 |
gunzip wmMand.6.gz || die |
| 78 |
+ |
| 79 |
+ pushd "${WORKDIR}"/${MY_P} || die |
| 80 |
+ eapply "${FILESDIR}"/${P}-gcc-10.patch |
| 81 |
} |
| 82 |
|
| 83 |
src_compile() { |
Archives