From a0bee79ecbed9685d4a969675a66c0f1ff6b10a7 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 20 Sep 2010 18:20:31 +0200
Subject: [PATCH] libX11: update to libX11-1.3.6

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/libX11/build                 |  3 ++-
 packages/x11/lib/libX11/install               |  2 --
 packages/x11/lib/libX11/meta                  |  2 +-
 .../patches/libX11-1.3.4-pkg_config.diff      | 20 -------------------
 4 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 packages/x11/lib/libX11/patches/libX11-1.3.4-pkg_config.diff

diff --git a/packages/x11/lib/libX11/build b/packages/x11/lib/libX11/build
index 15140d85d7..9f9d2c6337 100755
--- a/packages/x11/lib/libX11/build
+++ b/packages/x11/lib/libX11/build
@@ -7,9 +7,10 @@ export CPPFLAGS_FOR_BUILD="$HOST_CPPFLAGS"
 export CFLAGS_FOR_BUILD="$HOST_CFLAGS -I$SYSROOT_PREFIX/usr/include"
 export LDFLAGS_FOR_BUILD="$HOST_LDFLAGS"
 
+export PKG_CONFIG="$PKG_CONFIG --define-variable=prefix=$SYSROOT_PREFIX/usr"
+
 cd $PKG_BUILD
 
-$AUTORECONF
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
diff --git a/packages/x11/lib/libX11/install b/packages/x11/lib/libX11/install
index eba2d417c6..fb92b93ad1 100755
--- a/packages/x11/lib/libX11/install
+++ b/packages/x11/lib/libX11/install
@@ -6,5 +6,3 @@ mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/src/.libs/libX11*.so* $INSTALL/usr/lib
   rm -rf $INSTALL/usr/lib/libX11*.so*T
 
-mkdir -p $INSTALL/usr/share/X11
-  cp $PKG_BUILD/src/XKeysymDB $INSTALL/usr/share/X11
diff --git a/packages/x11/lib/libX11/meta b/packages/x11/lib/libX11/meta
index a78306e2bc..397da45389 100644
--- a/packages/x11/lib/libX11/meta
+++ b/packages/x11/lib/libX11/meta
@@ -1,5 +1,5 @@
 PKG_NAME="libX11"
-PKG_VERSION="1.3.5"
+PKG_VERSION="1.3.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
diff --git a/packages/x11/lib/libX11/patches/libX11-1.3.4-pkg_config.diff b/packages/x11/lib/libX11/patches/libX11-1.3.4-pkg_config.diff
deleted file mode 100644
index 8792a58516..0000000000
--- a/packages/x11/lib/libX11/patches/libX11-1.3.4-pkg_config.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur libX11-1.3.4-old/configure.ac libX11-1.3.4-new/configure.ac
---- libX11-1.3.4-old/configure.ac	2010-06-03 15:21:17.000000000 -0700
-+++ libX11-1.3.4-new/configure.ac	2010-06-09 16:06:19.000000000 -0700
-@@ -35,6 +35,7 @@
- DOLT
- AC_PROG_CC
- PKG_PROG_PKG_CONFIG
-+m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
- 
- if test x"$CC_FOR_BUILD" = x; then
- 	if test x"$cross_compiling" = xyes; then
-@@ -355,7 +356,7 @@
- # Find keysymdef.h
- #
- AC_MSG_CHECKING([keysymdef.h])
--dir=`$PKG_CONFIG --variable=includedir xproto`
-+dir=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir xproto`
- KEYSYMDEF="$dir/X11/keysymdef.h"
- if test -f "$KEYSYMDEF"; then
-         AC_MSG_RESULT([$KEYSYMDEF])