Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/09 14:08:12+01:00 uni-frankfurt.de!mickeyl
this patch eliminates qte-for-opie and all traces. bye bye.

BKrev: 420a0b48MB3bEystu8ubZ_jKWvY1GQ

40 files changed, 19 insertions, 213 deletions

diff --git a/conf/distro/familiar-0.8.0.conf b/conf/distro/familiar-0.8.0.conf
index 1ddd0d2a69..b0c29ccc69 100644
--- a/conf/distro/familiar-0.8.0.conf
+++ b/conf/distro/familiar-0.8.0.conf
@@ -11,7 +11,7 @@ FEED_URIS += " \
 CVSDATE = 20041120
 CVSDATE_minimo = 20040828
 
-PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
+PREFERRED_PROVIDERS = " virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "gst-plugins:gpe-gst-plugins"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
@@ -23,7 +23,7 @@ PREFERRED_VERSION_gcc-cross = "3.4.2"
 PREFERRED_VERSION_gcc-cross-initial = "3.4.2"
 PREFERRED_VERSION_libtool-native = "1.5.6"
 PREFERRED_VERSION_libtool-cross= "1.5.6"
-PREFERRED_VERSION_qte-for-opie = "2.3.7"
+PREFERRED_VERSION_qte = "2.3.7"
 PREFERRED_VERSION_orinoco-modules = "0.13e"
 PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
 PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5"
diff --git a/conf/distro/familiar-0.8.1.conf b/conf/distro/familiar-0.8.1.conf
index 8f38a39c10..b94ef01577 100644
--- a/conf/distro/familiar-0.8.1.conf
+++ b/conf/distro/familiar-0.8.1.conf
@@ -27,8 +27,8 @@ PREFERRED_VERSION_libtool-cross= "1.5.6"
 # Opie
 #
 
-PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
-PREFERRED_VERSION_qte-for-opie = "2.3.10"
+PREFERRED_PROVIDERS = " virtual/libqpe:libqpe-opie"
+PREFERRED_VERSION_qte = "2.3.10"
 
 OPIE_VERSION = "1.1.9"
 include conf/distro/preferred-opie-versions.inc
diff --git a/conf/distro/grant.conf b/conf/distro/grant.conf
index 0ffd6d5652..30bbb831f2 100644
--- a/conf/distro/grant.conf
+++ b/conf/distro/grant.conf
@@ -5,7 +5,7 @@ FEED_URIS_openzaurus = "OZ-3.5.2##http://openzaurus.org/official/unstable/3.5.2/
               OZ-Upgrades##http://openzaurus.org/official/unstable/3.5.2/upgrades/"
 
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
-PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
+PREFERRED_PROVIDERS = " virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
diff --git a/conf/distro/openzaurus-3.5.1.conf b/conf/distro/openzaurus-3.5.1.conf
index 49638d8693..36a9d8d2b6 100644
--- a/conf/distro/openzaurus-3.5.1.conf
+++ b/conf/distro/openzaurus-3.5.1.conf
@@ -6,7 +6,7 @@ FEED_URIS_openzaurus = "OZ-3.5.1##http://openzaurus.org/official/unstable/3.5.1/
 
 CVSDATE = 20040915
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
-PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
+PREFERRED_PROVIDERS = " virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
@@ -25,7 +25,7 @@ PREFERRED_VERSION_gcc-cross = "3.4.2"
 PREFERRED_VERSION_gcc-cross-initial = "3.4.2"
 PREFERRED_VERSION_libtool-native = "1.5.6"
 PREFERRED_VERSION_libtool-cross= "1.5.6"
-PREFERRED_VERSION_qte-for-opie = "2.3.7"
+PREFERRED_VERSION_qte = "2.3.7"
 PREFERRED_VERSION_orinoco-modules = "0.13e"
 PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
 PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5"
diff --git a/conf/distro/openzaurus-3.5.2.conf b/conf/distro/openzaurus-3.5.2.conf
index b9c83c353d..7d647a97f3 100644
--- a/conf/distro/openzaurus-3.5.2.conf
+++ b/conf/distro/openzaurus-3.5.2.conf
@@ -9,7 +9,7 @@ FEED_URIS += " \
 
 CVSDATE = 20041127
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
-PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
+PREFERRED_PROVIDERS = " virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
@@ -29,7 +29,7 @@ PREFERRED_VERSION_gcc-cross = "3.4.2"
 PREFERRED_VERSION_gcc-cross-initial = "3.4.2"
 PREFERRED_VERSION_libtool-native = "1.5.6"
 PREFERRED_VERSION_libtool-cross= "1.5.6"
-PREFERRED_VERSION_qte-for-opie = "2.3.7"
+PREFERRED_VERSION_qte = "2.3.7"
 PREFERRED_VERSION_orinoco-modules = "0.13e"
 PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
 PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5"
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index a940383da1..73e5a821f4 100644
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -15,7 +15,7 @@ FEED_URIS += " \
 
 CVSDATE = "20050208"
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
-PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
+PREFERRED_PROVIDERS = " virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
diff --git a/packages/libqpe/libqpe-opie_1.1.9.bb b/packages/libqpe/libqpe-opie_1.1.9.bb
index d89375fd49..22a83243dc 100644
--- a/packages/libqpe/libqpe-opie_1.1.9.bb
+++ b/packages/libqpe/libqpe-opie_1.1.9.bb
@@ -3,9 +3,9 @@ SECTION = "opie/libs"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-DEPENDS = "uicmoc-native qte-for-opie"
+DEPENDS = "uicmoc-native qte"
 PROVIDES = "virtual/libqpe"
-PR = "r0"
+PR = "r1"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index e8858965fa..a268b75a1a 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "opie/libs"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-DEPENDS = "uicmoc-native qte-for-opie"
+DEPENDS = "uicmoc-native qte"
 PROVIDES = "virtual/libqpe"
 PV = "1.1.9+cvs-${CVSDATE}"
 PR = "r1"
diff --git a/packages/meta/meta-opie-dynamic.bb b/packages/meta/meta-opie-dynamic.bb
index 0ee6a1f22a..a1a2bb262d 100644
--- a/packages/meta/meta-opie-dynamic.bb
+++ b/packages/meta/meta-opie-dynamic.bb
@@ -5,7 +5,6 @@ BROKEN = 1
 # to allow the dynamic package to work
 #
 DESCRIPTION = "Meta-package for Opie"
-DEPENDS = "qte-for-opie libqpe-opie libopie2 manufacturers"
 
 def opie_packages(d):
 	import bb, os
@@ -15,6 +14,6 @@ def opie_packages(d):
 
 OPIE_PACKAGES := "${@opie_packages(d)}"
 
-DEPENDS = "qte-for-opie libqpe-opie libopie2 ${OPIE_PACKAGES}"
+DEPENDS = "qte libqpe-opie libopie2 manufacturers ${OPIE_PACKAGES}"
 
 LICENSE = MIT
diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc
index 6645cd40c3..b930b7baf4 100644
--- a/packages/meta/opie-collections.inc
+++ b/packages/meta/opie-collections.inc
@@ -6,7 +6,7 @@
 # Dependencies to get the launcher up and running
 #
 
-OPIE_LIBS_DEPENDS = "qte-for-opie libopie2 qpf-bitstream-vera qpf-bitstream-vera-sans-mono qpf-unifont"
+OPIE_LIBS_DEPENDS = "qte libopie2 qpf-bitstream-vera qpf-bitstream-vera-sans-mono qpf-unifont"
 OPIE_LIBS_RDEPENDS = "qpf-bitstream-vera-small qte-font-fixed"
 OPIE_BASE = "opie-pics opie-sounds opie-qcop opie-quicklauncher opie-taskbar"
 
diff --git a/packages/meta/uml-image.bb b/packages/meta/uml-image.bb
index b69ffed364..6ebbf04537 100644
--- a/packages/meta/uml-image.bb
+++ b/packages/meta/uml-image.bb
@@ -3,7 +3,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 
 export IMAGE_BASENAME = "uml-image"
 
-OPIE_LIBS = "qte-for-opie qpf-bitstream-vera libqpe-opie libopie2"
+OPIE_LIBS = "qte qpf-bitstream-vera libqpe-opie libopie2"
 OPIE_BASE = "opie-qcop opie-quicklauncher opie-taskbar"
 
 DEPENDS = "task-bootstrap"
diff --git a/packages/qte/qte-2.3.10/opie.patch b/packages/qte/qte-2.3.10/handhelds.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10/opie.patch
+++ b/packages/qte/qte-2.3.10/handhelds.patch
diff --git a/packages/qte/qte-2.3.7/beagle.patch b/packages/qte/qte-2.3.7/beagle.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/beagle.patch
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/c700-hardware.patch b/packages/qte/qte-2.3.7/c700-hardware.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/c700-hardware.patch
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/compile.patch b/packages/qte/qte-2.3.7/compile.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/compile.patch
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/daemonize.patch b/packages/qte/qte-2.3.7/daemonize.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/daemonize.patch
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/devfs.patch b/packages/qte/qte-2.3.7/devfs.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/devfs.patch
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/encoding.patch b/packages/qte/qte-2.3.7/encoding.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/encoding.patch
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/fix-qgfxraster.patch b/packages/qte/qte-2.3.7/fix-qgfxraster.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/fix-qgfxraster.patch
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/gcc3_4.patch b/packages/qte/qte-2.3.7/gcc3_4.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/gcc3_4.patch
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/kernel-keymap-tosa.patch b/packages/qte/qte-2.3.7/kernel-keymap-tosa.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/kernel-keymap-tosa.patch
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/kernel-keymap.patch b/packages/qte/qte-2.3.7/kernel-keymap.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/kernel-keymap.patch
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/lefthand.patch b/packages/qte/qte-2.3.7/lefthand.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/lefthand.patch
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/no-moc.patch b/packages/qte/qte-2.3.7/no-moc.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/no-moc.patch
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/opie.patch b/packages/qte/qte-2.3.7/opie.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/opie.patch
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/qiconview-speed.patch b/packages/qte/qte-2.3.7/qiconview-speed.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/qiconview-speed.patch
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/qpe.patch b/packages/qte/qte-2.3.7/qpe.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/qpe.patch
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/qtopia.patch b/packages/qte/qte-2.3.7/qtopia.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/qtopia.patch
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/sharp_char.h b/packages/qte/qte-2.3.7/sharp_char.h
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/sharp_char.h
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/simpad.patch b/packages/qte/qte-2.3.7/simpad.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/simpad.patch
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/switches.h b/packages/qte/qte-2.3.7/switches.h
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/switches.h
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/tslib.patch b/packages/qte/qte-2.3.7/tslib.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/tslib.patch
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/update-qtfontdir b/packages/qte/qte-2.3.7/update-qtfontdir
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/update-qtfontdir
+++ /dev/null
diff --git a/packages/qte/qte-2.3.7/vt-switch.patch b/packages/qte/qte-2.3.7/vt-switch.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-2.3.7/vt-switch.patch
+++ /dev/null
diff --git a/packages/qte/qte-for-opie_2.3.10.bb b/packages/qte/qte-for-opie_2.3.10.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-for-opie_2.3.10.bb
+++ /dev/null
diff --git a/packages/qte/qte-for-opie_2.3.7.bb b/packages/qte/qte-for-opie_2.3.7.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-for-opie_2.3.7.bb
+++ /dev/null
diff --git a/packages/qte/qte-for-qtopia_2.3.7.bb b/packages/qte/qte-for-qtopia_2.3.7.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-for-qtopia_2.3.7.bb
+++ /dev/null
diff --git a/packages/qte/qte-for-qvfb_2.3.7.bb b/packages/qte/qte-for-qvfb_2.3.7.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qte/qte-for-qvfb_2.3.7.bb
+++ /dev/null
diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index 38b09a358d..2388edb80e 100644
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL QPL"
 DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
 PROVIDES = "virtual/qte virtual/libqte2"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
    	   file://qpe.patch;patch=1 \
@@ -19,6 +19,8 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
 	   file://qt-visibility.patch;patch=1 \
 	   file://tslib.patch;patch=1 \
 	   file://simpad.patch;patch=1 \
+	   file://handhelds.patch;patch=1 \
+	   file://qiconview-speed.patch;patch=1 \
 	   file://update-qtfontdir \
 	   file://sharp_char.h \
 	   file://switches.h "
diff --git a/packages/qte/qte_2.3.7.bb b/packages/qte/qte_2.3.7.bb
deleted file mode 100644
index 8148a83c9c..0000000000
--- a/packages/qte/qte_2.3.7.bb
+++ /dev/null
@@ -1,195 +0,0 @@
-DESCRIPTION = "Qt/Embedded version ${PV}"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "GPL QPL"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
-PROVIDES = "virtual/qte virtual/libqte2"
-PR = "r21"
-
-SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}.tar.gz \
-	   file://qpe.patch;patch=1 \
-	   file://vt-switch.patch;patch=1 \
-	   file://daemonize.patch;patch=1 \
-	   file://no-moc.patch;patch=1 \
-	   file://gcc3_4.patch;patch=1 \
-	   file://tslib.patch;patch=1 \
-	   file://c700-hardware.patch;patch=1 \
-	   file://encoding.patch;patch=1 \
-	   file://fix-qgfxraster.patch;patch=1 \
-	   file://update-qtfontdir \
-	   file://sharp_char.h \
-	   file://switches.h "
-
-SRC_URI_append_simpad   	= "file://devfs.patch;patch=1 file://simpad.patch;patch=1 "
-SRC_URI_append_corgi		= "file://kernel-keymap.patch;patch=1 "
-SRC_URI_append_shepherd		= "file://kernel-keymap.patch;patch=1 "
-SRC_URI_append_husky		= "file://kernel-keymap.patch;patch=1 "
-SRC_URI_append_tosa		= "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 "
-SRC_URI_append_beagle   	= "file://beagle.patch;patch=1 "
-SRC_URI_append_openzaurus-pxa-2.6	= "file://kernel-keymap.patch;patch=1 "
-
-S = "${WORKDIR}/qt-${PV}"
-
-export QTDIR = "${S}"
-
-def qte_arch(d):
-	import bb, re
-	arch = bb.data.getVar('TARGET_ARCH', d, 1)
-	if re.match("^i.86$", arch):
-		arch = "x86"
-	elif arch == "x86_64":
-		arch = "x86"
-	elif arch == "mipsel":
-		arch = "mips"
-	return arch
-
-QTE_ARCH := "${@qte_arch(d)}"
-
-EXTRA_OECONF_CONFIG = "-qconfig qpe"
-EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif \
-		-xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 16,32"
-EXTRA_OECONF_beagle = "-system-jpeg -system-libpng -system-zlib -no-qvfb \
-		       -no-xft -no-vnc -gif \
-                       -xplatform ${TARGET_OS}-${QTE_ARCH}-g++ \
-		       ${EXTRA_OECONF_CONFIG} -depths 8,16,32 "
-EXTRA_OEMAKE = "-e"
-PARALLEL_MAKE = ""
-
-#
-# FIXME: Add more here
-#
-EXTRA_DEFINES 			= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DWARNING_UNKNOWN_DEVICE"
-EXTRA_DEFINES_collie 		= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
-EXTRA_DEFINES_poodle		= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
-EXTRA_DEFINES_tosa		= "-DQWS_TSLIB                 -DQT_QWS_SL5XXX -DQT_QWS_SL6000"
-EXTRA_DEFINES_h3600     	= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" 
-EXTRA_DEFINES_h3900 		= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
-EXTRA_DEFINES_jornada56x	= "-DQWS_TSLIB                 -DQT_QWS_IPAQ"
-EXTRA_DEFINES_simpad		= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ   -DQT_QWS_SIMPAD -DQT_QWS_DEVFS"
-EXTRA_DEFINES_corgi     	= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
-EXTRA_DEFINES_shepherd  	= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
-EXTRA_DEFINES_husky		= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
-EXTRA_DEFINES_beagle		= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ   -DQT_QWS_BEAGLE"
-EXTRA_DEFINES_openzaurus-pxa-2.6	= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
-
-export SYSCONF_CC = "${CC}"
-export SYSCONF_CXX = "${CXX}"
-export SYSCONF_LINK = "${CCLD}"
-export SYSCONF_SHLIB = "${CCLD}"
-export SYSCONF_CFLAGS = "${CFLAGS}"
-export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG ${EXTRA_DEFINES}"
-export SYSCONF_LFLAGS = "${LDFLAGS} -lts"
-export SYSCONF_MOC = "${STAGING_BINDIR}/moc"
-export SYSCONF_UIC = "${STAGING_BINDIR}/uic"
-
-do_configure() {
-	for f in ${S}/configs/linux-*-g++-shared; do
-		sed -e 's,-linux-,-linux-uclibc-,g' < $f \
-			> `dirname $f`/`basename $f | sed -e 's,linux-,linux-uclibc-,'`
-	done
-	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
-}
-
-do_compile() {
-	unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS
-	install -d include/asm/	
-	install -m 0644 ${WORKDIR}/sharp_char.h include/asm/
-	install -d include/linux/
-	install -m 0644 ${WORKDIR}/switches.h   include/linux/
-	oe_runmake
-}
-
-do_stage() {
-	install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib
-	oe_libinstall -so -C lib libqte ${STAGING_DIR}/${HOST_SYS}/qt2/lib
-	rm -f include/qxt.h
-	install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include
-	cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include
-}
-
-do_install() {
-	install -d ${D}/${sbindir}/
-	install -m 0755 ${WORKDIR}/update-qtfontdir ${D}/${sbindir}/
-	install -d ${D}${palmtopdir}/lib/fonts/
-	oe_libinstall -so -C lib libqte ${D}/${palmtopdir}/lib
-	cp -a lib/fonts/* ${D}${palmtopdir}/lib/fonts/
-}
-
-pkg_postinst() {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-set -e
-. /etc/profile
-${sbindir}/update-qtfontdir
-}
-
-pkg_postinst_qte-font-unicode() {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-set -e
-. /etc/profile
-${sbindir}/update-qtfontdir
-}
-
-pkg_postinst_qte-font-lcd () {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-set -e
-. /etc/profile
-${sbindir}/update-qtfontdir
-}
-
-pkg_postinst_qte-font-japanese() {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-set -e
-. /etc/profile
-${sbindir}/update-qtfontdir
-}
-
-pkg_postinst_qte-font-micro() {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-set -e
-. /etc/profile
-${sbindir}/update-qtfontdir
-}
-
-pkg_postinst_qte-font-courier() {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-set -e
-. /etc/profile
-${sbindir}/update-qtfontdir
-}
-
-PACKAGES = "libqte2 qte-font-fixed qte-font-helvetica-small qte-font-helvetica-large \
-			qte-font-smoothtimes qte-font-smallsmooth qte-font-unicode qte-font-lcd \
-			qte-font-japanese qte-font-micro qte-font-courier"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-FILES_${PN} = ""
-FILES_libqte2 = "${palmtopdir}/lib/libqte.so* /usr/sbin/update-qtfontdir"
-FILES_qte-font-fixed = "${palmtopdir}/lib/fonts/fixed*"
-PACKAGE_ARCH_qte-font-fixed = "all"
-FILES_qte-font-helvetica-small = "${palmtopdir}/lib/fonts/helvetica_80*.qpf \
-	${palmtopdir}/lib/fonts/helvetica_100*.qpf ${palmtopdir}/lib/fonts/helvetica_120*.qpf"
-PACKAGE_ARCH_qte-font-helvetica-small = "all"
-FILES_qte-font-helvetica-large = "${palmtopdir}/lib/fonts/helvetica_140*.qpf \
-	${palmtopdir}/lib/fonts/helvetica_180*.qpf ${palmtopdir}/lib/fonts/helvetica_240*.qpf"
-PACKAGE_ARCH_qte-font-helvetica-large = "all"
-FILES_qte-font-smoothtimes = "${palmtopdir}/lib/fonts/smoothtimes*"
-PACKAGE_ARCH_qte-font-smoothtimes = "all"
-FILES_qte-font-smallsmooth = "${palmtopdir}/lib/fonts/smallsmooth*"
-PACKAGE_ARCH_qte-font-smallsmooth = "all"
-FILES_qte-font-unicode = "${palmtopdir}/lib/fonts/unifont*.qpf"
-PACKAGE_ARCH_qte-font-unicode = "all"
-FILES_qte-font-lcd = "${palmtopdir}/lib/fonts/lcd*"
-PACKAGE_ARCH_qte-font-lcd = "all"
-FILES_qte-font-japanese = "${palmtopdir}/lib/fonts/japanese*"
-PACKAGE_ARCH_qte-font-japanese = "all"
-FILES_qte-font-micro = "${palmtopdir}/lib/fonts/micro*.qpf"
-PACKAGE_ARCH_qte-font-micro = "all"
-FILES_qte-font-courier = "${palmtopdir}/lib/fonts/cour*"
-PACKAGE_ARCH_qte-font-courier = "all"