diff options
author | Richard Purdie <richard@openedhand.com> | 2008-01-02 15:22:39 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-01-02 15:22:39 +0000 |
commit | fe60c6e3e5ad9bf301856e8b9f32b7d69397760d (patch) | |
tree | 131f97ff95ebad4b9c9152e5681724b2e8b29237 | |
parent | f8b1fd4926f7dcba35d4e074225ba186b25e8f0d (diff) | |
download | poky-fe60c6e3e5ad9bf301856e8b9f32b7d69397760d.tar.gz |
libx11: Apply the keysymdef.h fix to libx11 as well as diet-x11
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3399 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r-- | meta/packages/xorg-lib/diet-x11_1.1.2.bb | 2 | ||||
-rw-r--r-- | meta/packages/xorg-lib/libx11_1.1.2.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/packages/xorg-lib/diet-x11_1.1.2.bb b/meta/packages/xorg-lib/diet-x11_1.1.2.bb index 9f1e877ab8..d3b7dda4a4 100644 --- a/meta/packages/xorg-lib/diet-x11_1.1.2.bb +++ b/meta/packages/xorg-lib/diet-x11_1.1.2.bb | |||
@@ -4,5 +4,5 @@ SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ | |||
4 | file://fix-disable-xlocale.diff;patch=1 \ | 4 | file://fix-disable-xlocale.diff;patch=1 \ |
5 | file://fix-utf8-wrong-define.patch;patch=1" | 5 | file://fix-utf8-wrong-define.patch;patch=1" |
6 | 6 | ||
7 | EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" | 7 | EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" |
8 | CFLAGS += "-D_GNU_SOURCE" | 8 | CFLAGS += "-D_GNU_SOURCE" |
diff --git a/meta/packages/xorg-lib/libx11_1.1.2.bb b/meta/packages/xorg-lib/libx11_1.1.2.bb index a4400ae88e..c4a8d140f3 100644 --- a/meta/packages/xorg-lib/libx11_1.1.2.bb +++ b/meta/packages/xorg-lib/libx11_1.1.2.bb | |||
@@ -12,7 +12,7 @@ XORG_PN = "libX11" | |||
12 | SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ | 12 | SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ |
13 | file://include_fix.patch;patch=1" | 13 | file://include_fix.patch;patch=1" |
14 | 14 | ||
15 | EXTRA_OECONF += "--without-xcb" | 15 | EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" |
16 | 16 | ||
17 | do_compile() { | 17 | do_compile() { |
18 | ( | 18 | ( |