From 860cc8847c29a49c623316ae6e8b7ac02bd564c9 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 28 Jun 2005 11:37:22 +0000
Subject: 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
---
 packages/zbedic/files/qtopia17.patch          | 23 ---------------
 packages/zbedic/zbedic-0.9.6/opie-icons.patch |  0
 packages/zbedic/zbedic_0.9.6.bb               | 40 +++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 23 deletions(-)
 delete mode 100644 packages/zbedic/files/qtopia17.patch
 create mode 100644 packages/zbedic/zbedic-0.9.6/opie-icons.patch

(limited to 'packages/zbedic')

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
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/*"
-- 
cgit 1.2.3-korg