zbedic: updated to 1.0

6 files changed, 35 insertions, 13 deletions

diff --git a/packages/zbedic/libbedic_0.9.6.bb b/packages/zbedic/libbedic_1.0.bb
index 05f52ef1f6..8d0ead686d 100644
--- a/packages/zbedic/libbedic_0.9.6.bb
+++ b/packages/zbedic/libbedic_1.0.bb
@@ -5,9 +5,10 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}/zbedic/misc"
-PR = "r2"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/libbedic_${PV}-0.tgz"
+
 S = "${WORKDIR}"
 
 inherit palmtop
@@ -17,7 +18,10 @@ 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
+	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() {
diff --git a/packages/zbedic/zbedic-0.9.6/.mtn2git_empty b/packages/zbedic/zbedic/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/zbedic/zbedic-0.9.6/.mtn2git_empty
+++ b/packages/zbedic/zbedic/.mtn2git_empty
diff --git a/packages/zbedic/zbedic-0.9.6/opie-icons.patch b/packages/zbedic/zbedic/opie-icons.patch
index 7fbebd77b5..1e028d5210 100644
--- a/packages/zbedic/zbedic-0.9.6/opie-icons.patch
+++ b/packages/zbedic/zbedic/opie-icons.patch
@@ -1,6 +1,8 @@
---- 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 @@
+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 );
diff --git a/packages/zbedic/zbedic-0.9.6/qtopia17.patch b/packages/zbedic/zbedic/qtopia17.patch
index 0c24974247..7b890aab8d 100644
--- a/packages/zbedic/zbedic-0.9.6/qtopia17.patch
+++ b/packages/zbedic/zbedic/qtopia17.patch
@@ -3,8 +3,8 @@
 # Patch managed by http://www.holgerschurig.de/patcher.html
 #
 
---- src/main.cpp~compilefix
-+++ src/main.cpp
+--- zbedic/src/main.cpp~compilefix
++++ zbedic/src/main.cpp
 @@ -25,5 +25,13 @@
  #include "zbedic.h"
  #include <qtopia/qpeapplication.h>
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_1.0.bb
index df811a7fcc..d7218a241d 100644
--- a/packages/zbedic/zbedic_0.9.6.bb
+++ b/packages/zbedic/zbedic_1.0.bb
@@ -6,20 +6,23 @@ LICENSE = "GPL"
 DEPENDS = "libbedic"
 APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}/misc"
-PR = "r2"
+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 "
+           file://opie-icons.patch;patch=1 \
+           file://version.patch;patch=1 \
+           file://qtopia17.patch;patch=1"
 
-S = "${WORKDIR}/"
+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
+        INCLUDEPATH=${STAGING_INCDIR}/libbedic DEFINES+=QWS \
+	LIBS+=-lqpe LIBS+=-lbedic LIBS+=-lsqlite3 DESTDIR=${S} TARGET=zbedic
 }
 
 do_install() {
@@ -27,7 +30,7 @@ do_install() {
 	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}/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