summaryrefslogtreecommitdiff
path: root/packages/qte
diff options
context:
space:
mode:
authorSergey Lapin <slapinid@gmail.com>2007-07-12 18:41:42 +0000
committerSergey Lapin <slapinid@gmail.com>2007-07-12 18:41:42 +0000
commitbf1aebc777fb094b6d70cb2557e909cacf226a6b (patch)
tree3b7eb3c03b90ae77996887b28cdb3cb0683f8d49 /packages/qte
parent3b1a342d9ddecfc89a4b761ea66d7a30c15f7d7a (diff)
parent1115a92bd7352643e133e8d090e45a30f23160a9 (diff)
merge of '0fa75c6f3cf77dc7bedae2843b12d203a3d441a6'
and 'bc4eddebb729c3e70a2c3d752d08bf335cbd0c9f'
Diffstat (limited to 'packages/qte')
-rw-r--r--packages/qte/qte-common_2.3.10.inc16
-rw-r--r--packages/qte/qte-mt_2.3.10.bb2
2 files changed, 10 insertions, 8 deletions
diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc
index 47099b1038..79a77ba47a 100644
--- 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 87e2a8434f..428b9735d1 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 = "r16"
+PR = "r17"
EXTRA_OECONF += "-thread"