gentoo Easter resync : 12.04.2020

3 files changed, 71 insertions, 0 deletions

diff --git a/x11-libs/libdockapp/Manifest b/x11-libs/libdockapp/Manifest
index 8c3e566b34fd..36720921997f 100644
--- a/x11-libs/libdockapp/Manifest
+++ b/x11-libs/libdockapp/Manifest
@@ -1,3 +1,5 @@
+AUX libdockapp-0.7.2-fno-common.patch 775 BLAKE2B 33d2f778c6e68ff4b8d4a198ffaa0dcd575711b999811b201cf54625eabea928e7512551fbd9234105c07b39b8d9f109ed39b9ed686a166a748ef72fa5bb365a SHA512 ee7b9b097ddddc47f1600a5cefae756a2ddb9f7e1e6a559baef090cdd60450f5f1ad7e8c705ecc87958957959574828fe6cc8dc5bf7ff992813a7a96192fe624
 DIST libdockapp-0.7.2.tar.gz 40462 BLAKE2B 8d4d2e3d9b1856875a275661cba809852e7c91867ffae33052bc472208db911c19caf1b77b16e367f007e1606be6add6d9bc5a1e76ea8fa2b8616163e922f21e SHA512 a2f216ac1105abe0efbea191691bae986b6022510f96c78b08c1b809cff131794c81810197af7d1321f9b248202376cc7092e79a4d4afa3fb93e9ed8000c9d79
+EBUILD libdockapp-0.7.2-r2.ebuild 892 BLAKE2B e5af18f8d50ac9ff2fd3c410867bc2d4469f30addc9d47e3f248c20f5babd751414318acfd63ee0ada89565a48b2740c4d9d1f54b3008499250d44e8d7ca9c0c SHA512 4db9eb1c9b743aafd5640a5ae4ee0f820adbbb8544d6101c8fd561663056a41d80e5a09dd87f859303ac0bf5548999db14c5fa72c5373973d630261cba242f04
 EBUILD libdockapp-0.7.2.ebuild 830 BLAKE2B aaec8142bd21ced4cbff4e9e229dd6384a853822b2daaaa1b9053c8637c813408fc150c2088f049ab7eeb71ededdfdb932adc8c0978417a3bfb1fbc600a3a417 SHA512 ce7f15c60ee3dc001fd2bad5366193c0d41cfeb0b3b1a4291a0454cf5ed5d53f78e3933259f61240b3e2339825a0d8321662bc1ba0cbb625502199235cdcf1cc
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
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
new file mode 100644
index 000000000000..80f54c88cf26
--- /dev/null
+++ b/x11-libs/libdockapp/files/libdockapp-0.7.2-fno-common.patch
@@ -0,0 +1,23 @@
+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-29 17:12:41.411042265 +0200
+@@ -66,7 +66,7 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
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
+}