| 1 |
commit: 35db8d18eeb785d6cf17b660ba1bacb1f6fad6b5 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 31 11:52:42 2020 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 31 11:53:03 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35db8d18 |
| 7 |
|
| 8 |
x11-misc/xvkbd: Fix CFLAGS=-fno-common |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
| 11 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=707430 |
| 12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 13 |
|
| 14 |
x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch | 22 ++++++++++++++++++++++ |
| 15 |
x11-misc/xvkbd/xvkbd-4.0.ebuild | 3 ++- |
| 16 |
2 files changed, 24 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch b/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..1ca0db04856 |
| 21 |
--- /dev/null |
| 22 |
+++ b/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch |
| 23 |
@@ -0,0 +1,22 @@ |
| 24 |
+--- a/resources.h |
| 25 |
++++ b/resources.h |
| 26 |
+@@ -19,7 +19,7 @@ |
| 27 |
+ # define PROGRAM_NAME "xvkbd" |
| 28 |
+ #endif |
| 29 |
+ |
| 30 |
+-struct appres_struct { |
| 31 |
++extern struct appres_struct { |
| 32 |
+ String description; |
| 33 |
+ String show_manual_command; |
| 34 |
+ |
| 35 |
+--- a/xvkbd.c |
| 36 |
++++ b/xvkbd.c |
| 37 |
+@@ -500,6 +500,8 @@ |
| 38 |
+ |
| 39 |
+ static Pixmap xvkbd_pixmap = None; |
| 40 |
+ |
| 41 |
++struct appres_struct appres; |
| 42 |
++ |
| 43 |
+ static int AddKeysym(KeySym keysym, Boolean top); /* forward */ |
| 44 |
+ static void MakeKeyboard(Boolean remake); |
| 45 |
+ static void MakeKeypad(Widget form, Widget from_vert, Widget from_horiz); |
| 46 |
|
| 47 |
diff --git a/x11-misc/xvkbd/xvkbd-4.0.ebuild b/x11-misc/xvkbd/xvkbd-4.0.ebuild |
| 48 |
index 90d49c1f04f..90be10d4030 100644 |
| 49 |
--- a/x11-misc/xvkbd/xvkbd-4.0.ebuild |
| 50 |
+++ b/x11-misc/xvkbd/xvkbd-4.0.ebuild |
| 51 |
@@ -1,4 +1,4 @@ |
| 52 |
-# Copyright 1999-2019 Gentoo Authors |
| 53 |
+# Copyright 1999-2020 Gentoo Authors |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
|
| 56 |
EAPI=7 |
| 57 |
@@ -27,6 +27,7 @@ DEPEND=" |
| 58 |
" |
| 59 |
PATCHES=( |
| 60 |
"${FILESDIR}"/${PN}-4.0-destdir.patch |
| 61 |
+ "${FILESDIR}"/${PN}-4.0-fno-common.patch |
| 62 |
) |
| 63 |
|
| 64 |
src_prepare() { |
Archives