summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch b/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch
deleted file mode 100644
index 803f8b408c..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From cf2ef27831173c5ed6f98be3c39caff18fd4e7f1 Mon Sep 17 00:00:00 2001
5From: Adam Jackson <ajax@redhat.com>
6Date: Mon, 17 Jun 2019 13:36:08 -0400
7Subject: [PATCH 1/2] makekeys: Detach ourselves from X headers entirely
8
9Subsequent to a121b7b0c210efe10bf93453b29050282324c906 we are no longer
10building makekeys with enough -I/foo/bar to find the X11 headers, so if
11they're not in a system include path, things fail. Since this utility is
12only needed at build time, there's no real reason to demand the X
13headers be installed for both the build and target machines if cross-
14compiling, we can just assume a vaguely ANSI environment instead.
15
16Tested-by: Niclas Zeising <zeising@daemonic.se>
17Reviewed-by: Keith Packard <keithp@keithp.com>
18Reviewed-by: Matt Turner <mattst88@gmail.com>
19---
20 src/util/makekeys.c | 4 +++-
21 1 file changed, 3 insertions(+), 1 deletion(-)
22
23diff --git a/src/util/makekeys.c b/src/util/makekeys.c
24index bcb5b7d5..07563315 100644
25--- a/src/util/makekeys.c
26+++ b/src/util/makekeys.c
27@@ -35,8 +35,10 @@ from The Open Group.
28 #include <stdio.h>
29 #include <stdlib.h>
30 #include <string.h>
31+#include <stdint.h>
32+#include <inttypes.h>
33
34-#include "../Xresinternal.h"
35+typedef uint32_t Signature;
36
37 #define KTNUM 4000
38
39--
402.20.1