[oe-commits] org.oe.dev merge of '069961becc44a86c25703ae2d26de30fba398c72'

[koen commit]

merge of '069961becc44a86c25703ae2d26de30fba398c72'
     and 'e9838ae7ae6df69bb3ed71e9decb1b41fe4f6050'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 07f6b04ff19cbcdb85f1fe8430bbad17da3b0a7c
ViewMTN: http://monotone.openembedded.org/revision/info/07f6b04ff19cbcdb85f1fe8430bbad17da3b0a7c
Files:
1
packages/libsexy/files
packages/libsexy/files/libsexy-pkgconfig-fixes.patch
conf/distro/include/sane-srcrevs.inc
packages/libsexy/libsexy.inc
packages/libsexy/libsexy_0.1.11.bb
packages/xoo/xoo_svn.bb
packages/libxslt/libxslt_1.1.22.bb
site/arm-linux-uclibc
Diffs:

#
# mt diff -r069961becc44a86c25703ae2d26de30fba398c72 -r07f6b04ff19cbcdb85f1fe8430bbad17da3b0a7c
#
# 
# 
# add_dir "packages/libsexy/files"
# 
# add_file "packages/libsexy/files/libsexy-pkgconfig-fixes.patch"
#  content [e5931663a5d7b15ab427404822b3ef7e492a63ed]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [d67a23a7afbb9f344b8a06ad56a59f59f0f95d05]
#    to [cee3f2f2e6478f02a5022c31afb8da91f4680f4a]
# 
# patch "packages/libsexy/libsexy.inc"
#  from [424dc70640ac7ef7e37a4ade193b1b68ee41b529]
#    to [bb7627ce4dd6e965c92b807b73ce50885842782e]
# 
# patch "packages/libsexy/libsexy_0.1.11.bb"
#  from [fea8d167b7e7ad5419021a08a604bf8d7af3166f]
#    to [a76f7dce9c8ab42df42de99cb8a9b523bb2f18a2]
# 
# patch "packages/xoo/xoo_svn.bb"
#  from [f8b0b32f636f02a8b0d654f47abc6342070b8da4]
#    to [35f551e76ef5e61eb58905109dfd8a57d676dcbf]
# 
============================================================
--- packages/libsexy/files/libsexy-pkgconfig-fixes.patch	e5931663a5d7b15ab427404822b3ef7e492a63ed
+++ packages/libsexy/files/libsexy-pkgconfig-fixes.patch	e5931663a5d7b15ab427404822b3ef7e492a63ed
@@ -0,0 +1,15 @@
+Index: libsexy-0.1.11/libsexy.pc.in
+===================================================================
+--- libsexy-0.1.11.orig/libsexy.pc.in	2005-11-10 10:21:18.000000000 +0000
++++ libsexy-0.1.11/libsexy.pc.in	2008-03-05 14:36:39.000000000 +0000
+@@ -6,7 +6,8 @@
+ Name: libsexy
+ Description: Doing naughty things to good widgets
+ Version: @VERSION@
+-Libs: -L${libdir} -lsexy @PACKAGE_LIBS@
+-Cflags: -I${includedir} @PACKAGE_CFLAGS@
+ 
++Requires: pango glib-2.0 gtk+-2.0 libxml
++Libs: -L${libdir} -lsexy 
++Cflags: -I${includedir}
+ 
============================================================
--- conf/distro/include/sane-srcrevs.inc	d67a23a7afbb9f344b8a06ad56a59f59f0f95d05
+++ conf/distro/include/sane-srcrevs.inc	cee3f2f2e6478f02a5022c31afb8da91f4680f4a
@@ -154,5 +154,5 @@ SRCREV_pn-wesnoth ?= "22021"
 SRCREV_pn-webkit-qt ?= "28656"
 SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wesnoth ?= "22021"
-SRCREV_pn-xoo ?= "1623"
+SRCREV_pn-xoo ?= "1971"
 
============================================================
--- packages/libsexy/libsexy.inc	424dc70640ac7ef7e37a4ade193b1b68ee41b529
+++ packages/libsexy/libsexy.inc	bb7627ce4dd6e965c92b807b73ce50885842782e
@@ -5,7 +5,8 @@ DEPENDS = "gtk+ enchant libxml2"
 
 DEPENDS = "gtk+ enchant libxml2"
 
-SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz"
+SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz \
+           file://libsexy-pkgconfig-fixes.patch;patch=1"
 
 inherit autotools pkgconfig
 
============================================================
--- packages/libsexy/libsexy_0.1.11.bb	fea8d167b7e7ad5419021a08a604bf8d7af3166f
+++ packages/libsexy/libsexy_0.1.11.bb	a76f7dce9c8ab42df42de99cb8a9b523bb2f18a2
@@ -1,2 +1,2 @@ require libsexy.inc
 require libsexy.inc
+PR = "r1"
-PR = "r0"
============================================================
--- packages/xoo/xoo_svn.bb	f8b0b32f636f02a8b0d654f47abc6342070b8da4
+++ packages/xoo/xoo_svn.bb	35f551e76ef5e61eb58905109dfd8a57d676dcbf
@@ -1,9 +1,9 @@ LICENSE = "GPL"
 DESCRIPTION = "Xoo is a GTK2 based graphical wrapper around a windowed X Server. \
 It is intended for embedded developers that want to simulate a target device \
 (with an accurate display size, working hardware buttons, etc) on a desktop machine."
 HOMEPAGE = "http://projects.o-hand.com/xoo"
 LICENSE = "GPL"
-DEPENDS = "virtual/libx11 libxtst gtk+ libglade"
+DEPENDS = "virtual/libx11 libxtst gtk+ libglade expat"
 PV = "0.7+svnr${SRCREV}"
 PR = "r1"
 


#
# mt diff -re9838ae7ae6df69bb3ed71e9decb1b41fe4f6050 -r07f6b04ff19cbcdb85f1fe8430bbad17da3b0a7c
#
# 
# 
# 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}