summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-05-15 13:04:48 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-05-15 13:04:48 +0000
commitdd9700214e77892429bc30bee41fcdd846471fcc (patch)
tree534c84b781f9252f91c78e015bc2387eeaae0c6c
parentabb6051c92ff3031c2c83fea909f95b5f2356c23 (diff)
parent6b1efd1aa136320f3684af30c98962209b5353db (diff)
merge of '8e5bee62af9b2ba2c2fa97cf2f3253376440235e'
and 'a10fdcce94239fbbf0aff43c6c367b8b407525ab'
-rw-r--r--packages/libopie/libopie2_1.2.3.bb7
-rw-r--r--packages/qte/qte-common_2.3.10.inc1
-rw-r--r--packages/qte/qte-mt_2.3.10.bb2
3 files changed, 6 insertions, 4 deletions
diff --git a/packages/libopie/libopie2_1.2.3.bb b/packages/libopie/libopie2_1.2.3.bb
index 1ecc983b14..dc378d0646 100644
--- a/packages/libopie/libopie2_1.2.3.bb
+++ b/packages/libopie/libopie2_1.2.3.bb
@@ -1,10 +1,11 @@
require ${PN}.inc
-PR = "r2"
+PR = "r3"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
file://include.pro \
- file://gcc-syntax-fix.patch;patch=1 \
- file://h4000_and_default_rot.patch;patch=1"
+ file://gcc-syntax-fix.patch;patch=1 \
+ file://h4000_and_default_rot.patch;patch=1 \
+ file://remove_h2200_rotate_fix.patch;patch=1"
SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc
index 9b69b00b48..6f0b1344b3 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://kernel-keymap-corgi.patch;patch=1 \
file://kernel-asm-page.patch;patch=1 \
file://remove-unused-kbdhandler.patch;patch=1 \
+ file://disable-dup-rotation.patch;patch=1 \
file://sharp_char.h \
file://switches.h "
diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb
index d9c3de136f..9e3ee5c584 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 = "r25"
+PR = "r26"
EXTRA_OECONF += "-thread"