zbedic: bump to 1.2.2. fix build problem

* update patch
* drop version.patch, set VERSION in CXXFLAG
* package help file as ${PN}-doc

5 files changed, 32 insertions, 46 deletions

diff --git a/packages/zbedic/libbedic_1.1.bb b/packages/zbedic/libbedic_1.1.bb
index 8036af6b78..9d2193d4ee 100644
--- a/packages/zbedic/libbedic_1.1.bb
+++ b/packages/zbedic/libbedic_1.1.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Library for bedic dictionary"
+DESCRIPTION = "Library to handle bedic dictionary"
 HOMEPAGE = "http://bedic.sourceforge.net/"
 AUTHOR = "Rafal Mantiuk <rafm@users.sourceforge.net>"
 SECTION = "opie/libs"
diff --git a/packages/zbedic/zbedic/opie-icons.patch b/packages/zbedic/zbedic/opie-icons.patch
index 1e028d5210..cd320b3b1d 100644
--- a/packages/zbedic/zbedic/opie-icons.patch
+++ b/packages/zbedic/zbedic/opie-icons.patch
@@ -1,16 +1,14 @@
-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
+--- zbedic/src/zbedic.cpp.old	2008-09-20 14:36:24.000000000 -0500
++++ zbedic/src/zbedic.cpp	2008-09-20 14:37:21.000000000 -0500
+@@ -142,9 +142,9 @@ ZBEDic::ZBEDic(QWidget *parent, const ch
    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",
+   action[TB_ShowHistory] = createAction( tr( "Show history" ), "zbedic/history", SLOT(showHistoryPopup()), CTRL+Key_H );
+-  action[TB_Back] = createAction( tr( "Go back" ), "zbedic/back",
++  action[TB_Back] = createAction( tr( "Go back" ), "back",
      SLOT(navigationPrevious()), Key_End );
--  action[TB_Forward] = createAction( tr( "History next" ), "zbedic/forward",
-+  action[TB_Forward] = createAction( tr( "History next" ), "forward",
+-  action[TB_Forward] = createAction( tr( "Go forward" ), "zbedic/forward",
++  action[TB_Forward] = createAction( tr( "Go forward" ), "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
index 7b890aab8d..749fde2c7e 100644
--- a/packages/zbedic/zbedic/qtopia17.patch
+++ b/packages/zbedic/zbedic/qtopia17.patch
@@ -1,23 +1,21 @@
-
-#
-# 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/qpeapplication.h>
+--- zbedic/src/main.cpp.old	2008-09-20 14:40:57.000000000 -0500
++++ zbedic/src/main.cpp	2008-09-20 14:51:11.000000000 -0500
+@@ -48,8 +48,16 @@ int main( int argc, char **argv )
+ 
+ #include <qpe/qpeapplication.h>
  
 -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();
++  QPEApplication app( argc, argv );
++  
++  ZBEDic mainWindow( NULL, NULL );
++  app.setMainWidget( &mainWindow );
++
++  mainWindow.show();
++  return app.exec();
 +}
+ 
+ #endif
+ 
diff --git a/packages/zbedic/zbedic/version.patch b/packages/zbedic/zbedic/version.patch
deleted file mode 100644
index 913e201dc7..0000000000
--- a/packages/zbedic/zbedic/version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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_1.2.bb b/packages/zbedic/zbedic_1.2.bb
index afdfdd5350..61348c32f2 100644
--- a/packages/zbedic/zbedic_1.2.bb
+++ b/packages/zbedic/zbedic_1.2.bb
@@ -1,21 +1,23 @@
 DESCRIPTION = "A dictionary application for Qt/E based Palmtop Environments"
+HOMEPAGE = "http://bedic.sourceforge.net/"
+AUTHOR = "Rafal Mantiuk <rafm@users.sourceforge.net>"
 SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "libbedic"
 APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}/misc"
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/zbedic_${PV}-0.tgz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/zbedic_${PV}-2.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}"
+export OE_QMAKE_CXXFLAGS=" -DVERSION=\\"${PV}.2\\" -DPREFIX_PATH=\\"/usr\\""
 
 EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/libbedic LIBS+=-lbedic LIBS+=-lsqlite3 TARGET=zbedic"
 
@@ -38,5 +40,6 @@ do_install() {
 	rm ${D}${palmtopdir}/pics/zbedic/forward.png
 }
 
-PACKAGES =+ "zbedic-help-en"
-FILES_zbedic-help-en = "${palmtopdir}/help/html/*"
+PACKAGES = "${PN}-dbg ${PN}-doc ${PN} ${PN}-dev"
+
+FILES_${PN}-doc += "${palmtopdir}/help"