diff options
author | Chris Lord <chris@openedhand.com> | 2005-04-28 15:49:50 +0000 |
---|---|---|
committer | Chris Lord <chris@openedhand.com> | 2005-04-28 15:49:50 +0000 |
commit | f1c66bc3593f8622090ac90b781027f2583cd08f (patch) | |
tree | 640f3246087818576d922d5be5cbf19f29c69cee /packages | |
parent | d2a713136f3357d5ca977ecf64ac59296bbc7a03 (diff) |
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded
2005/04/28 16:19:29+02:00 local!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into marcinj.local:/home/hrw/zaurus/oe/openembedded
2005/04/28 16:18:40+02:00 local!hrw
fixed zbedic build
BKrev: 4271061eKbLynTy0IVOyxDgqEjwDPQ
Diffstat (limited to 'packages')
-rw-r--r-- | packages/zbedic/files/qtopia17.patch | 23 | ||||
-rw-r--r-- | packages/zbedic/zbedic_0.9.4.bb | 33 |
2 files changed, 56 insertions, 0 deletions
diff --git a/packages/zbedic/files/qtopia17.patch b/packages/zbedic/files/qtopia17.patch index e69de29bb2..0df47f6295 100644 --- a/packages/zbedic/files/qtopia17.patch +++ b/packages/zbedic/files/qtopia17.patch @@ -0,0 +1,23 @@ + +# +# 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.4.bb b/packages/zbedic/zbedic_0.9.4.bb index e69de29bb2..caef0d6e58 100644 --- a/packages/zbedic/zbedic_0.9.4.bb +++ b/packages/zbedic/zbedic_0.9.4.bb @@ -0,0 +1,33 @@ +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/*" |