[oe-commits] org.oe.dev qpe 2.3.10: Apply common keyboardless buttonmap for HH.org kernel ports.

[pfalcon commit]

qpe 2.3.10: Apply common keyboardless buttonmap for HH.org kernel ports.
* keyboardless-buttonmap.patch does that
* ipaq-keyboard.patch is patch for 2.4 kernels, should go away.
* ipaq_sound_fix.patch status is unknown. It seems to conatin useful 
validation patch, but at the same time talks about hardcoding something
for uda1341 (which also smells of 2.4). Either way, if it contains something
useful, it should be applied consistently for all machines. While it isn't,
it won't be too much issue to disable it for pocket-pc based devices too.
* Tested on h4000.

++
+       case 0x78:
+ # if defined(QT_QWS_IPAQ)
+           keyCode = Key_F24;  // record
============================================================
--- packages/qte/qte-common_2.3.10.inc  6323bf41e47d7a950cc2729723dbcbb6f884e853
+++ packages/qte/qte-common_2.3.10.inc  b4b84ab449bfd459e2a61d20bac3d2e3e527e2c2
@@ -37,6 +37,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/q
           file://fix-native-build.patch;patch=1 \
           file://simpad-defaultkbd.patch;patch=1 \
           file://fix-errno-exception-spec.patch;patch=1 \
+           file://keyboardless-buttonmap.patch;patch=1 \
           file://sharp_char.h \
           file://switches.h "

@@ -62,16 +63,16 @@ SRC_URI_append_mnci         = "file://de
                                file://mnci-touchscreen.patch;patch=1 \
                                file://qkeyboard_qws.h \
                                file://qkeyboard_qws.cpp "
-SRC_URI_append_h1910        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_h1940        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_h2200        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_h3600        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_h3900        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_h4000        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_h5xxx        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_h6300        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_hx2000       = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_hx4700       = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_h1910        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_h1940        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_h2200        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_h3600        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_h3900        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_h4000        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_h5xxx        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_h6300        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_hx2000       = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_hx4700       = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "


 S = "${WORKDIR}/qt-${PV}"
============================================================
--- packages/qte/qte-mt_2.3.10.bb       6bcca53c33775f83f414b169ac273be1b7f443a3
+++ packages/qte/qte-mt_2.3.10.bb       090b792876515bb19e14563250d46729dc54c88d
@@ -1,5 +1,5 @@ require qte-common_${PV}.inc
 require qte-common_${PV}.inc
-PR = "r4"
+PR = "r5"

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 7dc2fd459da1e96fc61fd1b7bc439f0282c91306
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7dc2fd459da1e96fc61fd1b7bc439f0282c91306
Files:
1
packages/qte/qte-2.3.10/keyboardless-buttonmap.patch
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-mt_2.3.10.bb
Diffs:

#
# mt diff -r1a49ef5ca2fff38afd102f2a76339589da7a2e95 -r7dc2fd459da1e96fc61fd1b7bc439f0282c91306
#
# 
# 
# add_file "packages/qte/qte-2.3.10/keyboardless-buttonmap.patch"
#  content [e6d522ba582ea0cb7b598d6b1009535acbc7f649]
# 
# patch "packages/qte/qte-common_2.3.10.inc"
#  from [6323bf41e47d7a950cc2729723dbcbb6f884e853]
#    to [b4b84ab449bfd459e2a61d20bac3d2e3e527e2c2]
# 
# patch "packages/qte/qte-mt_2.3.10.bb"
#  from [6bcca53c33775f83f414b169ac273be1b7f443a3]
#    to [090b792876515bb19e14563250d46729dc54c88d]
# 
============================================================
--- packages/qte/qte-2.3.10/keyboardless-buttonmap.patch	e6d522ba582ea0cb7b598d6b1009535acbc7f649
+++ packages/qte/qte-2.3.10/keyboardless-buttonmap.patch	e6d522ba582ea0cb7b598d6b1009535acbc7f649
@@ -0,0 +1,19 @@
+--- qt-2.3.10/src/kernel/qkeyboard_qws.cpp.org	2006-09-16 20:54:32.000000000 +0000
++++ qt-2.3.10/src/kernel/qkeyboard_qws.cpp	2006-10-06 13:25:29.000000000 +0000
+@@ -1018,6 +1018,16 @@
+ 	    repeatable = FALSE;
+ 	    break;
+ #endif
++
++	case 0x74: // kernel KEY_POWER
++	    keyCode = Key_F34;
++	    repeatable = FALSE;
++	    break;
++	case 89: // kernel KEY_RO
++	    keyCode = Key_F24;
++	    repeatable = FALSE;
++	    break;
++
+ 	case 0x78:
+ # if defined(QT_QWS_IPAQ)
+ 	    keyCode = Key_F24;  // record
============================================================
--- packages/qte/qte-common_2.3.10.inc	6323bf41e47d7a950cc2729723dbcbb6f884e853
+++ packages/qte/qte-common_2.3.10.inc	b4b84ab449bfd459e2a61d20bac3d2e3e527e2c2
@@ -37,6 +37,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/q
 	   file://fix-native-build.patch;patch=1 \
 	   file://simpad-defaultkbd.patch;patch=1 \
 	   file://fix-errno-exception-spec.patch;patch=1 \
+           file://keyboardless-buttonmap.patch;patch=1 \
 	   file://sharp_char.h \
 	   file://switches.h "
 
@@ -62,16 +63,16 @@ SRC_URI_append_mnci         = "file://de
                                file://mnci-touchscreen.patch;patch=1 \
                                file://qkeyboard_qws.h \
                                file://qkeyboard_qws.cpp "
-SRC_URI_append_h1910        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_h1940        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_h2200        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_h3600        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_h3900        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_h4000        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_h5xxx        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_h6300        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_hx2000       = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_hx4700       = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_h1910        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_h1940        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_h2200        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_h3600        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_h3900        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_h4000        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_h5xxx        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_h6300        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_hx2000       = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_hx4700       = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
 
 
 S = "${WORKDIR}/qt-${PV}"
============================================================
--- packages/qte/qte-mt_2.3.10.bb	6bcca53c33775f83f414b169ac273be1b7f443a3
+++ packages/qte/qte-mt_2.3.10.bb	090b792876515bb19e14563250d46729dc54c88d
@@ -1,5 +1,5 @@ require qte-common_${PV}.inc
 require qte-common_${PV}.inc
-PR = "r4"
+PR = "r5"
 
 EXTRA_OECONF += "-thread"