qte 2.3.10: kernel-keymap-corgi.patch appears to be safe to be applied

unconditionally (adds new keycodes to "Zaurus" mapping, doesn't change anything).

diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc
index 47099b1..79a77ba 100644 (file)
--- a/packages/qte/qte-common_2.3.10.inc
+++ b/packages/qte/qte-common_2.3.10.inc
@@ -47,6 +47,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m
           file://fix-errno-exception-spec.patch;patch=1 \
            file://keyboardless-buttonmap.patch;patch=1 \
            file://kernel-keymap.patch;patch=1 \
+          file://kernel-keymap-corgi.patch;patch=1 \
           file://kernel-asm-page.patch;patch=1 \
           file://sharp_char.h \
           file://switches.h "
@@ -54,13 +55,14 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m
 #
 # add device specific patches here
 #
-SRC_URI_append_c7x0         = "file://kernel-keymap-corgi.patch;patch=1 \
-                               file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 \
-                               file://c7x0-w100-gcc4.patch;patch=1 "
-SRC_URI_append_spitz        = "file://kernel-keymap-corgi.patch;patch=1 \
-                               file://kernel-keymap-CXK.patch;patch=1 "
-SRC_URI_append_akita        = "file://kernel-keymap-corgi.patch;patch=1 \
-                               file://kernel-keymap-CXK.patch;patch=1 "
+
+W100_ACCEL_PATCHES = "file://c7x0-w100-accel.patch;patch=1 \
+                      file://c7x0-w100-gcc4.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_tosa         = "file://kernel-keymap-tosa.patch;patch=1 "
 
 # "ipaqs" used to have this, but later were proven to at least work

diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb
index 87e2a84..428b973 100644 (file)
--- 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 = "r16"
+PR = "r17"
 
 EXTRA_OECONF += "-thread"