summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-09-22 14:46:13 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-09-22 14:46:13 +0000
commit8321809b1f22e0febe54306563d10f77abca4013 (patch)
tree34f9b822ce8359d72c4a1fabf65740fc0a21a4ef /meta/packages
parent565180719bbf2fd78334a357b8d8760a6156cac3 (diff)
downloadpoky-8321809b1f22e0febe54306563d10f77abca4013.tar.gz
libx11-trim: fix location on keysymdef.h
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5214 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/xorg-lib/libx11-trim/include_fix.patch23
-rw-r--r--meta/packages/xorg-lib/libx11-trim_1.1.5.bb5
2 files changed, 27 insertions, 1 deletions
diff --git a/meta/packages/xorg-lib/libx11-trim/include_fix.patch b/meta/packages/xorg-lib/libx11-trim/include_fix.patch
new file mode 100644
index 0000000000..99ed57194e
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-trim/include_fix.patch
@@ -0,0 +1,23 @@
1---
2 configure.ac | 6 +++---
3 1 file changed, 3 insertions(+), 3 deletions(-)
4
5--- libX11-1.1.5.orig/configure.ac
6+++ libX11-1.1.5/configure.ac
7@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
8 AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
9
10 #
11 # Find keysymdef.h
12 #
13-AC_MSG_CHECKING([keysymdef.h])
14-dir=`pkg-config --variable=includedir xproto`
15-KEYSYMDEF="$dir/X11/keysymdef.h"
16+AC_ARG_WITH(keysymdef,
17+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
18+ KEYSYMDEF=$withval, KEYSYMDEF="")
19 if test -f "$KEYSYMDEF"; then
20 AC_MSG_RESULT([$KEYSYMDEF])
21 else
22 AC_MSG_ERROR([Cannot find keysymdef.h])
23 fi
diff --git a/meta/packages/xorg-lib/libx11-trim_1.1.5.bb b/meta/packages/xorg-lib/libx11-trim_1.1.5.bb
index 659b7ba5b0..77f0d28341 100644
--- a/meta/packages/xorg-lib/libx11-trim_1.1.5.bb
+++ b/meta/packages/xorg-lib/libx11-trim_1.1.5.bb
@@ -9,11 +9,14 @@ DEPENDS += "libxcb xproto xextproto xtrans libxau"
9PROVIDES = "virtual/libx11" 9PROVIDES = "virtual/libx11"
10 10
11PE = "1" 11PE = "1"
12PR = "r0" 12PR = "r1"
13 13
14XORG_PN = "libX11" 14XORG_PN = "libX11"
15LEAD_SONAME = "libX11.so" 15LEAD_SONAME = "libX11.so"
16 16
17SRC_URI += "file://include_fix.patch;patch=1"
18
19EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
17#EXTRA_OECONF += "--disable-xlocale --disable-xcms --with-xcb" 20#EXTRA_OECONF += "--disable-xlocale --disable-xcms --with-xcb"
18EXTRA_OECONF += "--disable-xcms --with-xcb" 21EXTRA_OECONF += "--disable-xcms --with-xcb"
19 22