merge of affb16dd1c262c6f56c38e1ed230478f0aaa91d7

     and ebcf7913b985f1954e5315bca0dfc1c50bb2c940

6 files changed, 75 insertions, 28 deletions

diff --git a/packages/boost/boost-jam-native_3.1.10.bb b/packages/boost/boost-jam-native_3.1.11.bb
index 3a844b191e..cf9f2317c8 100644
--- a/packages/boost/boost-jam-native_3.1.10.bb
+++ b/packages/boost/boost-jam-native_3.1.11.bb
@@ -27,9 +27,5 @@ do_compile() {
 # rely on only one bin.foo directory being created.
 do_stage() {
 	set -ex
-	install -c -m 755 bin.*/jam ${STAGING_BINDIR}/
-	install -c -m 755 bin.*/mkjambase ${STAGING_BINDIR}/
-	install -c -m 755 bin.*/yyacc ${STAGING_BINDIR}/
-	rm -f ${STAGING_BINDIR}/bjam
-	ln -sf ./jam ${STAGING_BINDIR}/bjam
+	install -c -m 755 bin.*/bjam ${STAGING_BINDIR}/
 }
diff --git a/packages/boost/boost_1.32.0.bb b/packages/boost/boost_1.33.0.bb
index a844fac4cf..2c81f37899 100644
--- a/packages/boost/boost_1.32.0.bb
+++ b/packages/boost/boost_1.33.0.bb
@@ -7,10 +7,10 @@ DESCRIPTION = "Free peer-reviewed portable C++ source libraries"
 HOMEPAGE = "http://www.boost.org/"
 MAINTAINER = "John Bowler <jbowler@acm.org>"
 SECTION = "libs"
-DEPENDS = "boost-jam-native"
+DEPENDS = "boost-jam-native zlib"
 PRIORITY = "optional"
 LICENSE = "Boost Software License"
-PR = "r1"
+PR = "r0"
 
 # need debian package naming for the libs
 inherit debian
@@ -18,10 +18,9 @@ inherit debian
 BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}"
 BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}"
 BOOST_P = "boost_${BOOST_VER}"
-SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \
-		file://unit_test_log10f.patch;patch=1 \
-		file://linux-uclibc.patch;patch=1 \
-		"
+SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2"
+#SRC_URI += "file://unit_test_log10f.patch;patch=1"
+SRC_URI += "file://linux-uclibc.patch;patch=1"
 
 S = "${WORKDIR}/${BOOST_P}"
 
@@ -55,6 +54,15 @@ FILES_boost-thread-mt = "${libdir}/libboost_thread-mt.so.${PV}"
 PACKAGES += "boost-unit-test-framework"
 FILES_boost-unit-test-framework = "${libdir}/libboost_unit_test_framework.so.${PV}"
 
+PACKAGES += "boost-iostreams"
+FILES_boost-iostreams = "${libdir}/libboost_iostreams.so.${PV}"
+
+PACKAGES += "boost-serialization"
+FILES_boost-serialization = "${libdir}/libboost_serialization.so.${PV}"
+
+PACKAGES += "boost-wserialization"
+FILES_boost-wserialization = "${libdir}/libboost_wserialization.so.${PV}"
+
 # Python - remove this and set:
 #PYTHON_ROOT = "/dev/null"
 # to remove the python build
@@ -99,12 +107,19 @@ EQD = '\"'
 #boost.bb:   "...  '-sGCC=... '${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}config${EQD}'${SQD} ..."
 BJAM_CONF = "${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}boost/config/platform/${TARGET_OS}.hpp${EQD}'${SQD}"
 
+# bzip2 and zip are disabled because... they're broken - the compilation simply
+# isn't working with bjam.  I guess they will fix it, but who needs it?  This
+# only affects the (new in 33) iostream library.
 BJAM_TOOLS   = "-sTOOLS=gcc \
 		'-sGCC=${CC} '${BJAM_CONF} \
 		'-sGXX=${CXX} '${BJAM_CONF} \
-		-sBUILD='release <optimization>space <inlining>on <debug-symbols>off' \
+		'-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \
+		'-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \
+		'-sNO_BZIP2=1' \
+		'-sNO_ZLIB=1' \
+		'-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \
 		'-sPYTHON_VERSION=${PYTHON_VERSION}' \
-		--layout=system \
+		'--layout=system' \
 		"
 
 BJAM_OPTS    = '${BJAM_TOOLS} \
diff --git a/packages/gpe-todo/gpe-todo-hildon_0.55.bb b/packages/gpe-todo/gpe-todo-hildon_0.55.bb
new file mode 100644
index 0000000000..51f08a7577
--- /dev/null
+++ b/packages/gpe-todo/gpe-todo-hildon_0.55.bb
@@ -0,0 +1,18 @@
+LICENSE     = "GPL"
+PR          = "r0"
+DESCRIPTION = "GPE to-do list"
+DEPENDS     = "libgpewidget-hildon libgpepimc-hildon libtododb sdk-default-icons libosso"
+RDEPENDS    = "sdk-default-icons"
+MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
+SECTION     = "gpe"
+PRIORITY    = "optional"
+
+inherit gpe autotools pkgconfig
+
+EXTRA_OECONF = "--enable-hildon"
+
+SRC_URI="${GPE_MIRROR}/gpe-todo-${PV}.tar.bz2"
+
+S = "${WORKDIR}/gpe-todo-${PV}"
+
+FILES_${PN} += "${datadir}/gpe-todo ${libdir}/dbus-1.0"
diff --git a/packages/gpe-todo/gpe-todo_0.55.bb b/packages/gpe-todo/gpe-todo_0.55.bb
new file mode 100644
index 0000000000..71d641d4cd
--- /dev/null
+++ b/packages/gpe-todo/gpe-todo_0.55.bb
@@ -0,0 +1,3 @@
+include gpe-todo.inc
+
+DEPENDS += "gtk+"
diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.bb
index 27e14a8f99..e5e081058b 100644
--- a/packages/ixp4xx/ixp4xx-csr_2.1.bb
+++ b/packages/ixp4xx/ixp4xx-csr_2.1.bb
@@ -34,7 +34,7 @@ SRC_URI += "file://le.patch;patch=1"
 
 DEPENDS = "ixp-osal"
 S = "${WORKDIR}/ixp400_xscale_sw"
-PR = "r2"
+PR = "r3"
 
 COMPATIBLE_HOST = "^arm.*-linux.*"
 
@@ -89,20 +89,20 @@ do_stage () {
 	# Since Module.symvers in the kernel staging directory doesn't include
 	# the symbols from ixp400.o we need to add them to another file for
 	# the ixp400-eth build
-#	rm -f '${STAGING_KERNEL_DIR}/ixp400-csr.symvers'
-#	. '${KCONFIG_FILE}'
-#	if '${STAGING_KERNEL_DIR}/scripts/mod/modpost' \
-#		${CONFIG_MODVERSIONS:+-m} \
-#		${CONFIG_MODULE_SRCVERSION_ALL:+-a} \
-#		-i '${STAGING_KERNEL_DIR}/Module.symvers' \
-#		-o '${STAGING_KERNEL_DIR}/ixp400-csr.symvers' \
-#		${MAKE_TARGETS} >&2 | egrep .
-#	then
-#		echo "MODPOST errors - see above"
-#		return 1
-#	else
-#		return 0
-#	fi
+	rm -f '${STAGING_KERNEL_DIR}/ixp400-csr.symvers'
+	. '${KCONFIG_FILE}'
+	if '${STAGING_KERNEL_DIR}/scripts/mod/modpost' \
+		${CONFIG_MODVERSIONS:+-m} \
+		${CONFIG_MODULE_SRCVERSION_ALL:+-a} \
+		-i '${STAGING_KERNEL_DIR}/Module.symvers' \
+		-o '${STAGING_KERNEL_DIR}/ixp400-csr.symvers' \
+		${MAKE_TARGETS} 2>&1 | egrep .
+	then
+		echo "MODPOST errors - see above"
+		return 1
+	else
+		return 0
+	fi
 }
 
 PACKAGES = "${PN}"
diff --git a/packages/monotone/monotone-5_0.24.bb b/packages/monotone/monotone-5_0.24.bb
new file mode 100644
index 0000000000..198d2acfec
--- /dev/null
+++ b/packages/monotone/monotone-5_0.24.bb
@@ -0,0 +1,15 @@
+# Release 0.22 reveals bugs in g++ for thumb (g++ generates
+# relocations which the linker cannot represent)
+#FIXME: remove the following
+ARM_INSTRUCTION_SET = "arm"
+
+include monotone.inc
+
+PR = "r0"
+
+SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \
+           file://txt2c-cross-post-0.22.patch;patch=1 \
+	   file://uclibc.database.hh.stdarg.patch;patch=1 \
+	   "
+
+ALTERNATIVE_PRIORITY = "50"