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.)

diff --git a/packages/qte/qte-2.3.10/openmn/.mtn2git_empty b/packages/qte/qte-2.3.10/deprecated/.mtn2git_empty
similarity index 100%
rename from packages/qte/qte-2.3.10/openmn/.mtn2git_empty
rename to packages/qte/qte-2.3.10/deprecated/.mtn2git_empty

diff --git a/packages/qte/qte-2.3.10/mnci-touchscreen.patch b/packages/qte/qte-2.3.10/deprecated/mnci-touchscreen.patch
similarity index 100%
rename from packages/qte/qte-2.3.10/mnci-touchscreen.patch
rename to packages/qte/qte-2.3.10/deprecated/mnci-touchscreen.patch

diff --git a/packages/qte/qte-2.3.10/mnci.patch b/packages/qte/qte-2.3.10/deprecated/mnci.patch
similarity index 100%
rename from packages/qte/qte-2.3.10/mnci.patch
rename to packages/qte/qte-2.3.10/deprecated/mnci.patch

diff --git a/packages/qte/qte-2.3.10/deprecated/openmn/.mtn2git_empty b/packages/qte/qte-2.3.10/deprecated/openmn/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.cpp b/packages/qte/qte-2.3.10/deprecated/openmn/qkeyboard_qws.cpp
similarity index 100%
rename from packages/qte/qte-2.3.10/openmn/qkeyboard_qws.cpp
rename to packages/qte/qte-2.3.10/deprecated/openmn/qkeyboard_qws.cpp

diff --git a/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.h b/packages/qte/qte-2.3.10/deprecated/openmn/qkeyboard_qws.h
similarity index 100%
rename from packages/qte/qte-2.3.10/openmn/qkeyboard_qws.h
rename to packages/qte/qte-2.3.10/deprecated/openmn/qkeyboard_qws.h

diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc
index f148a82..6520405 100644 (file)
--- a/packages/qte/qte-common_2.3.10.inc
+++ b/packages/qte/qte-common_2.3.10.inc
@@ -4,7 +4,6 @@ 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_akita        = "file://kernel-keymap-corgi.patch;patch=1 \
 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_akita             = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XX
 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_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -frtti -DNO_D
 # 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

diff --git a/packages/qte/qte-common_2.3.12.inc b/packages/qte/qte-common_2.3.12.inc
index 97c3dc4..cf812de 100644 (file)
--- a/packages/qte/qte-common_2.3.12.inc
+++ b/packages/qte/qte-common_2.3.12.inc
@@ -41,11 +41,6 @@ SRC_URI_append_e680         = "file://kernel-keymap.patch;patch=1;pnum=0 "
 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 "