diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch | 60 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb | 2 |
2 files changed, 0 insertions, 62 deletions
diff --git a/meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch b/meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch deleted file mode 100644 index 40f81f0f74..0000000000 --- a/meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From 42f99a7a7b836f6f9704a7b1747eb722c93446ec Mon Sep 17 00:00:00 2001 | ||
5 | From: Alan Coopersmith <alan.coopersmith@oracle.com> | ||
6 | Date: Mon, 23 Apr 2012 14:28:39 +0000 | ||
7 | Subject: include config.h before stdio.h & other system headers | ||
8 | |||
9 | Ensures definitions like _GNU_SOURCE are visible when needed. | ||
10 | |||
11 | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> | ||
12 | Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
13 | --- | ||
14 | diff --git a/exec.c b/exec.c | ||
15 | index dbcb669..419b10e 100644 | ||
16 | --- a/exec.c | ||
17 | +++ b/exec.c | ||
18 | @@ -54,6 +54,10 @@ from The Open Group. | ||
19 | * original xmodmap, written by David Rosenthal, of Sun Microsystems. | ||
20 | */ | ||
21 | |||
22 | +#ifdef HAVE_CONFIG_H | ||
23 | +# include "config.h" | ||
24 | +#endif | ||
25 | + | ||
26 | #include <X11/Xos.h> | ||
27 | #include <X11/Xlib.h> | ||
28 | #include <stdio.h> | ||
29 | diff --git a/pf.c b/pf.c | ||
30 | index 0eb0f55..3f0c3f4 100644 | ||
31 | --- a/pf.c | ||
32 | +++ b/pf.c | ||
33 | @@ -26,6 +26,10 @@ from The Open Group. | ||
34 | |||
35 | */ | ||
36 | |||
37 | +#ifdef HAVE_CONFIG_H | ||
38 | +# include "config.h" | ||
39 | +#endif | ||
40 | + | ||
41 | #include <X11/Xos.h> | ||
42 | #include <X11/Xlib.h> | ||
43 | #include <stdio.h> | ||
44 | diff --git a/xmodmap.c b/xmodmap.c | ||
45 | index 58a8e70..0f89629 100644 | ||
46 | --- a/xmodmap.c | ||
47 | +++ b/xmodmap.c | ||
48 | @@ -26,6 +26,10 @@ from The Open Group. | ||
49 | |||
50 | */ | ||
51 | |||
52 | +#ifdef HAVE_CONFIG_H | ||
53 | +# include "config.h" | ||
54 | +#endif | ||
55 | + | ||
56 | #include <X11/Xos.h> | ||
57 | #include <X11/Xlib.h> | ||
58 | #include <stdio.h> | ||
59 | -- | ||
60 | cgit v0.9.0.2-2-gbebe | ||
diff --git a/meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb b/meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb index 65a55e3560..87efb76022 100644 --- a/meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb +++ b/meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb | |||
@@ -13,7 +13,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=272c17e96370e1e74773fa22d9989621" | |||
13 | 13 | ||
14 | PE = "1" | 14 | PE = "1" |
15 | 15 | ||
16 | SRC_URI += "file://gnu-source.patch" | ||
17 | |||
18 | SRC_URI[md5sum] = "5511da3361eea4eaa21427652c559e1c" | 16 | SRC_URI[md5sum] = "5511da3361eea4eaa21427652c559e1c" |
19 | SRC_URI[sha256sum] = "efe2e3c89858a2db3bdcf969f55f55d0af4f5007789198344de0595249a99fc3" | 17 | SRC_URI[sha256sum] = "efe2e3c89858a2db3bdcf969f55f55d0af4f5007789198344de0595249a99fc3" |