From 06dc0b52aa94cbaf9eaa30a0c842e1d00cd2b1b2 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 7 Apr 2006 14:47:29 +0000 Subject: zbedic: updated to 1.0 --- packages/zbedic/libbedic_0.9.6.bb | 26 ---------------- packages/zbedic/libbedic_1.0.bb | 30 +++++++++++++++++++ packages/zbedic/zbedic-0.9.6/.mtn2git_empty | 0 packages/zbedic/zbedic-0.9.6/opie-icons.patch | 14 --------- packages/zbedic/zbedic-0.9.6/qtopia17.patch | 23 -------------- packages/zbedic/zbedic/.mtn2git_empty | 0 packages/zbedic/zbedic/opie-icons.patch | 16 ++++++++++ packages/zbedic/zbedic/qtopia17.patch | 23 ++++++++++++++ packages/zbedic/zbedic/version.patch | 13 ++++++++ packages/zbedic/zbedic_0.9.6.bb | 40 ------------------------- packages/zbedic/zbedic_1.0.bb | 43 +++++++++++++++++++++++++++ 11 files changed, 125 insertions(+), 103 deletions(-) delete mode 100644 packages/zbedic/libbedic_0.9.6.bb create mode 100644 packages/zbedic/libbedic_1.0.bb delete mode 100644 packages/zbedic/zbedic-0.9.6/.mtn2git_empty delete mode 100644 packages/zbedic/zbedic-0.9.6/opie-icons.patch delete mode 100644 packages/zbedic/zbedic-0.9.6/qtopia17.patch create mode 100644 packages/zbedic/zbedic/.mtn2git_empty create mode 100644 packages/zbedic/zbedic/opie-icons.patch create mode 100644 packages/zbedic/zbedic/qtopia17.patch create mode 100644 packages/zbedic/zbedic/version.patch delete mode 100644 packages/zbedic/zbedic_0.9.6.bb create mode 100644 packages/zbedic/zbedic_1.0.bb diff --git a/packages/zbedic/libbedic_0.9.6.bb b/packages/zbedic/libbedic_0.9.6.bb deleted file mode 100644 index 05f52ef1f6..0000000000 --- a/packages/zbedic/libbedic_0.9.6.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "A dictionary application for Qt/E based Palmtop Environments" -SECTION = "opie/applications" -PRIORITY = "optional" -MAINTAINER = "Marcin Juszkiewicz " -LICENSE = "GPL" -APPTYPE = "binary" -APPDESKTOP = "${WORKDIR}/zbedic/misc" -PR = "r2" - -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/libbedic_1.0.bb b/packages/zbedic/libbedic_1.0.bb new file mode 100644 index 0000000000..8d0ead686d --- /dev/null +++ b/packages/zbedic/libbedic_1.0.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "A dictionary application for Qt/E based Palmtop Environments" +SECTION = "opie/applications" +PRIORITY = "optional" +MAINTAINER = "Marcin Juszkiewicz " +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-0.9.6/.mtn2git_empty b/packages/zbedic/zbedic-0.9.6/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/zbedic/zbedic-0.9.6/opie-icons.patch b/packages/zbedic/zbedic-0.9.6/opie-icons.patch deleted file mode 100644 index 7fbebd77b5..0000000000 --- a/packages/zbedic/zbedic-0.9.6/opie-icons.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/zbedic.cpp.orig 2005-06-22 22:31:49.000000000 +0200 -+++ src/zbedic.cpp 2005-06-28 13:27:34.000000000 +0200 -@@ -128,9 +128,9 @@ - // ========== create actions - action[TB_SwitchDictionaries] = createAction( tr( "Switch dictionaries" ), "zbedic/switch_dictionary", - SLOT(switchToPreviousDict()), CTRL+Key_S ); -- action[TB_Back] = createAction( tr( "History previous" ), "zbedic/back", -+ action[TB_Back] = createAction( tr( "History previous" ), "back", - SLOT(navigationPrevious()), Key_End ); -- action[TB_Forward] = createAction( tr( "History next" ), "zbedic/forward", -+ action[TB_Forward] = createAction( tr( "History next" ), "forward", - SLOT(navigationNext()), Key_Home ); - action[TB_LookupSelection] = createAction( tr( "Lookup selection" ), "zbedic/lookup_selection", - SLOT(lookupSelection()), CTRL+Key_L ); diff --git a/packages/zbedic/zbedic-0.9.6/qtopia17.patch b/packages/zbedic/zbedic-0.9.6/qtopia17.patch deleted file mode 100644 index 0c24974247..0000000000 --- a/packages/zbedic/zbedic-0.9.6/qtopia17.patch +++ /dev/null @@ -1,23 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- src/main.cpp~compilefix -+++ src/main.cpp -@@ -25,5 +25,13 @@ - #include "zbedic.h" - #include - --QTOPIA_ADD_APPLICATION("zbedic", ZBEDic) --QTOPIA_MAIN -+//QTOPIA_ADD_APPLICATION("zbedic", ZBEDic) -+//QTOPIA_MAIN -+ -+int main(int argc, char** argv) -+{ -+ QPEApplication a( argc, argv ); -+ ZBEDic* myapp = new ZBEDic(); -+ a.showMainWidget( myapp ); -+ a.exec(); -+} diff --git a/packages/zbedic/zbedic/.mtn2git_empty b/packages/zbedic/zbedic/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/zbedic/zbedic/opie-icons.patch b/packages/zbedic/zbedic/opie-icons.patch new file mode 100644 index 0000000000..1e028d5210 --- /dev/null +++ b/packages/zbedic/zbedic/opie-icons.patch @@ -0,0 +1,16 @@ +Index: zbedic/src/zbedic.cpp +=================================================================== +--- zbedic.orig/src/zbedic.cpp 2006-03-15 11:24:12.000000000 +0100 ++++ zbedic/src/zbedic.cpp 2006-03-15 11:30:21.000000000 +0100 +@@ -129,9 +129,9 @@ + // ========== create actions + action[TB_SwitchDictionaries] = createAction( tr( "Switch dictionaries" ), "zbedic/switch_dictionary", + SLOT(switchToPreviousDict()), CTRL+Key_S ); +- action[TB_Back] = createAction( tr( "History previous" ), "zbedic/back", ++ action[TB_Back] = createAction( tr( "History previous" ), "back", + SLOT(navigationPrevious()), Key_End ); +- action[TB_Forward] = createAction( tr( "History next" ), "zbedic/forward", ++ action[TB_Forward] = createAction( tr( "History next" ), "forward", + SLOT(navigationNext()), Key_Home ); + action[TB_LookupSelection] = createAction( tr( "Lookup selection" ), "zbedic/lookup_selection", + SLOT(lookupSelection()), CTRL+Key_L ); diff --git a/packages/zbedic/zbedic/qtopia17.patch b/packages/zbedic/zbedic/qtopia17.patch new file mode 100644 index 0000000000..7b890aab8d --- /dev/null +++ b/packages/zbedic/zbedic/qtopia17.patch @@ -0,0 +1,23 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- zbedic/src/main.cpp~compilefix ++++ zbedic/src/main.cpp +@@ -25,5 +25,13 @@ + #include "zbedic.h" + #include + +-QTOPIA_ADD_APPLICATION("zbedic", ZBEDic) +-QTOPIA_MAIN ++//QTOPIA_ADD_APPLICATION("zbedic", ZBEDic) ++//QTOPIA_MAIN ++ ++int main(int argc, char** argv) ++{ ++ QPEApplication a( argc, argv ); ++ ZBEDic* myapp = new ZBEDic(); ++ a.showMainWidget( myapp ); ++ a.exec(); ++} diff --git a/packages/zbedic/zbedic/version.patch b/packages/zbedic/zbedic/version.patch new file mode 100644 index 0000000000..913e201dc7 --- /dev/null +++ b/packages/zbedic/zbedic/version.patch @@ -0,0 +1,13 @@ +Index: zbedic/src/settings.cpp +=================================================================== +--- zbedic.orig/src/settings.cpp 2006-03-15 11:24:11.000000000 +0100 ++++ zbedic/src/settings.cpp 2006-03-15 15:03:55.000000000 +0100 +@@ -117,7 +117,7 @@ + + ZBEDicSettings::ZBEDicSettings( QWidget *parent ): QTabDialog( parent, "options", true ) + { +- setCaption( tr( "ZBEDic Settings (v. " VERSION ")" ) ); ++ setCaption( tr( "ZBEDic Settings (v. 1.0)" ) ); + + } + diff --git a/packages/zbedic/zbedic_0.9.6.bb b/packages/zbedic/zbedic_0.9.6.bb deleted file mode 100644 index df811a7fcc..0000000000 --- a/packages/zbedic/zbedic_0.9.6.bb +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "A dictionary application for Qt/E based Palmtop Environments" -SECTION = "opie/applications" -PRIORITY = "optional" -MAINTAINER = "Marcin Juszkiewicz " -LICENSE = "GPL" -DEPENDS = "libbedic" -APPTYPE = "binary" -APPDESKTOP = "${WORKDIR}/misc" -PR = "r2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/zbedic_${PV}-0.tgz \ -file://qtopia17.patch;patch=1;pnum=0 \ -file://opie-icons.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/ - # 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/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.0.bb b/packages/zbedic/zbedic_1.0.bb new file mode 100644 index 0000000000..d7218a241d --- /dev/null +++ b/packages/zbedic/zbedic_1.0.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "A dictionary application for Qt/E based Palmtop Environments" +SECTION = "opie/applications" +PRIORITY = "optional" +MAINTAINER = "Marcin Juszkiewicz " +LICENSE = "GPL" +DEPENDS = "libbedic" +APPTYPE = "binary" +APPDESKTOP = "${WORKDIR}/misc" +PR = "r1" + +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}" + + +do_configure() { + cd ${S} && rm -rf *~ && qmake -project && qmake -makefile -spec ${QMAKESPEC} -after \ + INCLUDEPATH=${STAGING_INCDIR}/libbedic DEFINES+=QWS \ + LIBS+=-lqpe LIBS+=-lbedic LIBS+=-lsqlite3 DESTDIR=${S} TARGET=zbedic +} + +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