[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmdots/, x11-plugins/wmdots/files/

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmdots/, x11-plugins/wmdots/files/

[Bernard Cafarelli]

commit:     59f3ded139d77e75745a3fd95f9999bdb3668a9c
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  1 15:12:33 2020 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Mar  1 15:12:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59f3ded1

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

Closes: https://bugs.gentoo.org/707532
Package-Manager: Portage-2.3.90, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 .../wmdots/files/wmdots-0.2_beta-gcc-10.patch      | 27 ++++++++++++++++++++++
 x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild       |  4 ++++
 2 files changed, 31 insertions(+)

diff --git a/x11-plugins/wmdots/files/wmdots-0.2_beta-gcc-10.patch b/x11-plugins/wmdots/files/wmdots-0.2_beta-gcc-10.patch
new file mode 100644
index 00000000000..f4e522fe5cf
--- /dev/null
+++ b/x11-plugins/wmdots/files/wmdots-0.2_beta-gcc-10.patch
@@ -0,0 +1,27 @@
+diff -Naur wmdots.orig/wmdots/wmdots.c wmdots/wmdots/wmdots.c
+--- wmdots.orig/wmdots/wmdots.c	1999-10-11 21:39:11.000000000 +0200
++++ wmdots/wmdots/wmdots.c	2020-03-01 16:08:39.492275206 +0100
+@@ -315,6 +315,9 @@
+ //   10,30,&y_off,-5,30,10
+ // };
+ 
++Display		*display;
++Window          Root, iconwin, win;
++
+ // -----------------------------------------------------------------------
+ // draw a point at x/y in specified colour
+ 
+diff -Naur wmdots.orig/wmgeneral/wmgeneral.h wmdots/wmgeneral/wmgeneral.h
+--- wmdots.orig/wmgeneral/wmgeneral.h	1998-10-16 02:16:59.000000000 +0200
++++ wmdots/wmgeneral/wmgeneral.h	2020-03-01 16:08:45.412276631 +0100
+@@ -36,8 +36,8 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
+-Window          Root, iconwin, win;
++extern Display		*display;
++extern Window          Root, iconwin, win;
+ 
+ 
+   /***********************/

diff --git a/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild b/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild
index 5aaba6401e1..7c4b91c7072 100644
--- a/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild
+++ b/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild
@@ -21,6 +21,10 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
+	pushd "${WORKDIR}" || die
+	eapply "${FILESDIR}"/${P}-gcc-10.patch
+	popd || die
+
 	default
 	eapply "${FILESDIR}"/${P}-stringh.patch
 	sed -e "s|cc|$(tc-getCC)|g" \