commit: 35db8d18eeb785d6cf17b660ba1bacb1f6fad6b5 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Fri Jan 31 11:52:42 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Fri Jan 31 11:53:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35db8d18
x11-misc/xvkbd: Fix CFLAGS=-fno-common Package-Manager: Portage-2.3.86, Repoman-2.3.20 Closes: https://bugs.gentoo.org/show_bug.cgi?id=707430 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch | 22 ++++++++++++++++++++++ x11-misc/xvkbd/xvkbd-4.0.ebuild | 3 ++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch b/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch new file mode 100644 index 00000000000..1ca0db04856 --- /dev/null +++ b/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch @@ -0,0 +1,22 @@ +--- a/resources.h ++++ b/resources.h +@@ -19,7 +19,7 @@ + # define PROGRAM_NAME "xvkbd" + #endif + +-struct appres_struct { ++extern struct appres_struct { + String description; + String show_manual_command; + +--- a/xvkbd.c ++++ b/xvkbd.c +@@ -500,6 +500,8 @@ + + static Pixmap xvkbd_pixmap = None; + ++struct appres_struct appres; ++ + static int AddKeysym(KeySym keysym, Boolean top); /* forward */ + static void MakeKeyboard(Boolean remake); + static void MakeKeypad(Widget form, Widget from_vert, Widget from_horiz); diff --git a/x11-misc/xvkbd/xvkbd-4.0.ebuild b/x11-misc/xvkbd/xvkbd-4.0.ebuild index 90d49c1f04f..90be10d4030 100644 --- a/x11-misc/xvkbd/xvkbd-4.0.ebuild +++ b/x11-misc/xvkbd/xvkbd-4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -27,6 +27,7 @@ DEPEND=" " PATCHES=( "${FILESDIR}"/${PN}-4.0-destdir.patch + "${FILESDIR}"/${PN}-4.0-fno-common.patch ) src_prepare() {
