[oe-commits] org.oe.dev qte 2.3.10: kernel-keymap-corgi.patch appears to be safe to be applied

[pfalcon commit]

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).

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 9390b0535d8e7f267a934a104afb3ec271386743
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9390b0535d8e7f267a934a104afb3ec271386743
Files:
1
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-mt_2.3.10.bb
Diffs:

#
# mt diff -rd5697dd3c63fe1acd5e3a9f7f831ce88a871e34c -r9390b0535d8e7f267a934a104afb3ec271386743
#
# 
# 
# patch "packages/qte/qte-common_2.3.10.inc"
#  from [a48e62e21b1cc3068ee5963762c16ee388f3b3b9]
#    to [58250b89691c1d93785c622140a3d2ac4811e575]
# 
# patch "packages/qte/qte-mt_2.3.10.bb"
#  from [b12df9e6a73c7f287970ed781c24947bf8685426]
#    to [a3ba8bd85a149c38fea9a0deedd00ff8e8208cec]
# 
============================================================
--- packages/qte/qte-common_2.3.10.inc	a48e62e21b1cc3068ee5963762c16ee388f3b3b9
+++ packages/qte/qte-common_2.3.10.inc	58250b89691c1d93785c622140a3d2ac4811e575
@@ -47,6 +47,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/q
 	   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/q
 #
 # 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
============================================================
--- packages/qte/qte-mt_2.3.10.bb	b12df9e6a73c7f287970ed781c24947bf8685426
+++ packages/qte/qte-mt_2.3.10.bb	a3ba8bd85a149c38fea9a0deedd00ff8e8208cec
@@ -1,5 +1,5 @@ require qte-common_${PV}.inc
 require qte-common_${PV}.inc
-PR = "r16"
+PR = "r17"
 
 EXTRA_OECONF += "-thread"