fix libbedic/zbedic 0.9.6 and remove 0.9.4

BKrev: 42bbdeb2xOfjw431vEeVz-pvrc7Lfg

diff --git a/packages/zbedic/libbedic_0.9.4.bb b/packages/zbedic/libbedic_0.9.4.bb
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/zbedic/libbedic_0.9.6.bb b/packages/zbedic/libbedic_0.9.6.bb
index e69de29..5118f5c 100644 (file)
--- a/packages/zbedic/libbedic_0.9.6.bb
+++ b/packages/zbedic/libbedic_0.9.6.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "A dictionary application for Qt/E based Palmtop Environments"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+APPTYPE = "binary"
+APPDESKTOP = "${WORKDIR}/zbedic/misc"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/libbedic_${PV}-0.tgz"
+S = "${WORKDIR}"
+
+inherit palmtop
+# need to override this, because bedic contains exception handling
+export OE_QMAKE_CXXFLAGS="-fexceptions -fno-rtti ${CXXFLAGS}"
+
+do_configure() {
+       qmake -project && qmake -makefile -t lib -spec ${QMAKESPEC} CONFIG=console CONFIG+=staticlib -after \
+        INCLUDEPATH+=../include TARGET=bedic DESTDIR=${STAGING_LIBDIR} \
+       HEADERS+=src/file.h SOURCES+=src/file.cpp SOURCES-=tools/xerox.cpp CXXFLAGS+=-fexceptions
+}
+
+do_stage() {
+    install -d ${STAGING_INCDIR}/libbedic/
+    install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/libbedic/
+}

diff --git a/packages/zbedic/zbedic_0.9.4.bb b/packages/zbedic/zbedic_0.9.4.bb
deleted file mode 100644 (file)
index caef0d6..0000000
--- a/packages/zbedic/zbedic_0.9.4.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "A dictionary application for Qt/E based Palmtop Environments"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "GPL"
-DEPENDS = "libbedic"
-APPTYPE = "binary"
-APPDESKTOP = "${WORKDIR}/misc"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/zbedic_0.9.4-0.tgz \
-file://qtopia17.patch;patch=1;pnum=0"
-
-S = "${WORKDIR}/"
-
-inherit opie
-export OE_QMAKE_LINK="${CXX}"
-
-do_configure() {
-       cd ${S} && rm -rf *~ && qmake -project && qmake -makefile -spec ${QMAKESPEC} -after \
-        INCLUDEPATH=${STAGING_INCDIR}/libbedic DEFINES+=QWS LIBS+=-lqpe LIBS+=-lbedic DESTDIR=${S} TARGET=zbedic
-}
-
-do_install() {
-       install -d ${D}${palmtopdir}/pics/zbedic/
-       install -d ${D}${palmtopdir}/help/html/
-       install -m 0644 ${S}/misc/*.png ${D}${palmtopdir}/pics/zbedic/
-       install -m 0644 ${S}/misc/zbedic.png ${D}${palmtopdir}/pics/
-       install -m 0644 ${S}/doc/manual/*.html ${D}${palmtopdir}/help/html/
-       rm ${D}${palmtopdir}/pics/zbedic/zbedic.png
-}
-
-PACKAGES =+ "zbedic-help-en"
-FILES_zbedic-help-en = "${palmtopdir}/help/html/*"