summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-04-12 10:59:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-12 17:00:44 +0100
commit8e5c349156fd24c7f779ada29e2de018ad5b15f4 (patch)
tree9339d737175ae6e3a8a53816cb9af21e1fcf3cd3 /meta/recipes-graphics
parent48f827e7d7fdeea609bdfca38bc0ce0ac16d471f (diff)
downloadpoky-8e5c349156fd24c7f779ada29e2de018ad5b15f4.tar.gz
xmodmap: fix compile with gcc 4.8
With gcc 4.8 there are compile errors: xmodmap.c:289:5: error: implicit declaration of function 'asprintf' [-Werror=implicit-function-declaration] (and more) These have been fixed upstream so take the patch from git until 1.0.8 is released. (From OE-Core rev: 3a4ce4bd2b1ab7834edabbaf63acb18113cf1907) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch60
-rw-r--r--meta/recipes-graphics/xorg-app/xmodmap_1.0.7.bb2
2 files changed, 62 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch b/meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch
new file mode 100644
index 0000000000..84bd973764
--- /dev/null
+++ b/meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch
@@ -0,0 +1,60 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 42f99a7a7b836f6f9704a7b1747eb722c93446ec Mon Sep 17 00:00:00 2001
5From: Alan Coopersmith <alan.coopersmith@oracle.com>
6Date: Mon, 23 Apr 2012 14:28:39 +0000
7Subject: include config.h before stdio.h & other system headers
8
9Ensures definitions like _GNU_SOURCE are visible when needed.
10
11Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
12Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
13---
14diff --git a/exec.c b/exec.c
15index 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>
29diff --git a/pf.c b/pf.c
30index 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>
44diff --git a/xmodmap.c b/xmodmap.c
45index 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--
60cgit v0.9.0.2-2-gbebe \ No newline at end of file
diff --git a/meta/recipes-graphics/xorg-app/xmodmap_1.0.7.bb b/meta/recipes-graphics/xorg-app/xmodmap_1.0.7.bb
index fab1b167e6..573eecbe58 100644
--- a/meta/recipes-graphics/xorg-app/xmodmap_1.0.7.bb
+++ b/meta/recipes-graphics/xorg-app/xmodmap_1.0.7.bb
@@ -14,5 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eef098b27f09d0ac39268df0cc2c00b5"
14PR = "${INC_PR}.0" 14PR = "${INC_PR}.0"
15PE = "1" 15PE = "1"
16 16
17SRC_URI += "file://gnu-source.patch"
18
17SRC_URI[md5sum] = "d9b65f6881afe0d6d9863b30e1081bde" 19SRC_URI[md5sum] = "d9b65f6881afe0d6d9863b30e1081bde"
18SRC_URI[sha256sum] = "ef22ede9c4a3c720da539292c6911515a8408e618e0dec6aa2196ee2153de4b5" 20SRC_URI[sha256sum] = "ef22ede9c4a3c720da539292c6911515a8408e618e0dec6aa2196ee2153de4b5"