[oe-commits] org.oe.dev vte_0.16.9.bb : add patch to hopefully fix pkgconfig issues with sysroot

[xora commit]

vte_0.16.9.bb : add patch to hopefully fix pkgconfig issues with sysroot

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 4576a315b90d6f3ce5db709905287a7b00ee6198
ViewMTN: http://monotone.openembedded.org/revision/info/4576a315b90d6f3ce5db709905287a7b00ee6198
Files:
1
packages/vte/files
packages/vte/files/vte-pkgconfig-fixes.patch
packages/vte/vte.inc
packages/vte/vte_0.16.9.bb
Diffs:

#
# mt diff -re9838ae7ae6df69bb3ed71e9decb1b41fe4f6050 -r4576a315b90d6f3ce5db709905287a7b00ee6198
#
# 
# 
# add_dir "packages/vte/files"
# 
# add_file "packages/vte/files/vte-pkgconfig-fixes.patch"
#  content [c3812437766ebd9403b28e7a4c06406c02369202]
# 
# patch "packages/vte/vte.inc"
#  from [695b3ba40c29481f179d025379ad74da6577664b]
#    to [863acadee923ffdfe020719fff0419292035e52e]
# 
# patch "packages/vte/vte_0.16.9.bb"
#  from [c930d8d34a3c5132f815de63792d7e7cea7195ee]
#    to [71f52484bb2f0ca15b87f47ffa57f655d4fb08b2]
# 
============================================================
--- packages/vte/files/vte-pkgconfig-fixes.patch	c3812437766ebd9403b28e7a4c06406c02369202
+++ packages/vte/files/vte-pkgconfig-fixes.patch	c3812437766ebd9403b28e7a4c06406c02369202
@@ -0,0 +1,47 @@
+Index: vte-0.16.9/configure.in
+===================================================================
+--- vte-0.16.9.orig/configure.in	2007-09-17 23:07:18.000000000 +0100
++++ vte-0.16.9/configure.in	2008-03-05 15:59:04.000000000 +0000
+@@ -381,8 +381,6 @@
+ 
+ # Search for the required modules.
+ PKG_CHECK_MODULES(VTE,[$wantedmodules])
+-NEEDEDPACKAGES="$wantedmodules"
+-AC_SUBST(NEEDEDPACKAGES)
+ 
+ # Check for various optional functions within those modules
+ save_CFLAGS="$CFLAGS"
+@@ -403,10 +401,12 @@
+ 
+ # Require Freetype2. First see if there is suitable pkgconfig file...
+ PKG_CHECK_EXISTS(freetype2 >= 6.1.0,
+-		 [PKG_CHECK_MODULES(FT2, freetype2)], [
++		 [PKG_CHECK_MODULES(FT2, freetype2)
++                 wantedmodules="$wantedmodules freetype2 >= 6.1.0"], [
+ 	# We use our local copy of the macro because packages of
+ 	# freetype's development files don't always include the proper macro.
+-	VTE_CHECK_FT2(6.1.0,,
++	VTE_CHECK_FT2(6.1.0,[
++                      wantedmodules="$wantedmodules freetype2 >= 6.1.0" ],
+ 		      [AC_MSG_ERROR([You must have freetype 2.0.2 or later to build vte.])])])
+ 
+ # Temporarily pull in the Freetype cflags and libs for checking what's
+@@ -508,6 +508,8 @@
+ CFLAGS="$savecflags"
+ CPPFLAGS="$savecppflags"
+ 
++NEEDEDPACKAGES="$wantedmodules"
++AC_SUBST(NEEDEDPACKAGES)
+ 
+ wcs_funcs_includes="
+ #ifdef HAVE_STRING_H
+Index: vte-0.16.9/vte.pc.in
+===================================================================
+--- vte-0.16.9.orig/vte.pc.in	2007-02-26 21:05:19.000000000 +0000
++++ vte-0.16.9/vte.pc.in	2008-03-05 15:56:37.000000000 +0000
+@@ -11,4 +11,4 @@
+ Requires: @NEEDEDPACKAGES@
+ Libs: -L${libdir} -lvte @OTHERLIBS@
+ Libs.private: @FT2_LIBS@
+-Cflags: -I${includedir} @FT2_CFLAGS@ @OTHERCFLAGS@
++Cflags: -I${includedir} @OTHERCFLAGS@
============================================================
--- packages/vte/vte.inc	695b3ba40c29481f179d025379ad74da6577664b
+++ packages/vte/vte.inc	863acadee923ffdfe020719fff0419292035e52e
@@ -5,6 +5,8 @@ inherit gnome
 
 inherit gnome
 
+SRC_URI += "file://vte-pkgconfig-fixes.patch;patch=1"
+
 EXTRA_OECONF = "--disable-gtk-doc"
 
 do_stage() {
============================================================
--- packages/vte/vte_0.16.9.bb	c930d8d34a3c5132f815de63792d7e7cea7195ee
+++ packages/vte/vte_0.16.9.bb	71f52484bb2f0ca15b87f47ffa57f655d4fb08b2
@@ -1,2 +1,2 @@ require vte.inc
 require vte.inc
+PR = "r4"
-PR = "r3"