From e8e40df6cd094ce5d9cf04585fe350698728516b Mon Sep 17 00:00:00 2001
From: Bernard Cafarelli <voyageur@gentoo.org>
Date: Sun, 29 Mar 2020 17:14:50 +0200
Subject: x11-libs/libdockapp: revision bum, proper fix for -fno-common

display should be defined in lib itself, not dockapps

Closes: https://bugs.gentoo.org/715322
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>
---
 .../files/libdockapp-0.7.2-fno-common.patch        | 13 +++++-
 x11-libs/libdockapp/libdockapp-0.7.2-r1.ebuild     | 46 ----------------------
 x11-libs/libdockapp/libdockapp-0.7.2-r2.ebuild     | 46 ++++++++++++++++++++++
 3 files changed, 58 insertions(+), 47 deletions(-)
 delete mode 100644 x11-libs/libdockapp/libdockapp-0.7.2-r1.ebuild
 create mode 100644 x11-libs/libdockapp/libdockapp-0.7.2-r2.ebuild

(limited to 'x11-libs/libdockapp')

diff --git a/x11-libs/libdockapp/files/libdockapp-0.7.2-fno-common.patch b/x11-libs/libdockapp/files/libdockapp-0.7.2-fno-common.patch
index 4ba90efe3faf..80f54c88cf26 100644
--- a/x11-libs/libdockapp/files/libdockapp-0.7.2-fno-common.patch
+++ b/x11-libs/libdockapp/files/libdockapp-0.7.2-fno-common.patch
@@ -1,6 +1,17 @@
+diff -Naur libdockapp-0.7.2.orig/src/wmgeneral.c libdockapp-0.7.2/src/wmgeneral.c
+--- libdockapp-0.7.2.orig/src/wmgeneral.c	2015-10-27 10:32:25.000000000 +0100
++++ libdockapp-0.7.2/src/wmgeneral.c	2020-03-29 17:12:56.648083089 +0200
+@@ -85,6 +85,7 @@
+ GC			NormalGC;
+ XpmIcon		wmgen;
+ Pixmap		pixmask;
++Display		*display;
+ 
+   /*****************/
+  /* Mouse Regions */
 diff -Naur libdockapp-0.7.2.orig/src/wmgeneral.h libdockapp-0.7.2/src/wmgeneral.h
 --- libdockapp-0.7.2.orig/src/wmgeneral.h	2015-10-27 10:32:25.000000000 +0100
-+++ libdockapp-0.7.2/src/wmgeneral.h	2020-03-28 14:33:25.070622841 +0100
++++ libdockapp-0.7.2/src/wmgeneral.h	2020-03-29 17:12:41.411042265 +0200
 @@ -66,7 +66,7 @@
   /* Global variable */
  /*******************/
diff --git a/x11-libs/libdockapp/libdockapp-0.7.2-r1.ebuild b/x11-libs/libdockapp/libdockapp-0.7.2-r1.ebuild
deleted file mode 100644
index 146ca4db16de..000000000000
--- a/x11-libs/libdockapp/libdockapp-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools font
-
-DESCRIPTION="Window Maker Dock Applet Library"
-HOMEPAGE="https://www.dockapps.net/libdockapp"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="MIT public-domain"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-# Required for font eclass
-IUSE="+X"
-REQUIRED_USE="X"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-FONT_S=${S}/fonts
-FONT_SUFFIX="gz"
-DOCS="README ChangeLog NEWS AUTHORS"
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
-src_prepare()
-{
-	default
-	eautoreconf
-}
-
-src_configure()
-{
-	# Font installation handled by font eclass
-	econf --without-font --without-examples
-}
-
-src_install()
-{
-	emake DESTDIR="${D}" install
-	font_src_install
-}
diff --git a/x11-libs/libdockapp/libdockapp-0.7.2-r2.ebuild b/x11-libs/libdockapp/libdockapp-0.7.2-r2.ebuild
new file mode 100644
index 000000000000..146ca4db16de
--- /dev/null
+++ b/x11-libs/libdockapp/libdockapp-0.7.2-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools font
+
+DESCRIPTION="Window Maker Dock Applet Library"
+HOMEPAGE="https://www.dockapps.net/libdockapp"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="MIT public-domain"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+# Required for font eclass
+IUSE="+X"
+REQUIRED_USE="X"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+FONT_S=${S}/fonts
+FONT_SUFFIX="gz"
+DOCS="README ChangeLog NEWS AUTHORS"
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+src_prepare()
+{
+	default
+	eautoreconf
+}
+
+src_configure()
+{
+	# Font installation handled by font eclass
+	econf --without-font --without-examples
+}
+
+src_install()
+{
+	emake DESTDIR="${D}" install
+	font_src_install
+}
-- 
cgit v1.2.3-65-gdbad