From 6536414a46b00ee3ecf237329e648f6f3695885e Mon Sep 17 00:00:00 2001 From: CvH Date: Fri, 5 Jul 2019 19:48:31 +0200 Subject: [PATCH] libX11: fix cross-compiling --- .../libX11-makekeys-remove-X11-headers.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 packages/x11/lib/libX11/patches/libX11-makekeys-remove-X11-headers.patch diff --git a/packages/x11/lib/libX11/patches/libX11-makekeys-remove-X11-headers.patch b/packages/x11/lib/libX11/patches/libX11-makekeys-remove-X11-headers.patch new file mode 100644 index 0000000000..f96acea1f4 --- /dev/null +++ b/packages/x11/lib/libX11/patches/libX11-makekeys-remove-X11-headers.patch @@ -0,0 +1,37 @@ +https://github.com/mirror/libX11/commit/0327c427d62f671eced067c6d9b69f4e216a8cac +upstream in > 1.6.8 + +From: Adam Jackson +Date: Mon, 17 Jun 2019 13:36:08 -0400 +Subject: [PATCH] makekeys: Detach ourselves from X headers entirely + +Subsequent to a121b7b0c210efe10bf93453b29050282324c906 we are no longer +building makekeys with enough -I/foo/bar to find the X11 headers, so if +they're not in a system include path, things fail. Since this utility is +only needed at build time, there's no real reason to demand the X +headers be installed for both the build and target machines if cross- +compiling, we can just assume a vaguely ANSI environment instead. + +Tested-by: Niclas Zeising +Reviewed-by: Keith Packard +Reviewed-by: Matt Turner +--- + src/util/makekeys.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/util/makekeys.c b/src/util/makekeys.c +index bcb5b7d5..07563315 100644 +--- a/src/util/makekeys.c ++++ b/src/util/makekeys.c +@@ -35,8 +35,10 @@ from The Open Group. + #include + #include + #include ++#include ++#include + +-#include "../Xresinternal.h" ++typedef uint32_t Signature; + + #define KTNUM 4000 +