merge of 462f9eb4321f7a407e426cef0645184c6c47894f

     and b2211f892717fa37d3998804bc003413e17e1393

10 files changed, 341 insertions, 223 deletions

diff --git a/packages/konqueror/files/.mtn2git_empty b/packages/konqueror/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/konqueror/files/.mtn2git_empty
diff --git a/packages/konqueror/files/inject-extraflags.patch b/packages/konqueror/files/inject-extraflags.patch
new file mode 100644
index 0000000000..1b8b02d175
--- /dev/null
+++ b/packages/konqueror/files/inject-extraflags.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- kdenox/konq-embed/src/Makefile.am~fixit
++++ kdenox/konq-embed/src/Makefile.am
+@@ -49,7 +49,7 @@
+ 		$(top_builddir)/konq-embed/kdesrc/kssl/libkssl.la 
+ 
+ 
+-konqueror_LDFLAGS = $(KONQ_SSL_LDFLAGS) $(all_libraries) -export-dynamic
++konqueror_LDFLAGS = $(KONQ_SSL_LDFLAGS) $(all_libraries) -export-dynamic $(EXTRA_LDFLAGS)
+ konqueror_METASOURCES = AUTO
+ konqueror_DEPENDENCIES = $(LIB_KJSHTML) $(LIB_KHTML) $(LIB_ADDONS)
+ BUILT_SOURCES = init.inc
diff --git a/packages/konqueror/konqueror-embedded_svn.bb b/packages/konqueror/konqueror-embedded_svn.bb
index 26d2877d81..f032b9b587 100644
--- a/packages/konqueror/konqueror-embedded_svn.bb
+++ b/packages/konqueror/konqueror-embedded_svn.bb
@@ -1,21 +1,21 @@
 DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition"
-BROKEN = "1"
 SECTION = "opie/applications"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.konqueror.org/"
-DEPENDS = "openssl pcre libqte-mt dcopidl-native"
+DEPENDS = "openssl pcre libqte-mt-static dcopidl-native"
 LICENSE = "LGPL/GPL"
 DEFAULT_PREFERENCE = "-1"
 FILES_${PN} = "${palmtopdir} /usr/share"
-PR = "r0"
-PV = "svn${SRCDATE}"
+PR = "r1"
+PV = "3.5.1+svn${SRCDATE}"
 
 # this Konqueror needs the KDEDIR set and the font helvetica installed on the target
 
 inherit autotools
 
 SRC_URI = "svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.1;module=kdelibs \
-	   svn://anonsvn.kde.org/home/kde/trunk;module=kdenox "
+	   svn://anonsvn.kde.org/home/kde/trunk;module=kdenox \
+	   file://inject-extraflags.patch;patch=1"
 
 S = "${WORKDIR}/kdenox"
 
@@ -25,6 +25,9 @@ export UIC = "${STAGING_BINDIR}/uic"
 export exec_prefix = "${palmtopdir}"
 export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS"
 export PCRE_CONFIG = "invalid"
+EXTRAFLAGS = "-lts"
+EXTRAFLAGS_c7x0 = "-lts -laticore"
+export EXTRA_OEMAKE = "EXTRA_LDFLAGS='${EXTRAFLAGS}'"
 
 EXTRA_OECONF = '--prefix=${palmtopdir} \
     	--exec-prefix=${palmtopdir} \
diff --git a/packages/nslu2-binary-only/unslung-rootfs/NOTES b/packages/nslu2-binary-only/unslung-rootfs/NOTES
index dedc2431ee..8d6908c74d 100644
--- a/packages/nslu2-binary-only/unslung-rootfs/NOTES
+++ b/packages/nslu2-binary-only/unslung-rootfs/NOTES
@@ -1,4 +1,4 @@
-Unslung-5.x Family Release Notes
+Unslung-6.x Family Release Notes
 
 Unslung is a replacement firmware image for the Linksys NSLU2 which is designed
 to allow you to make changes to the root filesystem (including the installation
@@ -18,7 +18,7 @@ posting to the mailing list or asking a question in the IRC channel
 OK! Now that that's out of the way...
 
 This file is provided to give general information and usage notes for the
-Unslung 5.x firmware.  If you are looking for installation instructions, please
+Unslung 6.x firmware.  If you are looking for installation instructions, please
 stop now and go to the README file.  Follow the README instructions WORD for
 WORD to keep from turning your NSLU2 into a brick.  The information contained
 in this file will make more sense if you have already "unslung" your NSLU2.
@@ -38,8 +38,8 @@ GENERAL INFORMATION
 As stated above, Unslung firmware is a replacement firmware image for the
 Linksys NSLU2.  The Unslung firmware is intended to be used for loading new
 packages (giving enhanced or additional functionality) with minimal changes
-to the standard user interface and firmware.  The differences in the Unslung 5.x
-firmware from the standard Linksys 2.3R29 firmware can be found at:
+to the standard user interface and firmware.  The differences in the Unslung 6.x
+firmware from the standard Linksys 2.3R63 firmware can be found at:
 
 	http://www.nslu2-linux.org/wiki/Unslung/UnslungFeatures
 
@@ -447,3 +447,48 @@ Added disk auto-wait countdown to /linuxrc (courtesy of glc).
 5.5:
 
 First public release of 5.x firmware.
+
+6.1:
+
+Upgraded to Linksys firmware V2.3R63.
+
+6.1 to 6.7:
+
+"Unslung" status (i.e. Unslung to disk, or running from internal
+flash) is now displayed on the home page in the Web GUI, as well as
+displayed at login.
+
+Using "ipkg" when running from internal flash now displays a helpful
+message indicating why ipkg won't run.
+
+The unsling script now contains a number of sanity checks, and prints
+(hopefully) helpful error messages if the system will be unlikely to
+unsling correctly.
+
+The unsling script now prompts for a new root password, and sets the
+password for both booting with as well as without drives attached. (A
+new argument "-nopw" can be given to unsling to have it skip prompting
+for and setting the root password.)
+
+The "Enable Telnet" web gui page can now be reached from the home page
+in the Linksys Web GUI.
+
+The new Unslung logo is now featured in the Web GUI.
+
+The special handling for unslinging to flash devices now works for
+both USB Port 1 and 2.
+
+The utmp and wtmp files are now created by unsling, and will be
+"emptied" at each boot. Additionally, the .pid files in /var/run and
+/var/log are cleaned out at boot; this avoids a number of strange and
+difficult-to-reproduce problems.
+
+The following additional kernel modules are provided: loop.o isofs.o 
+keyspan.o netconsole.o 
+
+Sundry bugfixes. 
+
+6.8:
+
+First public release of 6.x firmware.
+
diff --git a/packages/nslu2-binary-only/unslung-rootfs/README b/packages/nslu2-binary-only/unslung-rootfs/README
index e8b27197ea..c750709e5f 100644
--- a/packages/nslu2-binary-only/unslung-rootfs/README
+++ b/packages/nslu2-binary-only/unslung-rootfs/README
@@ -1,4 +1,4 @@
-Unslung-5.x Family Release README INSTALLATION
+Unslung-6.x Family Release README INSTALLATION
 
 You must follow the steps in this README *exactly*.  Do not skip any steps, and
 do not skip ahead thinking you know what you are doing and don't need to follow
@@ -80,54 +80,42 @@ PRE-INSTALLATION CONSIDERATIONS
 FIRMWARE INSTALLATION DETAILS
 
 1) Shutdown the NSLU2, and remove any disks that you may have plugged into the
-     NSLU2.  Power back up the NSLU2.
+     NSLU2.
 
      - Firmware upgrades must always be performed with *no* hard disks or flash
           disks attached.  This CANNOT be emphasized enough.  Are you sure you
           unplugged the disks before powering up?  If so, you may continue.
 
-2) Access the Web interface.  Note that you should use the username "admin" and
-     password "admin" for the web interface at this point (as no disks are
-     attached, the default username and password is the only way to access the 
-     Management web pages).
-
-     2-a) If you are installing Unslung 5.x onto an NSLU2 unit with Linksys
-          standard firmware *or* Unslung version 1.x or version 2.x already
-	  installed, flash unslung-5.x.bin as you normally would flash new
-	  firmware (using the web interface "Upgrade Firmware" page).
-
-     2-b) If you are installing Unslung 5.x onto an NSLU2 unit with Unslung
-          version 3.x already installed, you must put the NSLU2 into
-	  maintenance mode before you can use the web interface to flash a new
-	  version. Just click the "Enter Maintenance Mode" link on the web
-          interface "Upgrade Firmware" page, wait for the NSLU2 to reboot, and
-          then flash the new firmware in the normal manner (using the web
-	  interface "Upgrade Firmware" page).
-
-     2-c) If you are installing Unslung 5.x onto an NSLU2 unit with Unslung
-	  version 4.x already installed, you must put the NSLU2 into RedBoot
-	  Upgrade Mode before you can upload new firmware.  Note that Unslung
-	  version 4.x has an "Enter Maintenance Mode" link on the web interface
-	  "Upgrade Firmware" page, but it does not work, so you will need to
-	  use the instructions at
-
-	    http://www.nslu2-linux.org/wiki/HowTo/TelnetIntoRedBoot
-
-	  to access the RedBoot command line, and then type "upgrade" to put
-	  the NSLU2 into RedBoot Upgrade Mode.  Then you will need to use the
-	  Linux UpSlug tool or the Windows SerComm Upgrade tool to upload the
-	  new firmware.
-
-     2-d) If you are installing Unslung 5.x onto an NSLU2 unit with version 5.x
-	  already installed, you must first put the NSLU2 into RedBoot Upgrade
-	  Mode.  Just click the "Enter Upgrade Mode" link on the web interface
-	  "Upgrade Firmware" page, wait for the NSLU2 to reboot, and for the
-	  Ready/Status LED to begin flashing red and green, and then use either
-	  the Linux UpSlug tool or the Windows SerComm Upgrade tool to upload
-	  the new firmware.
+2-a) If you are installing Unslung 6.x onto an NSLU2 unit with Linksys standard
+     firmware already installed, flash unslung-6.x.bin as you normally would
+     flash new firmware (using the web interface "Upgrade Firmware" page).
+     See your NSLU2 user manual for details if you don't know how to do this.
 
      - During firmware flashing, the top LED - Ready/Status - flashes red and
-          green (approximately 5 minutes, but can be much longer).  
+       green (approximately 5 minutes, but can be much longer).  
+
+     - The NSLU2 will reboot after the flashing is complete.
+
+2-b) If you are installing Unslung 6.x onto an NSLU2 unit with an existing
+     version of nslu2-linux.org firmware already installed, you must first put
+     the NSLU2 into RedBoot Upgrade Mode.
+
+     - The NSLU2 should still be powered off at this point.  If not, shut it
+       down again before proceeding.
+     - Using a paper clip, push and hold in the reset button which is located
+       on the back of the NSLU2 near the power socket.
+     - While holding in the reset button, press and release the power button.
+     - Watch the Ready/Status LED and as soon as it turns red, then quickly
+       release the reset button.
+     - You should now be in upgrade mode which is indicated by the Ready/Status
+       LED alternating between red and green. 
+     - Use either the Linux UpSlug tool or the Windows SerComm Upgrade tool to
+       upload the new firmware - you can find download links at
+
+	    http://www.nslu2-linux.org/wiki/HowTo/InstallUnslungFirmware
+
+     - During firmware flashing, the top LED - Ready/Status - flashes red and
+       green (approximately 5 minutes, but can be much longer).  
 
      - The NSLU2 will reboot after the flashing is complete.
 
@@ -209,9 +197,20 @@ you won't have access until you change the file /share/hdd/conf/passwd.
 3) OK, now that you don't have any disks attached, you can proceed and telnet
      into the NSLU2 using the username root and password uNSLUng.
 
-4) Identify which drive you wish you "unsling", and plug it in.  Wait a minute
-     or two while the disk is mounted.  Check the web interface to make sure
-     that the disk has been recognised by the Linksys software.
+     - If you are upgrading from a previous release of Unslung, please read
+
+     http://www.nslu2-linux.org/wiki/Unslung/UpgradingToUnslung6
+
+4) Identify which drive you wish you "unsling", and plug it in.  Note that for
+     Unslung 6.x it is recommended that you plug the target disk into the Disk2
+     port so that you can use the Disk1 port for attaching multiple ext3 and/or
+     NTFS data disks via a USB hub.  For more information, see
+
+     http://www.nslu2-linux.org/wiki/Unslung/WhichUSBPortforUnslung6
+
+     Wait a minute or two while the disk is mounted.  Check the web
+     interface to make sure that the disk has been recognised by the
+     Linksys software.
 
      - If the disk has not been previously formatted on the NSLU2, then now is
           the time to do that.  Make sure that the drive is recognized in the
@@ -219,7 +218,8 @@ you won't have access until you change the file /share/hdd/conf/passwd.
 
 5) In the telnet session, run "/sbin/unsling disk1" or "/sbin/unsling disk2"
      (depending upon whether you want to unsling to a disk connected to the
-     Disk1 port or the Disk2 port).
+     Disk1 port or the Disk2 port).  Again, we recommend for Unslung 6.x that
+     you unsling to disk2.
 
      - Once you "unsling" to an external disk on a particular port (Disk 1 or
           Disk 2), it is important that you keep that disk continually plugged
@@ -246,7 +246,7 @@ you won't have access until you change the file /share/hdd/conf/passwd.
 
 6) If you wish to migrate your packages from the old Unslung 3.x location in
      the /share/hdd/conf (disk1) or /share/flash/conf (disk2) partitions to the
-     new Unslung 4.x and 5.x location on the data partition, then run:  
+     new Unslung 4.x, 5.x and 6.x location on the data partition, then run:  
      "/sbin/slingover disk1" (if your packages were previously on disk1 and you
      ran "/sbin/unsling disk1" in step 5) or "/sbin/slingover disk2" (if your
      packages were previously on disk2 and you ran "/sbin/unsling disk2" in
@@ -271,7 +271,7 @@ you won't have access until you change the file /share/hdd/conf/passwd.
 
 ***** Congratulations, you're now Unslung! *****
 
-Make sure you add an entry to the "The Unslung 5.x" table in the Yahoo group.
+Make sure you add an entry to the "The Unslung 6.x" table in the Yahoo group.
 Just use the next free integer for your Unslung number.
 
 If you make no further changes, your NSLU2 will continue to operate normally.
diff --git a/packages/qte/qte-2.3.10/fix-errno-exception-spec.patch b/packages/qte/qte-2.3.10/fix-errno-exception-spec.patch
new file mode 100644
index 0000000000..19a5c134c8
--- /dev/null
+++ b/packages/qte/qte-2.3.10/fix-errno-exception-spec.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-2.3.10/src/kernel/qsoundqss_qws.cpp~fix-errno-exception-spec.patch
++++ qt-2.3.10/src/kernel/qsoundqss_qws.cpp
+@@ -51,8 +51,6 @@
+ #include <sys/ioctl.h>
+ #include <sys/soundcard.h>
+ 
+-extern int errno;
+-
+ #define QT_QWS_SOUND_16BIT 1 // or 0, or undefined for always 0
+ #define QT_QWS_SOUND_STEREO 1 // or 0, or undefined for always 0
+ 
diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc
new file mode 100644
index 0000000000..083174ccad
--- /dev/null
+++ b/packages/qte/qte-common_2.3.10.inc
@@ -0,0 +1,168 @@
+DESCRIPTION = "Qt/Embedded Version ${PV}"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+HOMEPAGE = "http://www.trolltech.com"
+LICENSE = "GPL"
+DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
+DEPENDS_mnci = "zlib libpng jpeg uicmoc-native"
+DEPENDS_append_c7x0 = " sharp-aticore-oss"
+PROVIDES = "virtual/qte virtual/libqte2"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qte-${PV}"
+
+SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;md5sum=af7ad30113afc500cab7f5b2f4dec0d7 \
+   	   file://qpe.patch;patch=1 \
+	   file://vt-switch.patch;patch=1 \
+	   file://daemonize.patch;patch=1 \
+	   file://no-moc.patch;patch=1 \
+	   file://gcc3.patch;patch=1 \
+	   file://gcc4.patch;patch=1 \
+	   file://c700-hardware.patch;patch=1 \
+	   file://encoding.patch;patch=1 \
+	   file://fix-qgfxraster.patch;patch=1 \
+	   file://qt-visibility.patch;patch=1 \
+	   file://tslib.patch;patch=1 \
+	   file://simpad.patch;patch=1 \
+	   file://handhelds.patch;patch=1 \
+	   file://qiconview-speed.patch;patch=1 \
+	   file://qtabbar.patch;patch=1 \
+	   file://increase-qxml-robustness.patch;patch=1 \
+	   file://qte-fix-iconsize.patch;patch=1 \
+	   file://fix-linuxfb-setmode.patch;patch=1 \
+	   file://fix-linuxfb-offscreenoverflow.patch;patch=1 \
+	   file://fix-qscreen-sync.patch;patch=1 \
+	   file://improve-calibration-r0.patch;patch=1 \
+	   file://key.patch;patch=1 \
+	   file://bidimetrics.patch;patch=5 \
+	   file://fix-native-build.patch;patch=1 \
+	   file://simpad-defaultkbd.patch;patch=1 \
+	   file://fix-errno-exception-spec.patch;patch=1 \
+	   file://sharp_char.h \
+	   file://switches.h "
+
+SRC_URI_append_simpad       = "file://devfs.patch;patch=1 "
+SRC_URI_append_c7x0         = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 \
+                               file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 "
+SRC_URI_append_spitz        = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 "
+SRC_URI_append_akita        = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 "
+SRC_URI_append_borzoi       = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 "
+SRC_URI_append_tosa         = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-tosa.patch;patch=1 "
+SRC_URI_append_jornada7xx   = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 "
+SRC_URI_append_jornada56x   = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 "
+SRC_URI_append_mnci         = "file://devfs.patch;patch=1 \
+                               file://mnci.patch;patch=1 \
+                               file://mnci-touchscreen.patch;patch=1 \
+                               file://qkeyboard_qws.h \
+                               file://qkeyboard_qws.cpp "
+SRC_URI_append_h3600        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+SRC_URI_append_h3900        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+SRC_URI_append_h1910        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+
+
+S = "${WORKDIR}/qt-${PV}"
+
+export QTDIR = "${S}"
+
+def qte_arch(d):
+	import bb, re
+	arch = bb.data.getVar('TARGET_ARCH', d, 1)
+	if re.match("^i.86$", arch):
+		arch = "x86"
+	elif arch == "x86_64":
+		arch = "x86"
+	elif arch == "mipsel":
+		arch = "mips"
+	return arch
+
+QTE_ARCH := "${@qte_arch(d)}"
+
+EXTRA_OECONF_CONFIG = "-qconfig qpe"
+EXTRA_OECONF_CONFIG_c7x0 = "-qconfig qpe -accel-w100"
+EXTRA_OECONF_CONFIG_native = "-qconfig qpe -qvfb"
+EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif \
+		-xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32"
+EXTRA_OEMAKE = "-e"
+
+#
+# FIXME: Add more here
+#
+EXTRA_DEFINES 			= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DWARNING_UNKNOWN_DEVICE"
+EXTRA_DEFINES_collie 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
+EXTRA_DEFINES_poodle		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
+EXTRA_DEFINES_tosa		= "-DQT_QWS_TSLIB                 -DQT_QWS_SL5XXX -DQT_QWS_SL6000"
+EXTRA_DEFINES_h3600     	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" 
+EXTRA_DEFINES_h3900 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_h1910 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_a716 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_jornada56x	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_jornada6xx	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_jornada7xx	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_simpad		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ   -DQT_QWS_SIMPAD -DQT_QWS_DEVFS"
+EXTRA_DEFINES_c7x0		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
+EXTRA_DEFINES_spitz		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK"
+EXTRA_DEFINES_akita             = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK"
+EXTRA_DEFINES_borzoi            = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK"
+EXTRA_DEFINES_mnci 		= "                               -DQT_QWS_RAMSES                 -DQT_QWS_DEVFS"
+
+export SYSCONF_CC = "${CC}"
+export SYSCONF_CXX = "${CXX}"
+export SYSCONF_LINK = "${CCLD}"
+export SYSCONF_SHLIB = "${CCLD}"
+export SYSCONF_CFLAGS = "${CFLAGS}"
+export SYSCONF_LINK_SHLIB = "${CCLD}"
+export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI"
+#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI"
+export SYSCONF_LFLAGS = "${LDFLAGS} -lts"
+export SYSCONF_LFLAGS_mnci = "${LDFLAGS}"
+export SYSCONF_MOC = "${STAGING_BINDIR}/moc"
+export SYSCONF_UIC = "${STAGING_BINDIR}/uic"
+
+do_configure_prepend_mnci() {
+	chmod -R a+w ${S}/src/kernel
+	cp ${WORKDIR}/qkeyboard_qws.h ${S}/src/kernel
+	cp ${WORKDIR}/qkeyboard_qws.cpp ${S}/src/kernel
+	mkdir bin
+	ln -sf ${STAGING_BINDIR}/moc bin/moc
+	ln -sf ${STAGING_BINDIR}/uic bin/uic
+}
+
+# generate uclibc and eabi configurations
+do_configure() {
+	for f in ${S}/configs/linux-*-g++-shared; do
+		sed -e 's,-linux-,-linux-uclibc-,g' < $f \
+			> `dirname $f`/`basename $f | sed -e 's,linux-,linux-uclibc-,'`
+		sed -e 's,-linux-,-linux-gnueabi-,g' < $f \
+			> `dirname $f`/`basename $f | sed -e 's,linux-,linux-gnueabi-,'`
+	done
+	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
+do_compile() {
+	unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS
+	install -d include/asm/	
+	install -m 0644 ${WORKDIR}/sharp_char.h include/asm/
+	install -d include/linux/
+	install -m 0644 ${WORKDIR}/switches.h   include/linux/
+
+	# Create symlinks first and then compile the library
+	oe_runmake symlinks
+	oe_runmake src-mt sub-src
+}
+
+do_stage() {
+	rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2
+	install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib
+	oe_libinstall -so -C lib lib${PN} ${STAGING_DIR}/${HOST_SYS}/qt2/lib
+	rm -f include/qxt.h
+	install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include
+	cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include
+	cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/
+}
+
+do_install() {
+	oe_libinstall -so -C lib lib${PN} ${D}${palmqtdir}/lib/
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+FILES_${PN} = "${palmqtdir}"
diff --git a/packages/qte/qte-mt-static_2.3.10.bb b/packages/qte/qte-mt-static_2.3.10.bb
new file mode 100644
index 0000000000..ab0844135c
--- /dev/null
+++ b/packages/qte/qte-mt-static_2.3.10.bb
@@ -0,0 +1,23 @@
+require qte-common_${PV}.inc
+PR = "r0"
+
+EXTRA_OECONF += "-thread -static"
+export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI"
+#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI"
+
+do_stage() {
+	rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2
+	install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib
+	oe_libinstall -a -C lib libqte-mt ${STAGING_DIR}/${HOST_SYS}/qt2/lib
+	rm -f include/qxt.h
+	install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include
+	cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include
+	cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/
+}
+
+do_install() {
+	:
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+FILES_${PN} = "${palmqtdir}"
diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb
new file mode 100644
index 0000000000..9363867c3d
--- /dev/null
+++ b/packages/qte/qte-mt_2.3.10.bb
@@ -0,0 +1,11 @@
+require qte-common-${PV}.inc
+
+PR = "r0"
+
+EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif -thread -static \
+		-xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32"
+export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI"
+#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+FILES_${PN} = "${palmqtdir}"
diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index 2cc1c06259..20109ce5b8 100644
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -1,166 +1,2 @@
-DESCRIPTION = "Qt/Embedded Version ${PV}"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-HOMEPAGE = "http://www.trolltech.com"
-LICENSE = "GPL"
-DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
-DEPENDS_mnci = "zlib libpng jpeg uicmoc-native"
-DEPENDS_append_c7x0 = " sharp-aticore-oss"
-PROVIDES = "virtual/qte virtual/libqte2"
-PR = "r31"
-
-SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;md5sum=af7ad30113afc500cab7f5b2f4dec0d7 \
-   	   file://qpe.patch;patch=1 \
-	   file://vt-switch.patch;patch=1 \
-	   file://daemonize.patch;patch=1 \
-	   file://no-moc.patch;patch=1 \
-	   file://gcc3.patch;patch=1 \
-	   file://gcc4.patch;patch=1 \
-	   file://c700-hardware.patch;patch=1 \
-	   file://encoding.patch;patch=1 \
-	   file://fix-qgfxraster.patch;patch=1 \
-	   file://qt-visibility.patch;patch=1 \
-	   file://tslib.patch;patch=1 \
-	   file://simpad.patch;patch=1 \
-	   file://handhelds.patch;patch=1 \
-	   file://qiconview-speed.patch;patch=1 \
-	   file://qtabbar.patch;patch=1 \
-	   file://increase-qxml-robustness.patch;patch=1 \
-	   file://qte-fix-iconsize.patch;patch=1 \
-	   file://fix-linuxfb-setmode.patch;patch=1 \
-	   file://fix-linuxfb-offscreenoverflow.patch;patch=1 \
-	   file://fix-qscreen-sync.patch;patch=1 \
-       file://improve-calibration-r0.patch;patch=1 \
-	   file://key.patch;patch=1 \
-       file://bidimetrics.patch;patch=5 \
-	   file://fix-native-build.patch;patch=1 \
-	   file://simpad-defaultkbd.patch;patch=1 \
-	   file://sharp_char.h \
-	   file://switches.h "
-
-SRC_URI_append_simpad       = "file://devfs.patch;patch=1 "
-SRC_URI_append_c7x0         = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 \
-                               file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 "
-SRC_URI_append_spitz        = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 "
-SRC_URI_append_akita        = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 "
-SRC_URI_append_borzoi       = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 "
-SRC_URI_append_tosa         = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-tosa.patch;patch=1 "
-SRC_URI_append_jornada7xx   = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_jornada56x   = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_mnci         = "file://devfs.patch;patch=1 \
-                               file://mnci.patch;patch=1 \
-                               file://mnci-touchscreen.patch;patch=1 \
-                               file://qkeyboard_qws.h \
-                               file://qkeyboard_qws.cpp "
-SRC_URI_append_h3600        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_h3900        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_h1910        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-
-
-S = "${WORKDIR}/qt-${PV}"
-
-export QTDIR = "${S}"
-
-def qte_arch(d):
-	import bb, re
-	arch = bb.data.getVar('TARGET_ARCH', d, 1)
-	if re.match("^i.86$", arch):
-		arch = "x86"
-	elif arch == "x86_64":
-		arch = "x86"
-	elif arch == "mipsel":
-		arch = "mips"
-	return arch
-
-QTE_ARCH := "${@qte_arch(d)}"
-
-EXTRA_OECONF_CONFIG = "-qconfig qpe"
-EXTRA_OECONF_CONFIG_c7x0 = "-qconfig qpe -accel-w100"
-EXTRA_OECONF_CONFIG_native = "-qconfig qpe -qvfb"
-EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif \
-		-xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32"
-EXTRA_OEMAKE = "-e"
-
-#
-# FIXME: Add more here
-#
-EXTRA_DEFINES 			= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DWARNING_UNKNOWN_DEVICE"
-EXTRA_DEFINES_collie 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
-EXTRA_DEFINES_poodle		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
-EXTRA_DEFINES_tosa		= "-DQT_QWS_TSLIB                 -DQT_QWS_SL5XXX -DQT_QWS_SL6000"
-EXTRA_DEFINES_h3600     	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" 
-EXTRA_DEFINES_h3900 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
-EXTRA_DEFINES_h1910 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
-EXTRA_DEFINES_a716 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
-EXTRA_DEFINES_jornada56x	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
-EXTRA_DEFINES_jornada6xx	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
-EXTRA_DEFINES_jornada7xx	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
-EXTRA_DEFINES_simpad		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ   -DQT_QWS_SIMPAD -DQT_QWS_DEVFS"
-EXTRA_DEFINES_c7x0		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
-EXTRA_DEFINES_spitz		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK"
-EXTRA_DEFINES_akita             = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK"
-EXTRA_DEFINES_borzoi            = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK"
-EXTRA_DEFINES_mnci 		= "                               -DQT_QWS_RAMSES                 -DQT_QWS_DEVFS"
-
-export SYSCONF_CC = "${CC}"
-export SYSCONF_CXX = "${CXX}"
-export SYSCONF_LINK = "${CCLD}"
-export SYSCONF_SHLIB = "${CCLD}"
-export SYSCONF_CFLAGS = "${CFLAGS}"
-export SYSCONF_LINK_SHLIB = "${CCLD}"
-export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI"
-#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI"
-export SYSCONF_LFLAGS = "${LDFLAGS} -lts"
-export SYSCONF_LFLAGS_mnci = "${LDFLAGS}"
-export SYSCONF_MOC = "${STAGING_BINDIR}/moc"
-export SYSCONF_UIC = "${STAGING_BINDIR}/uic"
-
-do_configure_prepend_mnci() {
-	chmod -R a+w ${S}/src/kernel
-	cp ${WORKDIR}/qkeyboard_qws.h ${S}/src/kernel
-	cp ${WORKDIR}/qkeyboard_qws.cpp ${S}/src/kernel
-	mkdir bin
-	ln -sf ${STAGING_BINDIR}/moc bin/moc
-	ln -sf ${STAGING_BINDIR}/uic bin/uic
-}
-
-# generate uclibc and eabi configurations
-do_configure() {
-	for f in ${S}/configs/linux-*-g++-shared; do
-		sed -e 's,-linux-,-linux-uclibc-,g' < $f \
-			> `dirname $f`/`basename $f | sed -e 's,linux-,linux-uclibc-,'`
-		sed -e 's,-linux-,-linux-gnueabi-,g' < $f \
-			> `dirname $f`/`basename $f | sed -e 's,linux-,linux-gnueabi-,'`
-	done
-	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
-}
-
-do_compile() {
-	unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS
-	install -d include/asm/	
-	install -m 0644 ${WORKDIR}/sharp_char.h include/asm/
-	install -d include/linux/
-	install -m 0644 ${WORKDIR}/switches.h   include/linux/
-
-	# Create symlinks first and then compile the library
-	oe_runmake symlinks
-	oe_runmake src-mt sub-src
-}
-
-do_stage() {
-	rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2
-	install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib
-	oe_libinstall -so -C lib libqte ${STAGING_DIR}/${HOST_SYS}/qt2/lib
-	rm -f include/qxt.h
-	install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include
-	cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include
-	cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/
-}
-
-do_install() {
-	oe_libinstall -so -C lib libqte ${D}${palmqtdir}/lib/
-}
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-FILES_${PN} = "${palmqtdir}"
+require qte-common-${PV}.inc
+PR = "r40"