[oe-commits] org.oe.dev qte: First stage of adhoc machine support cleanup: remove mnci overrides.

[pfalcon commit]

qte: First stage of adhoc machine support cleanup: remove mnci overrides.
* Negotiated with the machine maintainer, Holger Schurig. QTE 2.3 is not really
used on MNCI/RAMSES, and at any time in can be re-added by following generic
interfaces guidelines (TSLIB, Linux input sybsystem, etc.)

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: d6472bcf61be355b72e9d96a067952d4f9b12831
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d6472bcf61be355b72e9d96a067952d4f9b12831
Files:
1
packages/qte/qte-2.3.10/mnci-touchscreen.patch
packages/qte/qte-2.3.10/deprecated/mnci-touchscreen.patch
packages/qte/qte-2.3.10/mnci.patch
packages/qte/qte-2.3.10/deprecated/mnci.patch
packages/qte/qte-2.3.10/openmn
packages/qte/qte-2.3.10/deprecated/openmn
packages/qte/qte-2.3.10/deprecated
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-common_2.3.12.inc
Diffs:

#
# mt diff -ra2b32d1881604a26db77ff820b0dfc1db34bd902 -rd6472bcf61be355b72e9d96a067952d4f9b12831
#
# 
# 
# rename "packages/qte/qte-2.3.10/mnci-touchscreen.patch"
#     to "packages/qte/qte-2.3.10/deprecated/mnci-touchscreen.patch"
# 
# rename "packages/qte/qte-2.3.10/mnci.patch"
#     to "packages/qte/qte-2.3.10/deprecated/mnci.patch"
# 
# rename "packages/qte/qte-2.3.10/openmn"
#     to "packages/qte/qte-2.3.10/deprecated/openmn"
# 
# add_dir "packages/qte/qte-2.3.10/deprecated"
# 
# patch "packages/qte/qte-common_2.3.10.inc"
#  from [66935856b0ba04d609bdfbc51319f0c6784fa0b7]
#    to [4f1d2039506a32408d82758590178638308a0c96]
# 
# patch "packages/qte/qte-common_2.3.12.inc"
#  from [071fed402fdad0133a421c02b62c096717e3a535]
#    to [d14749cf53a308b080c951db99e9e2f3b5d47aaa]
# 
============================================================
--- packages/qte/qte-common_2.3.10.inc	66935856b0ba04d609bdfbc51319f0c6784fa0b7
+++ packages/qte/qte-common_2.3.10.inc	4f1d2039506a32408d82758590178638308a0c96
@@ -1,10 +1,9 @@ DEPENDS = "zlib libpng jpeg tslib uicmoc
 DESCRIPTION = "Qt/Embedded Version ${PV}"
 SECTION = "libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL"
 DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
-DEPENDS_mnci = "zlib libpng jpeg uicmoc-native"
 DEPENDS_append_c7x0 = " sharp-aticore-oss"
 PROVIDES = "virtual/libqte2"
 
@@ -64,11 +63,6 @@ SRC_URI_append_jornada56x   = "file://ip
 SRC_URI_append_tosa         = "file://kernel-keymap-tosa.patch;patch=1 "
 SRC_URI_append_jornada7xx   = "file://ipaq_sound_fix.patch;patch=1 "
 SRC_URI_append_jornada56x   = "file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_mnci         = "file://devfs.patch;patch=1 \
-                               file://mnci.patch;patch=1 \
-                               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 "
@@ -133,7 +127,6 @@ EXTRA_DEFINES_tosa		= "-DQT_QWS_TSLIB -D
 EXTRA_DEFINES_collie 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
 EXTRA_DEFINES_poodle		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
 EXTRA_DEFINES_tosa		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SL6000"
-EXTRA_DEFINES_mnci 		= "                               -DQT_QWS_RAMSES                 -DQT_QWS_DEVFS"
 
 #
 # don't touch anything below here
@@ -148,19 +141,9 @@ export SYSCONF_LFLAGS = "${LDFLAGS} -lts
 # enable if gcc supports visibility
 #export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -frtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI"
 export SYSCONF_LFLAGS = "${LDFLAGS} -lts"
-export SYSCONF_LFLAGS_mnci = "${LDFLAGS}"
 export SYSCONF_MOC = "${STAGING_BINDIR_NATIVE}/moc"
 export SYSCONF_UIC = "${STAGING_BINDIR_NATIVE}/uic"
 
-do_configure_prepend_mnci() {
-	chmod -R a+w ${S}/src/kernel
-	cp ${WORKDIR}/qkeyboard_qws.h ${S}/src/kernel
-	cp ${WORKDIR}/qkeyboard_qws.cpp ${S}/src/kernel
-	mkdir bin
-	ln -sf ${STAGING_BINDIR_NATIVE}/moc bin/moc
-	ln -sf ${STAGING_BINDIR_NATIVE}/uic bin/uic
-}
-
 # generate uclibc and eabi configurations
 do_configure() {
 	for f in ${S}/configs/linux-*-g++-shared; do
============================================================
--- packages/qte/qte-common_2.3.12.inc	071fed402fdad0133a421c02b62c096717e3a535
+++ packages/qte/qte-common_2.3.12.inc	d14749cf53a308b080c951db99e9e2f3b5d47aaa
@@ -41,11 +41,6 @@ SRC_URI_append_jornada56x   = "file://ke
 SRC_URI_append_tosa         = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-tosa.patch;patch=1 "
 SRC_URI_append_jornada7xx   = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 "
 SRC_URI_append_jornada56x   = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_mnci         = "file://devfs.patch;patch=1 \
-                               file://mnci.patch;patch=1 \
-                               file://mnci-touchscreen.patch;patch=1 \
-                               file://qkeyboard_qws.h \
-                               file://qkeyboard_qws.cpp "
 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_h1910        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "