[oe-commits] org.oe.dev merge of '07f6b04ff19cbcdb85f1fe8430bbad17da3b0a7c'

[xora commit]

merge of '07f6b04ff19cbcdb85f1fe8430bbad17da3b0a7c'
     and '4576a315b90d6f3ce5db709905287a7b00ee6198'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: a6f0dbe56289aad3373b7ce56ba4e2434e6da244
ViewMTN: http://monotone.openembedded.org/revision/info/a6f0dbe56289aad3373b7ce56ba4e2434e6da244
Files:
1
packages/vte/files
packages/vte/files/vte-pkgconfig-fixes.patch
packages/vte/vte.inc
packages/vte/vte_0.16.9.bb
packages/libxslt/libxslt_1.1.22.bb
site/arm-linux-uclibc
Diffs:

#
# mt diff -r07f6b04ff19cbcdb85f1fe8430bbad17da3b0a7c -ra6f0dbe56289aad3373b7ce56ba4e2434e6da244
#
# 
# 
# 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"


#
# mt diff -r4576a315b90d6f3ce5db709905287a7b00ee6198 -ra6f0dbe56289aad3373b7ce56ba4e2434e6da244
#
# 
# 
# add_file "packages/libxslt/libxslt_1.1.22.bb"
#  content [79128c5d67c70cbfa31d1f46637bcb63e408194e]
# 
# patch "site/arm-linux-uclibc"
#  from [94f267f4c0c4331759de49a8fee575984350b930]
#    to [ec92512a83b5986fb0052e62aec4fd766fe519c7]
# 
============================================================
--- packages/libxslt/libxslt_1.1.22.bb	79128c5d67c70cbfa31d1f46637bcb63e408194e
+++ packages/libxslt/libxslt_1.1.22.bb	79128c5d67c70cbfa31d1f46637bcb63e408194e
@@ -0,0 +1,28 @@
+DESCRIPTION = "GNOME XSLT library"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libxml2 (>=2.6.27)"
+LICENSE = "MIT"
+
+SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz"
+S = "${WORKDIR}/libxslt-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
+
+# Something is wrong inside configure.ac, so we need to resort to sed in this stage :(
+# Koen - 20080305
+do_compile_append() {
+	sed -i -e s:-L${STAGING_LIBDIR}::g  libexslt.pc
+	sed -i -e s:-L${STAGING_LIBDIR}::g  libxslt.pc
+} 
+
+do_stage () {
+	autotools_stage_all
+}
+
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/xslt-config"
+FILES_${PN}-utils += "${bindir}"
============================================================
--- site/arm-linux-uclibc	94f267f4c0c4331759de49a8fee575984350b930
+++ site/arm-linux-uclibc	ec92512a83b5986fb0052e62aec4fd766fe519c7
@@ -1,9 +1,10 @@ ac_cv_func_posix_getpwuid_r=${ac_cv_func
 ac_cv_func_getpgrp_void=yes
 ac_cv_func_setpgrp_void=yes
 ac_cv_func_setgrent_void=yes
 ac_cv_func_malloc_0_nonnull=yes
 ac_cv_func_malloc_works=yes
 ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
+ac_cv_func_posix_getgrgid_r=${ac_cv_func_getgrgid_r=yes}
 ac_cv_func_setvbuf_reversed=no
 ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
 ac_cv_sizeof_char=${ac_cv_sizeof_char=1}