7 files changed, 12 insertions, 14 deletions
diff --git a/packages/qte/qte-2.3.10/c700-hardware.patch b/packages/qte/qte-2.3.10/deprecated/c700-hardware.patch
index fa4bd25f37..fa4bd25f37 100644
--- a/packages/qte/qte-2.3.10/c700-hardware.patch
+++ b/packages/qte/qte-2.3.10/deprecated/c700-hardware.patch
diff --git a/packages/qte/qte-2.3.10/simpad-defaultkbd.patch b/packages/qte/qte-2.3.10/deprecated/simpad-defaultkbd.patch
index 3e5450a4da..3e5450a4da 100644
--- a/packages/qte/qte-2.3.10/simpad-defaultkbd.patch
+++ b/packages/qte/qte-2.3.10/deprecated/simpad-defaultkbd.patch
diff --git a/packages/qte/qte-2.3.10/simpad.patch b/packages/qte/qte-2.3.10/deprecated/simpad.patch
index 8a728ef74a..8a728ef74a 100644
--- a/packages/qte/qte-2.3.10/simpad.patch
+++ b/packages/qte/qte-2.3.10/deprecated/simpad.patch
diff --git a/packages/qte/qte-2.3.10/kernel-keymap-CXK.patch b/packages/qte/qte-2.3.10/spitz-adhoc-keypad-rotate.patch
index a32207dc14..a32207dc14 100644
--- a/packages/qte/qte-2.3.10/kernel-keymap-CXK.patch
+++ b/packages/qte/qte-2.3.10/spitz-adhoc-keypad-rotate.patch
diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc
index 972ea7d4a6..4b482fe780 100644
--- a/packages/qte/qte-common_2.3.10.inc
+++ b/packages/qte/qte-common_2.3.10.inc
@@ -25,12 +25,10 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m
 	   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 \
@@ -43,7 +41,6 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m
 	   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://keyboardless-buttonmap.patch;patch=1 \
            file://kernel-keymap.patch;patch=1 \
@@ -61,8 +58,8 @@ W100_ACCEL_PATCHES = "file://c7x0-w100-accel.patch;patch=1 \
 		      file://suspend-resume-hooks.patch;patch=1"
 
 SRC_URI_append_c7x0         = "${W100_ACCEL_PATCHES} "
-SRC_URI_append_spitz        = "file://kernel-keymap-CXK.patch;patch=1 "
-SRC_URI_append_akita        = "file://kernel-keymap-CXK.patch;patch=1 "
+SRC_URI_append_spitz        = "file://spitz-adhoc-keypad-rotate.patch;patch=1 "
+SRC_URI_append_akita        = "file://spitz-adhoc-keypad-rotate.patch;patch=1 "
 
 # "ipaqs" used to have this, but later were proven to at least work
 # without it. Review again and see if has interesting bits to be applied
@@ -117,10 +114,10 @@ EXTRA_DEFINES_palmld		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_palmt650		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_palmtx		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_palmz72		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
-EXTRA_DEFINES_simpad		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ   -DQT_QWS_SIMPAD"
-EXTRA_DEFINES_c7x0		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700"
-EXTRA_DEFINES_spitz		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700 -DQT_QWS_SLCXK"
-EXTRA_DEFINES_akita             = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700 -DQT_QWS_SLCXK"
+EXTRA_DEFINES_simpad		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_c7x0		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
+EXTRA_DEFINES_spitz		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLCXK"
+EXTRA_DEFINES_akita             = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLCXK"
 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_CUSTOM -DQT_QWS_SL5XXX"
diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb
index 563f5cf1ae..b62cfef74f 100644
--- a/packages/qte/qte-mt_2.3.10.bb
+++ b/packages/qte/qte-mt_2.3.10.bb
@@ -1,5 +1,5 @@
 require qte-common_${PV}.inc
-PR = "r20"
+PR = "r21"
 
 EXTRA_OECONF += "-thread"
 
diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb
index 1bdea2ed4d..018ed9a9c8 100644
--- a/packages/tasks/task-opie.bb
+++ b/packages/tasks/task-opie.bb
@@ -5,7 +5,7 @@ ALLOW_EMPTY = "1"
 LICENSE = "MIT"
 PROVIDES = "task-opie-everything"
 
-PR = "r10"
+PR = "r11"
 
 PACKAGES = "task-opie-base \
             task-opie-base-applets task-opie-base-apps \
@@ -26,10 +26,11 @@ PACKAGES += "task-opie-everything"
 # Dependencies to get the launcher up and running
 #
 RDEPENDS_task-opie-base = "opie-init opie-alarm opie-qcop opie-qss opie-quicklauncher \
-                           opie-taskbar opie-taskbar-images-240x320 opie-pics opie-sounds opie-freetype \
+                           opie-taskbar opie-pics opie-sounds opie-freetype \
                            ttf-dejavu-sans ttf-dejavu-sans-mono"
-# TODO: Instead of opie-taskbar-images-240x320 version for target machine should be used, pending
-# mechanism to specify screen size for all machines.
+# Recommend both landscape and portrait backgrounds
+RRECOMMENDS_task-opie-base = "opie-taskbar-images-${MACHINE_DISPLAY_WIDTH_PIXELS}x${MACHINE_DISPLAY_HEIGHT_PIXELS} \
+                              opie-taskbar-images-${MACHINE_DISPLAY_HEIGHT_PIXELS}x${MACHINE_DISPLAY_WIDTH_PIXELS}"
 
 #
 # things for reasonable bootstrap image