[oe-commits] org.oe.dev libx11 (all) add patch fixing bogus usage of pkgconfig to look for a header file (from Poky)

[mickeyl commit]

libx11 (all) add patch fixing bogus usage of pkgconfig to look for a header file (from Poky)

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: a401f056cbb46280404f6c12df651daa04170ccf
ViewMTN: http://monotone.openembedded.org/revision/info/a401f056cbb46280404f6c12df651daa04170ccf
Files:
1
packages/xorg-lib/libx11/fix-searching-for-keysymdef.patch
packages/xorg-lib/libx11_1.1.1.bb
packages/xorg-lib/libx11_1.1.2.bb
packages/xorg-lib/libx11_1.1.3.bb
Diffs:

#
# mt diff -r9160d7f92f10358826bd1786462b50ec19927fa7 -ra401f056cbb46280404f6c12df651daa04170ccf
#
# 
# 
# add_file "packages/xorg-lib/libx11/fix-searching-for-keysymdef.patch"
#  content [0ab3800c4a6e4765b4cd191be926e5223448cb4f]
# 
# patch "packages/xorg-lib/libx11_1.1.1.bb"
#  from [ab8677d262614ad6c91d439e7356c1b49e8dc5a3]
#    to [524ca7afff96a3a5f6747591ea2b9b8570be50b1]
# 
# patch "packages/xorg-lib/libx11_1.1.2.bb"
#  from [72fc7fde07ba2a58ea79355937eb2f6e1c0495be]
#    to [bcc6dafad22784713ddec6385f41208e4ef16ac6]
# 
# patch "packages/xorg-lib/libx11_1.1.3.bb"
#  from [54883ca7615919e5526df001f747727753b7c581]
#    to [4f15197b113f601aa852545926db635f7c9f4721]
# 
============================================================
--- packages/xorg-lib/libx11/fix-searching-for-keysymdef.patch	0ab3800c4a6e4765b4cd191be926e5223448cb4f
+++ packages/xorg-lib/libx11/fix-searching-for-keysymdef.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.1.bb	ab8677d262614ad6c91d439e7356c1b49e8dc5a3
+++ packages/xorg-lib/libx11_1.1.1.bb	524ca7afff96a3a5f6747591ea2b9b8570be50b1
@@ -1,6 +1,6 @@ PE = "1"
 require xorg-lib-common.inc
 PE = "1"
-PR = "r5"
+PR = "r6"
 
 DESCRIPTION = "Base X libs."
 DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
@@ -9,9 +9,12 @@ XORG_PN = "libX11"
 
 XORG_PN = "libX11"
 
-EXTRA_OECONF += "--without-xcb"
+EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
-SRC_URI += " file://ruutf8.patch;patch=1"
+SRC_URI += "\
+  file://ruutf8.patch;patch=1 \
+  file://fix-searching-for-keysymdef.patch;patch=1 \
+"
 
 do_compile() {
         (
============================================================
--- packages/xorg-lib/libx11_1.1.2.bb	72fc7fde07ba2a58ea79355937eb2f6e1c0495be
+++ packages/xorg-lib/libx11_1.1.2.bb	bcc6dafad22784713ddec6385f41208e4ef16ac6
@@ -5,12 +5,16 @@ PE = "1"
             libxdmcp xf86bigfontproto kbproto inputproto"
 PROVIDES = "virtual/libx11"
 PE = "1"
-PR = "r1"
+PR = "r2"
 
 XORG_PN = "libX11"
 
-EXTRA_OECONF += "--without-xcb"
+EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
+SRC_URI += "\
+  file://fix-searching-for-keysymdef.patch;patch=1 \
+"
+
 do_compile() {
         (
          unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
============================================================
--- packages/xorg-lib/libx11_1.1.3.bb	54883ca7615919e5526df001f747727753b7c581
+++ packages/xorg-lib/libx11_1.1.3.bb	4f15197b113f601aa852545926db635f7c9f4721
@@ -5,12 +5,16 @@ PE = "1"
             libxdmcp xf86bigfontproto kbproto inputproto"
 PROVIDES = "virtual/libx11"
 PE = "1"
-PR = "r0"
+PR = "r1"
 
 XORG_PN = "libX11"
 
-EXTRA_OECONF += "--without-xcb"
+EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
+SRC_URI += "\
+  file://fix-searching-for-keysymdef.patch;patch=1 \
+"
+
 do_compile() {
         (
          unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS