libopie catch up with qt staging changes

BKrev: 415b4e2ejHQ6yb1oro_5ahItUXwNOg

2 files changed, 76 insertions, 3 deletions

diff --git a/libopie/libopie2_1.1.6.oe b/libopie/libopie2_1.1.6.oe
index e69de29bb2..69b93ecc33 100644
--- a/libopie/libopie2_1.1.6.oe
+++ b/libopie/libopie2_1.1.6.oe
@@ -0,0 +1,76 @@
+DESCRIPTION = "Base libraries for the Open Palmtop Integrated Environment"
+HOMEPAGE = "http://opie.handhelds.org"
+SECTION = "opie/libs"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "LGPL"
+DEPENDS = "libqpe-opie sqlite libpcap-0.7.2 virtual/kernel"
+PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2 "
+PR = "r0"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/libopie2 \
+           file://include.pro"
+S = "${WORKDIR}/libopie2"
+
+inherit opie
+
+#FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file
+
+EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \
+                        DEFINES+="OPIE_SOUND_FRAGMENT_SHIFT=16" \
+			DEFINES+=OPIE_NO_ERASE_RECT_HACKFIX \
+			LIBS+=-L${S} LIBS+="-Wl,-rpath-link,${S}"'
+
+EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=y'
+
+# uclibc doesn't have backtrace()
+python __anonymous () {
+    import oe, re
+    if (re.match('.*uclibc$', oe.data.getVar('TARGET_OS', d, 1)) != None):
+        oe.data.setVar("EXTRA_QMAKEVARS_POST_append", " DEFINES+=OPIE_NO_BACKTRACE ", d)
+}
+
+do_compile() {
+	install -d ${STAGING_INCDIR}/opie2
+	install -d ${STAGING_INCDIR}/opie2/private
+	for i in `find . -name "*.h"`
+	do
+		install -m 0644 $i ${STAGING_INCDIR}/opie2/`basename $i`
+	done
+	install -m 0644 opiepim/private/vobject_p.h ${STAGING_INCDIR}/opie2/private/	
+	oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic DESTDIR=${S}
+}
+
+LIBS = "core2 ui2 db2 mm2 net2 pim2 security2"
+
+# need some special case for uic-created header files here
+do_stage() {
+        for f in ${LIBS}
+	do
+		oe_libinstall -so libopie$f ${STAGING_LIBDIR}/
+	done
+
+	install -m 0644 ${WORKDIR}/include.pro ${OPIEDIR}/
+	install -m 0644 opiepim/ui/opimrecurrencebase.h ${STAGING_INCDIR}/opie2/
+	install -m 0644 opieui/otimepickerbase.h ${STAGING_INCDIR}/opie2/
+	install -m 0644 opiepim/core/opimtemplatebase.h ${STAGING_INCDIR}/opie2/
+}
+
+do_install() {
+	install -d ${D}/${palmtopdir}/lib
+	for f in ${LIBS}
+	do
+		oe_libinstall -so libopie$f ${D}/${palmtopdir}/lib
+	done
+}
+
+PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2"
+FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so*"
+FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so*"
+FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so*"
+FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so*"
+FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so*"
+FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so*"
+FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so*"
+
+#FIXME: Add individual package descriptions and dependencies
diff --git a/libopie/libopie2_cvs.oe b/libopie/libopie2_cvs.oe
index d55e69d8c1..b5c8a71810 100644
--- a/libopie/libopie2_cvs.oe
+++ b/libopie/libopie2_cvs.oe
@@ -14,9 +14,6 @@ S = "${WORKDIR}/libopie2"
 
 inherit opie
 
-export QTDIR = "${STAGING_LIBDIR}/.."
-export OPIEDIR = "${STAGING_LIBDIR}/.."
-
 #FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file
 
 EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \