Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/04/26 11:15:28+02:00 uni-frankfurt.de!mickey
kill off qte 2.3.6 and increase font packaging granularity for 2.3.7

BKrev: 408cd335ccvcWM_KlXUin0DFgkESIQ

6 files changed, 6 insertions, 74 deletions

diff --git a/qte/qte-2.3.6-r0/devfs.patch b/opie-addressbook/opie-addressbook_cvs.oe
index e69de29bb2..e69de29bb2 100644
--- a/qte/qte-2.3.6-r0/devfs.patch
+++ b/opie-addressbook/opie-addressbook_cvs.oe
diff --git a/qte/qte-2.3.6-r0/no-moc.patch b/qte/qte-2.3.6-r0/no-moc.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/qte/qte-2.3.6-r0/no-moc.patch
+++ /dev/null
diff --git a/qte/qte-2.3.6-r0/qpe.patch b/qte/qte-2.3.6-r0/qpe.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/qte/qte-2.3.6-r0/qpe.patch
+++ /dev/null
diff --git a/qte/qte-2.3.6-r0/tslib.patch b/qte/qte-2.3.6-r0/tslib.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/qte/qte-2.3.6-r0/tslib.patch
+++ /dev/null
diff --git a/qte/qte_2.3.6.oe b/qte/qte_2.3.6.oe
deleted file mode 100644
index 15404cdf83..0000000000
--- a/qte/qte_2.3.6.oe
+++ /dev/null
@@ -1,72 +0,0 @@
-DESCRIPTION = "Qt/Embedded version ${PV}"
-LICENSE = "GPL/QPL"
-SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}.tar.gz \
-	 file://${FILESDIR}/qpe.patch;patch=1 \
-	 file://${FILESDIR}/tslib.patch;patch=1 \
-	 file://${FILESDIR}/devfs.patch;patch=1 \
-	 file://${FILESDIR}/no-moc.patch;patch=1 "
-DEPENDS = "virtual/libc base/zlib base/libpng base/jpeg uicmoc-native"
-PROVIDES = "virtual/qte virtual/libqte2"
-S = "${WORKDIR}/qt-${PV}"
-
-# strip off leading and trailing whitespace, and made the vars single word
-#CXX:="${@oe.data.getVar('CXX', d, 1).strip().split()[-1]}"
-#CC:="${@oe.data.getVar('CC', d, 1).strip().split()[-1]}"
-#BUILD_CXX:="${@oe.data.getVar('BUILD_CXX', d, 1).strip().split()[-1]}"
-#BUILD_CC:="${@oe.data.getVar('BUILD_CC', d, 1).strip().split()[-1]}"
-#CFLAGS:="${@oe.data.getVar('CFLAGS', d, 1).strip()}"
-#CXXFLAGS:="${@oe.data.getVar('CXXFLAGS', d, 1).strip()}"
-#LDFLAGS:="${@oe.data.getVar('LDFLAGS', d, 1).strip()}"
-
-export QTDIR = "${S}"
-
-def qte_arch(d):
-	import oe, re
-	arch = oe.data.getVar('TARGET_ARCH', d, 1)
-	if re.match("^i.86$", arch):
-		arch = "x86"
-	elif arch == "x86_64":
-		arch = "x86"
-	return arch
-
-QTE_ARCH := "${@qte_arch(d)}"
-
-EXTRA_OECONF_CONFIG = "-qconfig qpe"
-EXTRA_OECONF_ARCH = "-xplatform ${TARGET_OS}-${QTE_ARCH}-g++"
-EXTRA_OECONF_ARCH_collie = "-xplatform ${TARGET_OS}-sharp-g++"
-EXTRA_OECONF_ARCH_ramses = "-xplatform ${TARGET_OS}-ramses-g++"
-
-EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif ${EXTRA_OECONF_ARCH} ${EXTRA_OECONF_CONFIG}"
-
-EXTRA_OEMAKE = "-e"
-
-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"
-export SYSCONF_LFLAGS = "${LDFLAGS}"
-export SYSCONF_MOC = "${STAGING_BINDIR}/moc"
-export SYSCONF_UIC = "${STAGING_BINDIR}/uic"
-
-do_configure() {
-	oenote ./configure ${EXTRA_OECONF}
-	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed"
-}
-
-do_compile() {
-	unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS
-	oe_runmake
-}
-
-do_stage () {
-	oe_soinstall lib/libqte.so.${PV} ${STAGING_LIBDIR}
-	rm -f include/qxt.h
-	cp -pfLR include/* ${STAGING_INCDIR}/
-}
-
-do_install () {
-	install -d ${D}${libdir}/qte2/lib
-	install -m 0755 lib/libqte.so.* ${D}${libdir}/qte2/lib/
-}
diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe
index 2c85a946eb..447c261ad3 100644
--- a/qte/qte_2.3.7.oe
+++ b/qte/qte_2.3.7.oe
@@ -72,8 +72,12 @@ do_install() {
 	cp -a lib/fonts/* ${D}${palmtopdir}/lib/fonts/
 }
 
-PACKAGES = "libqte2 qte-fonts"
+PACKAGES = "libqte2 qte-font-fixed qte-font-helvetica qte-font-smoothtimes qte-font-smallsmooth"
 
 FILES_${PN} = ""
 FILES_libqte2 = "${palmtopdir}/lib/libqte.so*"
-FILES_qte-fonts = "${palmtopdir}/lib/fonts"
+FILES_qte-font-fixed = "${palmtopdir}/lib/fonts/fixed*"
+FILES_qte-font-helvetica = "${palmtopdir}/lib/fonts/helvetica*"
+FILES_qte-font-smoothtimes = "${palmtopdir}/lib/fonts/smoothtimes*"
+FILES_qte-font-smallsmooth = "${palmtopdir}/lib/fonts/smallsmooth*"
+