[gentoo-commits] repo/gentoo:master commit in: x11-libs/libdockapp/, x11-libs/libdockapp/files/

[Bernard Cafarelli]

commit:     e8e40df6cd094ce5d9cf04585fe350698728516b
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 15:14:50 2020 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 15:16:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8e40df6

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 <AT> gentoo.org>

 x11-libs/libdockapp/files/libdockapp-0.7.2-fno-common.patch | 13 ++++++++++++-
 ...ibdockapp-0.7.2-r1.ebuild => libdockapp-0.7.2-r2.ebuild} |  0
 2 files changed, 12 insertions(+), 1 deletion(-)

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 4ba90efe3fa..80f54c88cf2 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-r2.ebuild
similarity index 100%
rename from x11-libs/libdockapp/libdockapp-0.7.2-r1.ebuild
rename to x11-libs/libdockapp/libdockapp-0.7.2-r2.ebuild