From a450911ca47aec70fbbe0865d8262796ffc5fc8e Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 23 Jan 2008 14:29:32 +0000 Subject: zbedic: update libbedic to 1.1 and zbedic to 1.2 --- packages/zbedic/libbedic_1.0.bb | 29 ---------------------------- packages/zbedic/libbedic_1.1.bb | 29 ++++++++++++++++++++++++++++ packages/zbedic/zbedic_1.0.bb | 42 ----------------------------------------- packages/zbedic/zbedic_1.2.bb | 42 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 71 deletions(-) delete mode 100644 packages/zbedic/libbedic_1.0.bb create mode 100644 packages/zbedic/libbedic_1.1.bb delete mode 100644 packages/zbedic/zbedic_1.0.bb create mode 100644 packages/zbedic/zbedic_1.2.bb diff --git a/packages/zbedic/libbedic_1.0.bb b/packages/zbedic/libbedic_1.0.bb deleted file mode 100644 index 4ffb13cee0..0000000000 --- a/packages/zbedic/libbedic_1.0.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "A dictionary application for Qt/E based Palmtop Environments" -SECTION = "opie/applications" -PRIORITY = "optional" -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 \ - SOURCES-=src/test_dynamic_dictionary.cpp \ - SOURCES-=src/test_dynamic_database.cpp \ - CXXFLAGS+=-fexceptions -} - -do_stage() { - install -d ${STAGING_INCDIR}/libbedic/ - install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/libbedic/ -} diff --git a/packages/zbedic/libbedic_1.1.bb b/packages/zbedic/libbedic_1.1.bb new file mode 100644 index 0000000000..4ffb13cee0 --- /dev/null +++ b/packages/zbedic/libbedic_1.1.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "A dictionary application for Qt/E based Palmtop Environments" +SECTION = "opie/applications" +PRIORITY = "optional" +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 \ + SOURCES-=src/test_dynamic_dictionary.cpp \ + SOURCES-=src/test_dynamic_database.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_1.0.bb b/packages/zbedic/zbedic_1.0.bb deleted file mode 100644 index afdfdd5350..0000000000 --- a/packages/zbedic/zbedic_1.0.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "A dictionary application for Qt/E based Palmtop Environments" -SECTION = "opie/applications" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "libbedic" -APPTYPE = "binary" -APPDESKTOP = "${WORKDIR}/misc" -PR = "r2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/zbedic_${PV}-0.tgz \ - file://opie-icons.patch;patch=1 \ - file://version.patch;patch=1 \ - file://qtopia17.patch;patch=1" - -S = "${WORKDIR}" - -inherit opie -export OE_QMAKE_LINK="${CXX}" - -EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/libbedic LIBS+=-lbedic LIBS+=-lsqlite3 TARGET=zbedic" - -do_configure_prepend() { - rm -f Makefile - qmake -project -} - -do_install() { - install -d ${D}${palmtopdir}/pics/zbedic/ - install -d ${D}${palmtopdir}/help/html/ - # we copy small icons - in other way QVGA users will complain - install -m 0644 ${S}/misc/small_icons/*.png ${D}${palmtopdir}/pics/zbedic/ - install -m 0644 ${S}/misc/large_icons/zbedic.png ${D}${palmtopdir}/pics/ - install -m 0644 ${S}/doc/manual/*.html ${D}${palmtopdir}/help/html/ - rm ${D}${palmtopdir}/pics/zbedic/zbedic.png - - # those ones are taken from OPIE so they have proper size (depend on device) - rm ${D}${palmtopdir}/pics/zbedic/back.png - rm ${D}${palmtopdir}/pics/zbedic/forward.png -} - -PACKAGES =+ "zbedic-help-en" -FILES_zbedic-help-en = "${palmtopdir}/help/html/*" diff --git a/packages/zbedic/zbedic_1.2.bb b/packages/zbedic/zbedic_1.2.bb new file mode 100644 index 0000000000..afdfdd5350 --- /dev/null +++ b/packages/zbedic/zbedic_1.2.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "A dictionary application for Qt/E based Palmtop Environments" +SECTION = "opie/applications" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "libbedic" +APPTYPE = "binary" +APPDESKTOP = "${WORKDIR}/misc" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/zbedic_${PV}-0.tgz \ + file://opie-icons.patch;patch=1 \ + file://version.patch;patch=1 \ + file://qtopia17.patch;patch=1" + +S = "${WORKDIR}" + +inherit opie +export OE_QMAKE_LINK="${CXX}" + +EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/libbedic LIBS+=-lbedic LIBS+=-lsqlite3 TARGET=zbedic" + +do_configure_prepend() { + rm -f Makefile + qmake -project +} + +do_install() { + install -d ${D}${palmtopdir}/pics/zbedic/ + install -d ${D}${palmtopdir}/help/html/ + # we copy small icons - in other way QVGA users will complain + install -m 0644 ${S}/misc/small_icons/*.png ${D}${palmtopdir}/pics/zbedic/ + install -m 0644 ${S}/misc/large_icons/zbedic.png ${D}${palmtopdir}/pics/ + install -m 0644 ${S}/doc/manual/*.html ${D}${palmtopdir}/help/html/ + rm ${D}${palmtopdir}/pics/zbedic/zbedic.png + + # those ones are taken from OPIE so they have proper size (depend on device) + rm ${D}${palmtopdir}/pics/zbedic/back.png + rm ${D}${palmtopdir}/pics/zbedic/forward.png +} + +PACKAGES =+ "zbedic-help-en" +FILES_zbedic-help-en = "${palmtopdir}/help/html/*" -- cgit v1.2.3