On Sunday 08 June 2008, Koen Kooi wrote:
> Please send patches against the stable branch to this list so we can
> review them.
Attached.
Cheers,
Paul
#
# old_revision [a0a3cc0088bc51023a19b1d6942f7cc643e6bb52]
#
# add_file "packages/libopie/libopie2/ipaq_rotate_fix.patch"
# content [1129069abce417b89f7e1a975dd2f426736c6db5]
#
# add_file "packages/qte/qte-2.3.10/disable-dup-rotation.patch"
# content [ae6639da1ec281b77ad87d3e1de4ba6b24151169]
#
# patch "packages/libopie/libopie2_1.2.3.bb"
# from [63a7fc0db1279bd05e64e2b06c6e583e83ec1cca]
# to [395fba639e13adcbc1453d2f7f8397678696593b]
#
# patch "packages/qte/qte-common_2.3.10.inc"
# from [1c5fce4a8c48597719722a7cb916d317300a473f]
# to [63b7ac5a4fa886a59d36b2c2099094323726e2b0]
#
# patch "packages/qte/qte-mt_2.3.10.bb"
# from [4241677b274551c8db9002c2c4aebecaf5272154]
# to [9de7ec362919755e02c79a584fd115bdf5a9f152]
#
============================================================
--- packages/libopie/libopie2/ipaq_rotate_fix.patch 1129069abce417b89f7e1a975dd2f426736c6db5
+++ packages/libopie/libopie2/ipaq_rotate_fix.patch 1129069abce417b89f7e1a975dd2f426736c6db5
@@ -0,0 +1,23 @@
+--- libopie2/opiecore/device/odevice_ipaq.cpp 2008-05-26 16:33:01.000000000 +0100
++++ libopie2/opiecore/device/odevice_ipaq.cpp 2008-05-26 16:33:40.000000000 +0100
+@@ -331,16 +331,10 @@
+ case Key_Down : {
+ int quarters;
+ switch (d->m_rotation) {
+- case Rot0: quarters = 3/*270deg*/; break;
+- case Rot90: quarters = 2/*270deg*/; break;
+- case Rot180: quarters = 1/*270deg*/; break;
+- case Rot270: quarters = 0/*270deg*/; break;
+- }
+- if( d->m_model == Model_iPAQ_H22xx ) {
+- // FIXME: there's something screwed with the keycodes being sent on h2200. I have
+- // added a temporary workaround for this here, but the bug should be fixed properly
+- // later in the right place. - Paul Eggleton 25/07/2007
+- quarters = 0;
++ case Rot0: quarters = 0/*0deg*/; break;
++ case Rot90: quarters = 1/*90deg*/; break;
++ case Rot180: quarters = 2/*180deg*/; break;
++ case Rot270: quarters = 3/*270deg*/; break;
+ }
+ newkeycode = Key_Left + ( keycode - Key_Left + quarters ) % 4;
+ break;
============================================================
--- packages/qte/qte-2.3.10/disable-dup-rotation.patch ae6639da1ec281b77ad87d3e1de4ba6b24151169
+++ packages/qte/qte-2.3.10/disable-dup-rotation.patch ae6639da1ec281b77ad87d3e1de4ba6b24151169
@@ -0,0 +1,13 @@
+--- qte/src/kernel/kernelkeyboard.cpp 2008-05-26 16:25:23.000000000 +0100
++++ qte/src/kernel/kernelkeyboard.cpp 2008-05-26 16:27:52.000000000 +0100
+@@ -627,8 +627,10 @@
+ case Qt::Key_Down:
+ unicode = 0xffff;
+ mod_key = false;
++#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
+ if (qt_screen->isTransformed())
+ qtKeyCode = static_cast<Qt::Key>( xform_dirkey(static_cast<int>( qtKeyCode ) ) );
++#endif
+ break;
+ /*
+ * handle lock, we don't handle scroll lock!
============================================================
--- packages/libopie/libopie2_1.2.3.bb 63a7fc0db1279bd05e64e2b06c6e583e83ec1cca
+++ packages/libopie/libopie2_1.2.3.bb 395fba639e13adcbc1453d2f7f8397678696593b
@@ -1,10 +1,11 @@ require ${PN}.inc
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://h4000_and_default_rot.patch;patch=1 \
+ file://ipaq_rotate_fix.patch;patch=1"
SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
============================================================
--- packages/qte/qte-common_2.3.10.inc 1c5fce4a8c48597719722a7cb916d317300a473f
+++ packages/qte/qte-common_2.3.10.inc 63b7ac5a4fa886a59d36b2c2099094323726e2b0
@@ -47,6 +47,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/q
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 "
============================================================
--- packages/qte/qte-mt_2.3.10.bb 4241677b274551c8db9002c2c4aebecaf5272154
+++ packages/qte/qte-mt_2.3.10.bb 9de7ec362919755e02c79a584fd115bdf5a9f152
@@ -1,5 +1,5 @@ require qte-common_${PV}.inc
require qte-common_${PV}.inc
-PR = "r25"
+PR = "r26"
EXTRA_OECONF += "-thread"
#
# old_revision [1007839d0212365ae91bf35580b76dac1cf35577]
#
# add_file "packages/libopieobex/files/disable-bt-check.patch"
# content [4531ca6db356b9e34c43ab4986901f13cbef2ad4]
#
# patch "packages/libopieobex/libopieobex0_1.2.3.bb"
# from [d78020e74a92f741a163fff78e554f93bd96f91e]
# to [0c803763dbf3b86af956d5c0b3d2520ece6bcc8c]
#
# patch "packages/libopieobex/libopieobex0_cvs.bb"
# from [0e5adb40de222cf5c66a7884fa46c00160d179a7]
# to [8f777b6cc6d58e21975d108a806c55a81f01f4a4]
#
============================================================
--- packages/libopieobex/files/disable-bt-check.patch 4531ca6db356b9e34c43ab4986901f13cbef2ad4
+++ packages/libopieobex/files/disable-bt-check.patch 4531ca6db356b9e34c43ab4986901f13cbef2ad4
@@ -0,0 +1,19 @@
+--- obex/obex.pro 2007-07-20 23:44:06.000000000 +1200
++++ obex/obex.pro 2007-10-18 17:57:15.000000000 +1300
+@@ -13,12 +13,12 @@
+ include( $(OPIEDIR)/include.pro )
+ target.path = $$prefix/plugins/applets
+
+-#FIXME: These parameters are used if bluetooth is used
+-CONFTEST = $$system( echo $CONFIG_LIBOPIETOOTH )
+-contains( CONFTEST, y ){
++#FIXME: This test does not work under OE. Instead, just always enable bluetooth.
++#CONFTEST = $$system( echo $CONFIG_LIBOPIETOOTH )
++#contains( CONFTEST, y ){
+ HEADERS += btobex.h
+ SOURCES += btobex.cpp
+ INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib
+ LIBS += -lopietooth1 -lbluetooth
+ DEFINES += BLUETOOTH
+-}
++#}
============================================================
--- packages/libopieobex/libopieobex0_1.2.3.bb d78020e74a92f741a163fff78e554f93bd96f91e
+++ packages/libopieobex/libopieobex0_1.2.3.bb 0c803763dbf3b86af956d5c0b3d2520ece6bcc8c
@@ -1,5 +1,6 @@ require libopieobex0.inc
require libopieobex0.inc
+PR = "r1"
-
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ file://disable-bt-check.patch;patch=1"
- ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
============================================================
--- packages/libopieobex/libopieobex0_cvs.bb 0e5adb40de222cf5c66a7884fa46c00160d179a7
+++ packages/libopieobex/libopieobex0_cvs.bb 8f777b6cc6d58e21975d108a806c55a81f01f4a4
@@ -1,6 +1,7 @@ PV = "${OPIE_CVS_PV}"
require libopieobex0.inc
PV = "${OPIE_CVS_PV}"
-PR = "r6"
+PR = "r7"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \
+ ${HANDHELDS_CVS};module=opie/pics \
+ file://disable-bt-check.patch;patch=1"
- ${HANDHELDS_CVS};module=opie/pics"
#
# old_revision [b116a050ba36ba3406b3a8b342e36d24bdd70231]
#
# add_file "packages/libqpe/libqpe-opie/fix-sd-card-path.patch"
# content [286bc1a1b8b869d1c408efaf25d0799d8177ef37]
#
# patch "packages/libqpe/libqpe-opie_1.2.3.bb"
# from [8c32d00717f267664f0048b023897704ed2bb6b3]
# to [e1f62cd8a04ab15a45006ed051ef1ad1e05c9f1f]
#
============================================================
--- packages/libqpe/libqpe-opie/fix-sd-card-path.patch 286bc1a1b8b869d1c408efaf25d0799d8177ef37
+++ packages/libqpe/libqpe-opie/fix-sd-card-path.patch 286bc1a1b8b869d1c408efaf25d0799d8177ef37
@@ -0,0 +1,17 @@
+Index: library/storage.cpp
+===================================================================
+RCS file: /cvs/opie/library/storage.cpp,v
+retrieving revision 1.25
+retrieving revision 1.26
+diff -U3 -r1.25 -r1.26
+--- library/storage.cpp 7 Mar 2005 14:32:58 -0000 1.25
++++ library/storage.cpp 29 Dec 2007 02:14:09 -0000 1.26
+@@ -307,7 +307,7 @@
+ bool hasMmc=false;
+ if( deviceTab("/dev/mmc/part"))
+ hasMmc=true;
+- if( deviceTab("/dev/mmcd"))
++ else if( deviceTab("/dev/mmcblk"))
+ hasMmc=true;
+ return hasMmc;
+ }
============================================================
--- packages/libqpe/libqpe-opie_1.2.3.bb 8c32d00717f267664f0048b023897704ed2bb6b3
+++ packages/libqpe/libqpe-opie_1.2.3.bb e1f62cd8a04ab15a45006ed051ef1ad1e05c9f1f
@@ -1,11 +1,12 @@ require ${PN}.inc
require ${PN}.inc
-PR = "r1"
+PR = "r2"
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
file://fix-titleheight.patch;patch=1 \
file://unbreak-logging.patch;patch=1 \
file://citytime-path.patch;patch=1 \
+ file://fix-sd-card-path.patch;patch=1 \
"
============================================================
--- classes/opie.bbclass 3520a2c069712e9db8ce48af55f65b869bd6b9fd
+++ classes/opie.bbclass ed3321a9ae1152bdd9852909d6fae887c7453365
@@ -22,7 +22,6 @@ EXTRA_QMAKEVARS_POST += " DESTDIR=${S} "
# to be consistent, put all targets into workdir
# NOTE: leave one space at the end, other files are expecting that
EXTRA_QMAKEVARS_POST += " DESTDIR=${S} "
-EXTRA_QMAKEVARS_POST += " DEFINES+=OPIE_BINDIR='\"${bindir}\"' DEFINES+=OPIE_LIBDIR='\"${libdir}/opie/lib\"' DEFINES+=OPIE_QTDIR='\"${libdir}/opie\"' "
# Opie standard TAG value
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
============================================================
--- classes/palmtop.bbclass 56d2e8dc703cfb39ea14ec0fc013546fcd6a20bb
+++ classes/palmtop.bbclass a14ffdac1a4f7fbd2aade9ceab8d395a394228ca
@@ -17,6 +17,7 @@ QT_LIBRARY = '[EMAIL PROTECTED]("PALMT
EXTRA_QMAKEVARS_POST += "[EMAIL PROTECTED]"LIBS+=-lqpe ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}"
DEPENDS_prepend = "[EMAIL PROTECTED]"virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}"
QT_LIBRARY = '[EMAIL PROTECTED]("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
+EXTRA_QMAKEVARS_POST += " DEFINES+=OPIE_BINDIR='\"${bindir}\"' DEFINES+=OPIE_LIBDIR='\"${libdir}/opie/lib\"' DEFINES+=OPIE_QTDIR='\"${libdir}/opie\"' "
PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
FILES_${PN} += " ${palmtopdir} "
============================================================
--- packages/libqpe/libqpe-opie_1.2.3.bb 582b244b7c4fb04f2264278eed3f0b0f45fd881c
+++ packages/libqpe/libqpe-opie_1.2.3.bb 8c32d00717f267664f0048b023897704ed2bb6b3
@@ -1,9 +1,11 @@ require ${PN}.inc
require ${PN}.inc
+PR = "r1"
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
file://fix-titleheight.patch;patch=1 \
file://unbreak-logging.patch;patch=1 \
+ file://citytime-path.patch;patch=1 \
"
============================================================
--- packages/libqpe/libqpe-opie_cvs.bb f276b9b611e6c72c97af9cae949f23dbd6ad44d7
+++ packages/libqpe/libqpe-opie_cvs.bb f7a9e1d971d1fc6decd1948f9f99ef010266ec7c
@@ -5,5 +5,6 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/
SRC_URI = "${HANDHELDS_CVS};module=opie/library \
file://fix-titleheight.patch;patch=1 \
file://unbreak-logging.patch;patch=1 \
+ file://citytime-path.patch;patch=1 \
"
============================================================
--- packages/libqpe/libqpe-opie/citytime-path.patch e3f95dd0bb4b166d7b1bb48e28f0fc6ea63aa372
+++ packages/libqpe/libqpe-opie/citytime-path.patch e3f95dd0bb4b166d7b1bb48e28f0fc6ea63aa372
@@ -0,0 +1,11 @@
+--- library/tzselect.cpp.orig 2008-01-12 21:05:49.000000000 +1300
++++ library/tzselect.cpp 2008-01-12 21:06:01.000000000 +1300
+@@ -273,7 +273,7 @@
+ void TimeZoneSelector::slotExecute( void )
+ {
+ // execute the world time application...
+- if (QFile::exists(QPEApplication::qpeDir()+"bin/citytime"))
++ if (QFile::exists(OPIE_BINDIR "/citytime"))
+ Global::execute( "citytime" );
+ else
+ QMessageBox::warning(this,tr("citytime executable not found"),
_______________________________________________
Openembedded-stablebranch mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-stablebranch
