From e8e40df6cd094ce5d9cf04585fe350698728516b Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Sun, 29 Mar 2020 17:14:50 +0200 Subject: [PATCH] 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 --- .../files/libdockapp-0.7.2-fno-common.patch | 13 ++++++++++++- ...p-0.7.2-r1.ebuild => libdockapp-0.7.2-r2.ebuild} | 0 2 files changed, 12 insertions(+), 1 deletion(-) rename x11-libs/libdockapp/{libdockapp-0.7.2-r1.ebuild => libdockapp-0.7.2-r2.ebuild} (100%) 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-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 -- 2.26.2