merge of '4447992dd58cf24ab0fb99dba811074b21c6aa2e'

     and '978814b6112fa21afb021154c869d766d3db1175'

34 files changed, 294 insertions, 46 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 81b64d4668..36c9d33ffb 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1286,6 +1286,10 @@ sha256=025655971eef7f76ece9754346d6eb4e2dd44ddf569c4c84de27836aa24b04a3
 md5=9519eccf0638c9962f73a7b20da77e0e
 sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883
 
+[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.2.tar.gz]
+md5=70b729dd5dd8b2b432d685918e1971f1
+sha256=38af7b39e7805d8e3ba81091aa29af8bd38ce7cbbf8e721c8bb7ab810c38d963
+
 [ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-0.17.tar.gz]
 md5=1f0193358e92559ec0f598b09ccbc0ec
 sha256=16dd81625ebfc8f5dcb0dfd2e6bac223aad325a9405d66a556fe349446b3c332
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 61560e3c44..d750536822 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -326,6 +326,7 @@ PREFERRED_VERSION_eventlog ?= "0.2.5"
 PREFERRED_VERSION_evieext ?= "1.0.2"
 PREFERRED_VERSION_evince ?= "2.20.0"
 PREFERRED_VERSION_exiv2 ?= "0.15"
+PREFERRED_VERSION_exmap-console ?= "0.4.1"
 PREFERRED_VERSION_exml ?= "cvs"
 PREFERRED_VERSION_exo ?= "0.3.2"
 PREFERRED_VERSION_expat ?= "2.0.0"
@@ -1616,7 +1617,7 @@ PREFERRED_VERSION_qscintilla ?= "1.65-gpl-1.6"
 PREFERRED_VERSION_qsvn ?= "0.3.0"
 PREFERRED_VERSION_qt-x11-free ?= "3.3.7"
 PREFERRED_VERSION_qt-x11-free-native ?= "3.3.5"
-PREFERRED_VERSION_qt4-x11-free ?= "4.3.0"
+PREFERRED_VERSION_qt4-x11-free ?= "4.3.2"
 PREFERRED_VERSION_qtplot ?= "0.2"
 PREFERRED_VERSION_quagga ?= "0.99.8"
 PREFERRED_VERSION_quake1 ?= "0.0.1"
@@ -1892,7 +1893,7 @@ PREFERRED_VERSION_udhcp ?= "0.9.8"
 PREFERRED_VERSION_ufraw ?= "0.12"
 PREFERRED_VERSION_uicmoc-native ?= "2.3.10"
 PREFERRED_VERSION_uicmoc3-native ?= "3.3.5"
-PREFERRED_VERSION_uicmoc4-native ?= "4.3.1"
+PREFERRED_VERSION_uicmoc4-native ?= "4.3.2"
 PREFERRED_VERSION_uim ?= "1.3.1"
 PREFERRED_VERSION_uim-native ?= "1.3.1"
 PREFERRED_VERSION_uim-tomoe-gtk ?= "0.2.0"
diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
index c31aecd550..fe8f549221 100644
--- a/conf/machine/dht-walnut.conf
+++ b/conf/machine/dht-walnut.conf
@@ -13,7 +13,7 @@ UBOOT_ENTRYPOINT = "0"
 MACHINE_FEATURES = "kernel26 ext2"
 
 TARGET_CPU = "405"
-OLDEST_KERNEL = "2.6.18"
+TARGET_FPU    =  "soft"
 
 #don't try to access tty1
 USE_VT = "0"
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index d51df961a1..89ab0e0687 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -8,7 +8,7 @@ DESCRIPTION = "Default ALSA configuration"
 LICENSE = "GPL"
 RRECOMMENDS_alsa-state = "alsa-states"
 PV = "0.1.0"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = " \
   file://asoundrc \
@@ -41,7 +41,7 @@ PACKAGES += "alsa-states"
 FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asoundrc"
 FILES_alsa-states = "${sysconfdir}/*.state"
 PACKAGE_ARCH_${PN} = "all"
-PACKAGE_ARCH_alsa-states = "${MACHINE}"
+PACKAGE_ARCH_alsa-states = "${MACHINE_ARCH}"
 
 pkg_postinst_${PN}() {
 	if test -z "$D"
diff --git a/packages/binutils/binutils_2.16.bb b/packages/binutils/binutils_2.16.bb
index 578d05c8d0..b9195c57ff 100644
--- a/packages/binutils/binutils_2.16.bb
+++ b/packages/binutils/binutils_2.16.bb
@@ -1,20 +1,21 @@
 PR = "r8"
 
 SRC_URI = \
-    "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \
+    "${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
      file://ld_makefile.patch;patch=1 \
      file://better_file_error.patch;patch=1 \
      file://signed_char_fix.patch;patch=1 \
      file://binutils-2.16-objcopy-rename-errorcode.patch;patch=1 \
      file://binutils-100_cflags_for_build.patch;patch=1"
 
-SRC_URI += "file://binutils-2.16.1-e300c2c3.patch;patch=1"
-
 # uclibc patches
 SRC_URI += "file://binutils-2.16-linux-uclibc.patch;patch=1"
 
-# thumb support patches
+# arm thumb support patches
 SRC_URI += "file://binutils-2.16-thumb-trampoline.patch;patch=1"
 SRC_URI += "file://binutils-2.16-thumb-glue.patch;patch=1"
 
+# powerpc patches
+SRC_URI += "file://binutils-2.16.1-e300c2c3.patch;patch=1"
+
 require binutils.inc
diff --git a/packages/imagemagick/files/binconfig-fixes.patch b/packages/imagemagick/files/binconfig-fixes.patch
new file mode 100644
index 0000000000..51797c5326
--- /dev/null
+++ b/packages/imagemagick/files/binconfig-fixes.patch
@@ -0,0 +1,81 @@
+Index: ImageMagick-6.3.5/Magick++/bin/Magick++-config.in
+===================================================================
+--- ImageMagick-6.3.5.orig/Magick++/bin/Magick++-config.in	2007-10-24 08:04:49.000000000 +0100
++++ ImageMagick-6.3.5/Magick++/bin/Magick++-config.in	2007-10-24 08:07:51.000000000 +0100
+@@ -4,6 +4,9 @@
+ # required to use the Magick++ library.
+ #
+ #
++prefix=@PREFIX_DIR@
++exec_prefix=@EXEC_PREFIX_DIR@
++
+ usage='Usage: Magick++-config [--cppflags] [--cxxflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]
+ 
+  For example, "magick.cpp" may be compiled to produce "magick" as follows:
+@@ -18,10 +21,10 @@
+ while test $# -gt 0; do
+   case $1 in
+     --prefix)
+-      echo @PREFIX_DIR@
++      echo $prefix
+       ;;
+     --exec-prefix)
+-      echo @EXEC_PREFIX_DIR@
++      echo $exec_prefix
+       ;;
+     --version)
+       echo @PACKAGE_VERSION@
+Index: ImageMagick-6.3.5/magick/Magick-config.in
+===================================================================
+--- ImageMagick-6.3.5.orig/magick/Magick-config.in	2007-10-24 08:04:49.000000000 +0100
++++ ImageMagick-6.3.5/magick/Magick-config.in	2007-10-24 08:07:19.000000000 +0100
+@@ -3,6 +3,9 @@
+ # Configure options script for re-calling MagickCore compilation options
+ # required to use the MagickCore library.
+ #
++prefix=@PREFIX_DIR@
++exec_prefix=@EXEC_PREFIX_DIR@
++
+ usage="\
+ Usage: Magick-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
+ 
+@@ -15,10 +18,10 @@
+ while test $# -gt 0; do
+   case $1 in
+     --prefix)
+-      echo @PREFIX_DIR@
++      echo $prefix
+       ;;
+     --exec-prefix)
+-      echo @EXEC_PREFIX_DIR@
++      echo $exec_prefix
+       ;;
+     --version)
+       echo '@PACKAGE_VERSION@ Q@QuantumDepth@ @MAGICK_HDRI@'
+Index: ImageMagick-6.3.5/wand/Wand-config.in
+===================================================================
+--- ImageMagick-6.3.5.orig/wand/Wand-config.in	2007-10-24 08:04:49.000000000 +0100
++++ ImageMagick-6.3.5/wand/Wand-config.in	2007-10-24 08:06:38.000000000 +0100
+@@ -3,6 +3,9 @@
+ # Configure options script for re-calling MagickWand compilation options
+ # required to use the MagickWand library.
+ #
++prefix=@PREFIX_DIR@
++exec_prefix=@EXEC_PREFIX_DIR@
++
+ usage="\
+ Usage: Wand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
+ 
+@@ -15,10 +18,10 @@
+ while test $# -gt 0; do
+   case $1 in
+     --prefix)
+-      echo @PREFIX_DIR@
++      echo $prefix
+       ;;
+     --exec-prefix)
+-      echo @EXEC_PREFIX_DIR@
++      echo $exec_prefix
+       ;;
+     --version)
+       echo '@PACKAGE_VERSION@ Q@QuantumDepth@ @MAGICK_HDRI@'
diff --git a/packages/imagemagick/files/makefile-am.patch b/packages/imagemagick/files/makefile-am.patch
new file mode 100644
index 0000000000..7ee6ccb4c9
--- /dev/null
+++ b/packages/imagemagick/files/makefile-am.patch
@@ -0,0 +1,13 @@
+Index: ImageMagick-6.3.5/Makefile.am
+===================================================================
+--- ImageMagick-6.3.5.orig/Makefile.am	2007-10-24 08:03:09.000000000 +0100
++++ ImageMagick-6.3.5/Makefile.am	2007-10-24 08:03:21.000000000 +0100
+@@ -18,7 +18,7 @@
+ 
+ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
+ 
+-ACLOCAL_AMFLAGS = -Iltdl/m4 -I m4
++ACLOCAL_AMFLAGS = -I m4
+ 
+ MODULECOMMONFLAGS = -no-undefined -export-symbols-regex ".*" -module -avoid-version
+ 
diff --git a/packages/ltrace/ltrace_0.4.bb b/packages/ltrace/ltrace_0.4.bb
index bae6d49b65..e679e25b8d 100644
--- a/packages/ltrace/ltrace_0.4.bb
+++ b/packages/ltrace/ltrace_0.4.bb
@@ -1,13 +1,14 @@
 DESCRIPTION = "ltrace shows runtime library call information for dynamically linked executables."
 HOMEPAGE = "http://packages.debian.org/unstable/utils/ltrace.html"
 SECTION = "devel"
-DEPENDS = "libelf"
+DEPENDS = "binutils libelf"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4.orig.tar.gz \
            ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1 \
            file://no-usr-include.patch;patch=1"
+
 inherit autotools
 
 PARALLEL_MAKE = ""
diff --git a/packages/mdk/files/cross-compile.diff b/packages/mdk/files/cross-compile.diff
new file mode 100644
index 0000000000..aa4c09201b
--- /dev/null
+++ b/packages/mdk/files/cross-compile.diff
@@ -0,0 +1,14 @@
+diff -ur mdk3-v1-orig/osdep/common.mak mdk3-v1-xcompile/osdep/common.mak
+--- mdk3-v1-orig/osdep/common.mak	2007-04-23 03:25:15.000000000 -0400
++++ mdk3-v1-xcompile/osdep/common.mak	2007-05-22 14:43:51.000000000 -0400
+@@ -9,10 +9,6 @@
+ PIC		= -fPIC
+ endif
+ 
+-CC		= $(TOOL_PREFIX)gcc
+-RANLIB		= $(TOOL_PREFIX)ranlib
+-AR		= $(TOOL_PREFIX)ar
+-
+ REVISION	= mdk3
+ REVFLAGS	= -D_REVISION=$(REVISION)
+ 
diff --git a/packages/mdk/mdk2_v36.bb b/packages/mdk/mdk2_v36.bb
new file mode 100644
index 0000000000..7bde7e54fa
--- /dev/null
+++ b/packages/mdk/mdk2_v36.bb
@@ -0,0 +1,11 @@
+SECTION = "console/network"
+DESCRIPTION = "Proof of concept 802.11 attack tool"
+HOMEPAGE = "http://homepages.tu-darmstadt.de/~p_larbig/wlan/"
+LICENSE = "GPLv2"
+
+SRC_URI = "http://homepages.tu-darmstadt.de/~p_larbig/wlan/mdk2-${PV}.tar.bz2"
+
+do_install() {
+        install -d ${D}/${sbindir}
+        install -m 0755 mdk2       ${D}/${sbindir}
+}
diff --git a/packages/mdk/mdk3_v2.bb b/packages/mdk/mdk3_v2.bb
new file mode 100644
index 0000000000..27c4a5bd1f
--- /dev/null
+++ b/packages/mdk/mdk3_v2.bb
@@ -0,0 +1,12 @@
+SECTION = "console/network"
+DESCRIPTION = "Proof of concept 802.11 attack tool"
+HOMEPAGE = "http://homepages.tu-darmstadt.de/~p_larbig/wlan/"
+LICENSE = "GPLv2"
+
+SRC_URI = "http://www.tu-darmstadt.de/~p_larbig/wlan/mdk3-${PV}.tar.bz2 \
+           file://cross-compile.diff;patch=1"
+
+do_install() {
+        install -d ${D}/${sbindir}
+        install -m 0755 mdk3       ${D}/${sbindir}
+}
diff --git a/packages/qt/qt4-x11-free-4.3.0/.mtn2git_empty b/packages/openmoko2/libjana/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qt/qt4-x11-free-4.3.0/.mtn2git_empty
+++ b/packages/openmoko2/libjana/.mtn2git_empty
diff --git a/packages/openmoko2/libjana/clockpatch.patch b/packages/openmoko2/libjana/clockpatch.patch
new file mode 100644
index 0000000000..7b20222239
--- /dev/null
+++ b/packages/openmoko2/libjana/clockpatch.patch
@@ -0,0 +1,31 @@
+Index: jana/libjana-gtk/jana-gtk-clock.c
+===================================================================
+--- jana.orig/libjana-gtk/jana-gtk-clock.c
++++ jana/libjana-gtk/jana-gtk-clock.c
+@@ -695,7 +695,7 @@ draw_digital_clock (JanaGtkClock *clock,
+ 	cairo_fill (cr);
+ 
+ 	/* Draw dark outline frame */
+-	thickness = width/20;
++	thickness = width/40;
+ 	cairo_new_path (cr);
+ 	cairo_rectangle (cr, thickness/2, thickness/2,
+ 		width - thickness, height - thickness);
+@@ -703,7 +703,7 @@ draw_digital_clock (JanaGtkClock *clock,
+ 	cairo_set_source_rgb (cr, base_color[0]/2,
+ 		base_color[1]/2, base_color[2]/2);
+ 	cairo_stroke (cr);
+-	
++#if 0	
+ 	/* Draw main outline frame */
+ 	cairo_new_path (cr);
+ 	cairo_rectangle (cr, thickness, thickness,
+@@ -728,7 +728,7 @@ draw_digital_clock (JanaGtkClock *clock,
+ 		base_color[1]/1.5, base_color[2]/1.5);
+ 	cairo_set_line_width (cr, thickness/2);
+ 	cairo_stroke (cr);
+-	
++#endif	
+ 	cairo_identity_matrix (cr);
+ }
+ 
diff --git a/packages/openmoko2/libjana_svn.bb b/packages/openmoko2/libjana_svn.bb
index 22b592da84..ca33f08e84 100644
--- a/packages/openmoko2/libjana_svn.bb
+++ b/packages/openmoko2/libjana_svn.bb
@@ -1,14 +1,14 @@
-DESCRIPTION = "Jana Calendar lib"
-DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus" 
+DESCRIPTION = "O-Hand Jana Library"
+DEPENDS = "libmokojournal2 gtk+ eds-dbus" 
 PV = "0.1.0+svnr${SRCREV}"
+PR = "r3"
 
-inherit  autotools pkgconfig lib_package
+inherit autotools pkgconfig lib_package
 
-SRC_URI = "svn://svn.o-hand.com/repos/dates/branches;module=jana;proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/dates/branches;module=jana;proto=http \
+           file://clockpatch.patch;patch=1"
 S = "${WORKDIR}/jana/"
 
-EXTRA_OECONF = "--with-frontend=openmoko"
-
 do_configure_prepend() {
 	touch gtk-doc.make
 }
@@ -18,9 +18,9 @@ do_stage() {
 }
 
 PACKAGES = "libjana-ecal libjana-ecal-dbg \
-            libjana-gtk libjana-gtk-dbg \  
-	    libjana libjana-dbg libjana-dev\
-	    "
+            libjana-gtk libjana-gtk-dbg \ 
+            libjana libjana-dbg libjana-dev \
+"
 
 FILES_libjana-ecal = "${libdir}/libjana.so.*"
 FILES_libjana-ecal-dbg = "${libdir}/.debug/libjana-ecal*"
@@ -28,4 +28,3 @@ FILES_libjana-gtk = "${libdir}/libjana-gtk.so.*"
 FILES_libjana-gtk-dbg = "${libdir}/.debug/libjana-gtk.so.*"
 FILES_libjana = "${libdir}/libjana.so.*"
 FILES_libjana-dbg = "${libdir}/.debug/libjana.so.*"
-
diff --git a/packages/openmoko2/openmoko-browser2_svn.bb b/packages/openmoko2/openmoko-browser2_svn.bb
index 90023c4f7f..431e40769c 100644
--- a/packages/openmoko2/openmoko-browser2_svn.bb
+++ b/packages/openmoko2/openmoko-browser2_svn.bb
@@ -2,6 +2,6 @@ DESCRIPTION = "The OpenMoko Webbrowser"
 SECTION = "openmoko/apps"
 DEPENDS += "intltool libmokoui2 check webkit-gtk"
 PV = "0.0.1+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 inherit openmoko2
diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb
index 66dc173bf1..b0aed4c0e0 100644
--- a/packages/openmoko2/openmoko-common2_svn.bb
+++ b/packages/openmoko2/openmoko-common2_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Common files for the OpenMoko framework"
 SECTION = "openmoko/base"
-PV = "0.0+svnr${SRCREV}"
-PR = "r6"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r0"
 
 inherit openmoko2
 
@@ -13,7 +13,13 @@ ALLOW_EMPTY = "1"
 dirs = "pixmaps"
 
 do_install() {
-	:
+	find . -name .svn | xargs rm -rf
+	install -d ${D}${datadir}
+	for i in ${dirs}; do
+		cp -fR $i ${D}${datadir}/$i;
+	done
+	# moved to xserver-kdrive-common
+	rm -f ${D}${datadir}/pixmaps/xsplash*
 }
 
 PACKAGE_ARCH = "all"
diff --git a/packages/openmoko2/openmoko-feedreader2_svn.bb b/packages/openmoko2/openmoko-feedreader2_svn.bb
index 156e8edd7b..c9a36312cf 100644
--- a/packages/openmoko2/openmoko-feedreader2_svn.bb
+++ b/packages/openmoko2/openmoko-feedreader2_svn.bb
@@ -2,6 +2,6 @@ DESCRIPTION = "The OpenMoko Feed Reader"
 SECTION = "openmoko/apps"
 DEPENDS += "libmokoui2 libmrss check webkit-gtk"
 PV = "0.0.1+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 inherit openmoko2
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index b7a159fc28..b71d35528d 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -4,7 +4,7 @@ SECTION = "x11"
 RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
 RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
 RCONFLICTS = "openmoko-session"
-PR = "r35"
+PR = "r37"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}
@@ -26,6 +26,8 @@ fi
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme openmoko-standard-2
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5"
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/wallpaper ${datadir}/pixmaps/wallpaper.png
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/digital_clock 1
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2
 # gstreamer audio settings
diff --git a/packages/qmake/qmake2-native_2.10a.bb b/packages/qmake/qmake2-native_2.10a.bb
index 55282e562c..84df0ef732 100644
--- a/packages/qmake/qmake2-native_2.10a.bb
+++ b/packages/qmake/qmake2-native_2.10a.bb
@@ -3,9 +3,9 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
-QTVER = "qtopia-core-opensource-src-4.3.1"
+QTVER = "qtopia-core-opensource-src-4.3.2"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
            file://0001-fix-mkspecs.patch;patch=1 \
diff --git a/packages/qt/qt4-x11-free-4.3.2/.mtn2git_empty b/packages/qt/qt4-x11-free-4.3.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qt/qt4-x11-free-4.3.2/.mtn2git_empty
diff --git a/packages/qt/qt4-x11-free-4.3.0/0001-cross-compile.patch b/packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch
index 42f7b5575c..6e2b8e755e 100644
--- a/packages/qt/qt4-x11-free-4.3.0/0001-cross-compile.patch
+++ b/packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch
@@ -7,11 +7,11 @@ Subject: [PATCH] cross compile
  configure |  137 ++----------------------------------------------------------
  1 files changed, 5 insertions(+), 132 deletions(-)
 
-diff --git a/configure b/configure
-index 6b3ccd2..b3c2a52 100755
---- a/configure
-+++ b/configure
-@@ -733,7 +733,7 @@ while [ "$#" -gt 0 ]; do
+Index: qt-x11-opensource-src-4.3.2/configure
+===================================================================
+--- qt-x11-opensource-src-4.3.2.orig/configure	2007-10-01 15:06:03.000000000 +0200
++++ qt-x11-opensource-src-4.3.2/configure	2007-10-23 09:32:25.000000000 +0200
+@@ -735,7 +735,7 @@
              UNKNOWN_ARG=yes
          fi
          ;;
@@ -20,7 +20,7 @@ index 6b3ccd2..b3c2a52 100755
          VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
          shift
          VAL="$1"
-@@ -1109,6 +1109,9 @@ while [ "$#" -gt 0 ]; do
+@@ -1124,6 +1124,9 @@
      xplatform)
          XPLATFORM="$VAL"
          ;;
@@ -30,7 +30,7 @@ index 6b3ccd2..b3c2a52 100755
      debug-and-release)
          if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
              CFG_DEBUG_RELEASE="$VAL"
-@@ -2092,137 +2095,7 @@ if [ "$OPT_VERBOSE" = "yes" ]; then
+@@ -2119,149 +2122,7 @@
      echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)"
  fi
  
@@ -116,7 +116,7 @@ index 6b3ccd2..b3c2a52 100755
 -        ARCH=i386
 -        ;;
 -    *:*:x86_64|*:*:amd64)
--        if [ "$PLATFORM" = "linux-g++-32" ]; then
+-        if [ "$PLATFORM" = "linux-g++-32" -o "$PLATFORM" = "linux-icc-32" ]; then
 -            if [ "$OPT_VERBOSE" = "yes" ]; then
 -                echo "    32 bit on 64-bit AMD 80x86 (i386)"
 -            fi
@@ -146,6 +146,18 @@ index 6b3ccd2..b3c2a52 100755
 -    	fi
 -    	ARCH=s390
 -    	;;
+-    *:*:arm*)
+-        if [ "$OPT_VERBOSE" = "yes" ]; then
+-            echo "    ARM (arm)"
+-        fi
+-        ARCH=arm
+-        ;;
+-    Linux:*:sparc*) 
+-        if [ "$OPT_VERBOSE" = "yes" ]; then 
+-            echo "    Linux on SPARC" 
+-        fi 
+-        ARCH=sparc 
+-        ;; 
 -    *:*:*)
 -        if [ "$OPT_VERBOSE" = "yes" ]; then
 -            echo "    Trying '$UNAME_MACHINE'..."
@@ -169,6 +181,3 @@ index 6b3ccd2..b3c2a52 100755
  
  if [ "$OPT_VERBOSE" = "yes" ]; then
          echo "System architecture: '$ARCH'"
--- 
-1.5.0.7
-
diff --git a/packages/qt/qt4-x11-free-4.3.0/0002-fix-resinit-declaration.patch b/packages/qt/qt4-x11-free-4.3.2/0002-fix-resinit-declaration.patch
index e479a64a2b..e479a64a2b 100644
--- a/packages/qt/qt4-x11-free-4.3.0/0002-fix-resinit-declaration.patch
+++ b/packages/qt/qt4-x11-free-4.3.2/0002-fix-resinit-declaration.patch
diff --git a/packages/qt/qt4-x11-free-4.3.0/0003-no-tools.patch b/packages/qt/qt4-x11-free-4.3.2/0003-no-tools.patch
index 5412c90377..5412c90377 100644
--- a/packages/qt/qt4-x11-free-4.3.0/0003-no-tools.patch
+++ b/packages/qt/qt4-x11-free-4.3.2/0003-no-tools.patch
diff --git a/packages/qt/qt4-x11-free-4.3.0/0004-no-qmake.patch b/packages/qt/qt4-x11-free-4.3.2/0004-no-qmake.patch
index 359f6df9d5..359f6df9d5 100644
--- a/packages/qt/qt4-x11-free-4.3.0/0004-no-qmake.patch
+++ b/packages/qt/qt4-x11-free-4.3.2/0004-no-qmake.patch
diff --git a/packages/qt/qt4-x11-free-4.3.0/0005-fix-mkspecs.patch b/packages/qt/qt4-x11-free-4.3.2/0005-fix-mkspecs.patch
index 93692699dc..93692699dc 100644
--- a/packages/qt/qt4-x11-free-4.3.0/0005-fix-mkspecs.patch
+++ b/packages/qt/qt4-x11-free-4.3.2/0005-fix-mkspecs.patch
diff --git a/packages/qt/qt4-x11-free-4.3.0/0006-freetype-host-includes.patch b/packages/qt/qt4-x11-free-4.3.2/0006-freetype-host-includes.patch
index cc8e115fee..cc8e115fee 100644
--- a/packages/qt/qt4-x11-free-4.3.0/0006-freetype-host-includes.patch
+++ b/packages/qt/qt4-x11-free-4.3.2/0006-freetype-host-includes.patch
diff --git a/packages/qt/qt4-x11-free-4.3.0/0007-openssl-host-includes.patch b/packages/qt/qt4-x11-free-4.3.2/0007-openssl-host-includes.patch
index 35b71d9694..35b71d9694 100644
--- a/packages/qt/qt4-x11-free-4.3.0/0007-openssl-host-includes.patch
+++ b/packages/qt/qt4-x11-free-4.3.2/0007-openssl-host-includes.patch
diff --git a/packages/qt/qt4-x11-free_4.3.0.bb b/packages/qt/qt4-x11-free_4.3.2.bb
index a097c4e9ca..a097c4e9ca 100644
--- a/packages/qt/qt4-x11-free_4.3.0.bb
+++ b/packages/qt/qt4-x11-free_4.3.2.bb
diff --git a/packages/qte/qtopia-core_4.3.1.bb b/packages/qte/qtopia-core_4.3.2.bb
index 73cfb7f6da..c486ba164f 100644
--- a/packages/qte/qtopia-core_4.3.1.bb
+++ b/packages/qte/qtopia-core_4.3.2.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 DEPENDS = "freetype tslib"
 
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \
            file://linux-oe-qmake.conf"
diff --git a/packages/uicmoc/uicmoc4-native_4.3.2.bb b/packages/uicmoc/uicmoc4-native_4.3.2.bb
new file mode 100644
index 0000000000..df39a494b2
--- /dev/null
+++ b/packages/uicmoc/uicmoc4-native_4.3.2.bb
@@ -0,0 +1,60 @@
+DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+SECTION = "libs"
+HOMEPAGE = "http://www.trolltech.com"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz"
+S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
+
+inherit native
+
+EXTRA_OECONF = "-prefix ${STAGING_DIR}/${BUILD_SYS}/qt4 \
+                -qt-libjpeg -qt-gif -system-zlib \
+                -no-nis -no-cups -no-exceptions  \
+                -no-accessibility -no-libjpeg    \
+                -no-nas-sound -no-sm             \
+                -no-xshape    -no-xinerama       \
+                -no-xcursor   -no-xrandr         \
+                -no-xrender   -no-fontconfig     \
+                -no-tablet    -no-xkb            \
+                -no-libpng                       \
+                -verbose -release  -fast -static \
+                -qt3support "
+# yank default -e
+EXTRA_OEMAKE = " "
+
+do_configure() {
+	sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro
+	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
+TOBUILD = "\
+  src/tools/moc \
+  src/corelib \
+  src/sql \
+  src/qt3support \
+  src/xml \
+  src/tools/uic \
+  src/tools/rcc \
+  src/network \
+  src/gui \
+  src/tools/uic3 \
+"
+
+do_compile() {
+	unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
+	for i in ${TOBUILD}; do
+		cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
+	done
+}
+
+do_stage() {
+        install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
+        install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
+        install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
+        install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
+        install -d ${STAGING_DIR}/${BUILD_SYS}/qt4/
+        install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR}/${BUILD_SYS}/qt4/
+}
diff --git a/packages/webkit/webkit-qt.inc b/packages/webkit/webkit-qt.inc
index bba8d83cce..cb9c1f7943 100644
--- a/packages/webkit/webkit-qt.inc
+++ b/packages/webkit/webkit-qt.inc
@@ -1,9 +1,9 @@
 WEBKIT_PORT = "qt"
 WEBKIT_EXTRA_OPTIONS = ""
-PACKAGES =+ "webkit-qtlauncher-dbg webkit-qtlauncher"
+PACKAGES =+ "${PN}launcher-dbg ${PN}launcher"
 
-FILES_webkit-qtlauncher = "${bindir}/QtLauncher"
-FILES_webkit-qtlauncher-dbg = "${bindir}/.debug/*"
+FILES_${PN}launcher = "${bindir}/QtLauncher"
+FILES_${PN}launcher-dbg = "${bindir}/.debug/*"
 
 require webkit.inc
 
diff --git a/packages/webkit/webkit-qt_svn.bb b/packages/webkit/webkit-qt_svn.bb
index 75b36a4a58..e681e7a41b 100644
--- a/packages/webkit/webkit-qt_svn.bb
+++ b/packages/webkit/webkit-qt_svn.bb
@@ -1,2 +1,4 @@
 require webkit-qt.inc
 inherit qt4x11
+
+PR = "r1"
diff --git a/packages/webkit/webkit-qtopia_svn.bb b/packages/webkit/webkit-qtopia_svn.bb
index cfd96c8956..706f0f1cd1 100644
--- a/packages/webkit/webkit-qtopia_svn.bb
+++ b/packages/webkit/webkit-qtopia_svn.bb
@@ -1,3 +1,4 @@
-BROKEN="1"
 require webkit-qt.inc
 inherit qtopia4core
+
+PR = "r1"
diff --git a/packages/webkit/webkit.inc b/packages/webkit/webkit.inc
index c20fc57c93..a80813f072 100644
--- a/packages/webkit/webkit.inc
+++ b/packages/webkit/webkit.inc
@@ -2,7 +2,7 @@ DEPENDS += "flex-native gperf-native perl-native sqlite3"
 SRCREV_FORMAT = "webcore-rwebkit"
 
 # Yes, this is wrong...
-PV = "0.0+svnr${SRCREV}"
+PV = "0.1+svnr${SRCREV}"
 PR = "r1"
 
 inherit qmake2 pkgconfig