[oe-commits] org.oe.dev libx11: Fix location of keysymdef.h

[rpurdie commit]

libx11: Fix location of keysymdef.h

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 0a57519fa92d8220b35f8652e20fea9f7800058c
ViewMTN: http://monotone.openembedded.org/revision/info/0a57519fa92d8220b35f8652e20fea9f7800058c
Files:
1
packages/xorg-lib/libx11/include_fix.patch
packages/xorg-lib/libx11_1.1.2.bb
packages/xorg-lib/libx11_1.1.3.bb
Diffs:

#
# mt diff -rdea50bd1366ddaf2801e7fbc296cdcf9f446c94c -r0a57519fa92d8220b35f8652e20fea9f7800058c
#
# 
# 
# add_file "packages/xorg-lib/libx11/include_fix.patch"
#  content [0ab3800c4a6e4765b4cd191be926e5223448cb4f]
# 
# patch "packages/xorg-lib/libx11_1.1.2.bb"
#  from [72fc7fde07ba2a58ea79355937eb2f6e1c0495be]
#    to [21405491fb1f9d79342a43068804f81e6413482f]
# 
# patch "packages/xorg-lib/libx11_1.1.3.bb"
#  from [54883ca7615919e5526df001f747727753b7c581]
#    to [21405491fb1f9d79342a43068804f81e6413482f]
# 
============================================================
--- packages/xorg-lib/libx11/include_fix.patch	0ab3800c4a6e4765b4cd191be926e5223448cb4f
+++ packages/xorg-lib/libx11/include_fix.patch	0ab3800c4a6e4765b4cd191be926e5223448cb4f
@@ -0,0 +1,62 @@
+---
+ 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,
============================================================
--- packages/xorg-lib/libx11_1.1.2.bb	72fc7fde07ba2a58ea79355937eb2f6e1c0495be
+++ packages/xorg-lib/libx11_1.1.2.bb	21405491fb1f9d79342a43068804f81e6413482f
@@ -5,19 +5,23 @@ PE = "1"
             libxdmcp xf86bigfontproto kbproto inputproto"
 PROVIDES = "virtual/libx11"
 PE = "1"
-PR = "r1"
+PR = "r3"
 
 XORG_PN = "libX11"
 
-EXTRA_OECONF += "--without-xcb"
+SRC_URI += "file://include_fix.patch;patch=1" 
 
+EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
+
 do_compile() {
-        (
-         unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-         cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
-         cd ../../
-        ) || exit 1
-        oe_runmake
+	(
+		unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+		cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
+		# mv to stop it getting rebuilt
+		mv makekeys.c makekeys.c.orig
+		cd ../../
+	) || exit 1
+	oe_runmake
 }
 
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
============================================================
--- packages/xorg-lib/libx11_1.1.3.bb	54883ca7615919e5526df001f747727753b7c581
+++ packages/xorg-lib/libx11_1.1.3.bb	21405491fb1f9d79342a43068804f81e6413482f
@@ -5,19 +5,23 @@ PE = "1"
             libxdmcp xf86bigfontproto kbproto inputproto"
 PROVIDES = "virtual/libx11"
 PE = "1"
-PR = "r0"
+PR = "r3"
 
 XORG_PN = "libX11"
 
-EXTRA_OECONF += "--without-xcb"
+SRC_URI += "file://include_fix.patch;patch=1" 
 
+EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
+
 do_compile() {
-        (
-         unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-         cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
-         cd ../../
-        ) || exit 1
-        oe_runmake
+	(
+		unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+		cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
+		# mv to stop it getting rebuilt
+		mv makekeys.c makekeys.c.orig
+		cd ../../
+	) || exit 1
+	oe_runmake
 }
 
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"