From c1eb239fdf5a90663dddb79c520bbacae2974687 Mon Sep 17 00:00:00 2001
From: Bernard Cafarelli <voyageur@gentoo.org>
Date: Sun, 29 Mar 2020 13:08:19 +0200
Subject: x11-plugins/wmcms: fix build with -fno-common

Latest libdockapp revbump now defines a global variable as extern

Bug: https://bugs.gentoo.org/715260
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>
---
 .../wmcms/files/wmcms-0.3.5-fno-common.patch       | 11 +++++++
 x11-plugins/wmcms/wmcms-0.3.5-r3.ebuild            | 32 -------------------
 x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild            | 36 ++++++++++++++++++++++
 3 files changed, 47 insertions(+), 32 deletions(-)
 create mode 100644 x11-plugins/wmcms/files/wmcms-0.3.5-fno-common.patch
 delete mode 100644 x11-plugins/wmcms/wmcms-0.3.5-r3.ebuild
 create mode 100644 x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild

(limited to 'x11-plugins/wmcms')

diff --git a/x11-plugins/wmcms/files/wmcms-0.3.5-fno-common.patch b/x11-plugins/wmcms/files/wmcms-0.3.5-fno-common.patch
new file mode 100644
index 000000000000..3b060769667c
--- /dev/null
+++ b/x11-plugins/wmcms/files/wmcms-0.3.5-fno-common.patch
@@ -0,0 +1,11 @@
+diff -Naur wmcms-0.3.5.orig/wmcms.c wmcms-0.3.5/wmcms.c
+--- wmcms-0.3.5.orig/wmcms.c	2001-09-24 00:57:06.000000000 +0200
++++ wmcms-0.3.5/wmcms.c	2020-03-29 13:04:56.465162877 +0200
+@@ -28,6 +28,7 @@
+ GC gc;
+ Pixmap pixmap;
+ Pixmap backdrop;
++Display *display;
+ 
+ int advanced;
+ int up;
diff --git a/x11-plugins/wmcms/wmcms-0.3.5-r3.ebuild b/x11-plugins/wmcms/wmcms-0.3.5-r3.ebuild
deleted file mode 100644
index 3c00c746459e..000000000000
--- a/x11-plugins/wmcms/wmcms-0.3.5-r3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="WindowMaker CPU and Memory Usage Monitor Dock App"
-HOMEPAGE="https://www.geocities.ws/neofpo/wmcms.html"
-SRC_URI="https://www.geocities.ws/neofpo/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=x11-libs/libdockapp-0.7:="
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/wmcms-0.3.5-s4t4n.patch
-
-	# Respect LDFLAGS, see bug #335031
-	sed -e 's/ -o wmcms/ ${LDFLAGS} -o wmcms/' -i Makefile || die
-
-	sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin wmcms
-}
diff --git a/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild b/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild
new file mode 100644
index 000000000000..cddbcd6bd97d
--- /dev/null
+++ b/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="WindowMaker CPU and Memory Usage Monitor Dock App"
+HOMEPAGE="https://www.geocities.ws/neofpo/wmcms.html"
+SRC_URI="https://www.geocities.ws/neofpo/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=x11-libs/libdockapp-0.7-r1:="
+
+PATCHES=(
+	"${FILESDIR}"/${P}-s4t4n.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_prepare() {
+	default
+
+	# Respect LDFLAGS, see bug #335031
+	sed -e 's/ -o wmcms/ ${LDFLAGS} -o wmcms/' -i Makefile || die
+
+	sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin wmcms
+}
-- 
cgit v1.2.3-18-g5258