disapproval of revision 'a401f056cbb46280404f6c12df651daa04170ccf'

4 files changed, 7 insertions, 80 deletions

diff --git a/packages/xorg-lib/libx11/fix-searching-for-keysymdef.patch b/packages/xorg-lib/libx11/fix-searching-for-keysymdef.patch
deleted file mode 100644
index 565308834e..0000000000
--- a/packages/xorg-lib/libx11/fix-searching-for-keysymdef.patch
+++ /dev/null
@@ -1,62 +0,0 @@
----
- configure.ac |   44 ++++++++++++++++++++++++--------------------
- 1 file changed, 24 insertions(+), 20 deletions(-)
-
-Index: libX11-1.1.2/configure.ac
-===================================================================
---- libX11-1.1.2.orig/configure.ac	2008-01-02 15:30:47.000000000 +0000
-+++ libX11-1.1.2/configure.ac	2008-01-02 15:47:25.000000000 +0000
-@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
- #
- KEYSYMDEF=""
- AC_MSG_CHECKING([keysymdef.h])
--for flag in $XPROTO_CFLAGS -I/usr/include; do
--	case "$KEYSYMDEF" in
--	"")
--		case "$flag" in
--		*-I*)
--			dir=`echo "$flag" | sed 's/ *-I//'`
--			file="$dir/X11/keysymdef.h"
--			if test -f "$file"; then
--				KEYSYMDEF="$file"
--			fi
-+AC_ARG_WITH(keysymdef,
-+	AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),  
-+	KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+	for flag in $XPROTO_CFLAGS -I/usr/include; do
-+		case "$KEYSYMDEF" in
-+		"")
-+			case "$flag" in
-+			*-I*)
-+				dir=`echo "$flag" | sed 's/ *-I//'`
-+				file="$dir/X11/keysymdef.h"
-+				if test -f "$file"; then
-+					KEYSYMDEF="$file"
-+				fi
-+				;;
-+			esac
- 			;;
- 		esac
--		;;
--	esac
--done
--case "$KEYSYMDEF" in
--"")
--	AC_MSG_ERROR([Cannot find keysymdef.h])
--	;;
--*)
-+	done
-+fi
-+
-+if test -f "$KEYSYMDEF"; then
- 	AC_MSG_RESULT([$KEYSYMDEF])
--        ;;
--esac
-+else
-+	AC_MSG_ERROR([Cannot find keysymdef.h])
-+fi
- AC_SUBST(KEYSYMDEF)
- 
- AC_ARG_ENABLE(udc,
diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb
index 41497fc873..5b1e304d51 100644
--- a/packages/xorg-lib/libx11_1.1.1.bb
+++ b/packages/xorg-lib/libx11_1.1.1.bb
@@ -1,6 +1,6 @@
 require xorg-lib-common.inc
 PE = "1"
-PR = "r6"
+PR = "r5"
 
 DESCRIPTION = "Base X libs."
 DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
@@ -9,12 +9,9 @@ PROVIDES = "virtual/libx11"
 
 XORG_PN = "libX11"
 
-EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
+EXTRA_OECONF += "--without-xcb"
 
-SRC_URI += "\
-  file://ruutf8.patch;patch=1 \
-  file://fix-searching-for-keysymdef.patch;patch=1 \
-"
+SRC_URI += " file://ruutf8.patch;patch=1"
 
 do_compile() {
         (
diff --git a/packages/xorg-lib/libx11_1.1.2.bb b/packages/xorg-lib/libx11_1.1.2.bb
index 97cc8d4bfb..e6b0ec5d8b 100644
--- a/packages/xorg-lib/libx11_1.1.2.bb
+++ b/packages/xorg-lib/libx11_1.1.2.bb
@@ -5,15 +5,11 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
             libxdmcp xf86bigfontproto kbproto inputproto"
 PROVIDES = "virtual/libx11"
 PE = "1"
-PR = "r2"
+PR = "r1"
 
 XORG_PN = "libX11"
 
-EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
-
-SRC_URI += "\
-  file://fix-searching-for-keysymdef.patch;patch=1 \
-"
+EXTRA_OECONF += "--without-xcb"
 
 do_compile() {
         (
diff --git a/packages/xorg-lib/libx11_1.1.3.bb b/packages/xorg-lib/libx11_1.1.3.bb
index f46a2b6415..4035c77cdc 100644
--- a/packages/xorg-lib/libx11_1.1.3.bb
+++ b/packages/xorg-lib/libx11_1.1.3.bb
@@ -5,15 +5,11 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
             libxdmcp xf86bigfontproto kbproto inputproto"
 PROVIDES = "virtual/libx11"
 PE = "1"
-PR = "r1"
+PR = "r0"
 
 XORG_PN = "libX11"
 
-EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
-
-SRC_URI += "\
-  file://fix-searching-for-keysymdef.patch;patch=1 \
-"
+EXTRA_OECONF += "--without-xcb"
 
 do_compile() {
         (