diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2005-06-28 11:37:22 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2005-06-28 11:37:22 +0000 |
| commit | 860cc8847c29a49c623316ae6e8b7ac02bd564c9 (patch) | |
| tree | 9cb35801ee875ac04308e4aec5706e51666e623d | |
| parent | 2a29639921d5d2d02183f62f60d226436f79061c (diff) | |
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into marcinj.local:/home/hrw/zaurus/oe/openembedded
2005/06/28 13:37:03+02:00 local!hrw
zbedic: added missing icons, Back/Forward icons will be taken from OPIE (so have proper size)
BKrev: 42c136722EzZycwgBvKCwQmXui2waw
| -rw-r--r-- | packages/zbedic/files/qtopia17.patch | 23 | ||||
| -rw-r--r-- | packages/zbedic/zbedic-0.9.6/opie-icons.patch | 0 | ||||
| -rw-r--r-- | packages/zbedic/zbedic_0.9.6.bb | 40 |
3 files changed, 40 insertions, 23 deletions
diff --git a/packages/zbedic/files/qtopia17.patch b/packages/zbedic/files/qtopia17.patch deleted file mode 100644 index 0df47f6295..0000000000 --- a/packages/zbedic/files/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/qpeapplication.h> - --QTOPIA_ADD_APPLICATION("myapp", ZBEDic) --QTOPIA_MAIN -+//QTOPIA_ADD_APPLICATION("myapp", 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-0.9.6/opie-icons.patch b/packages/zbedic/zbedic-0.9.6/opie-icons.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/zbedic/zbedic-0.9.6/opie-icons.patch diff --git a/packages/zbedic/zbedic_0.9.6.bb b/packages/zbedic/zbedic_0.9.6.bb index e69de29bb2..f66d4d1d0b 100644 --- a/packages/zbedic/zbedic_0.9.6.bb +++ b/packages/zbedic/zbedic_0.9.6.bb @@ -0,0 +1,40 @@ +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" +PR = "r1" + +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/*" |