diff options
author | Junqian Gordon Xu <xjqian@gmail.com> | 2008-09-20 20:26:38 +0000 |
---|---|---|
committer | Junqian Gordon Xu <xjqian@gmail.com> | 2008-09-20 20:26:38 +0000 |
commit | da87201253f04e5af788dcd09030f8f0f5114f9d (patch) | |
tree | 8cf5995b9364f11a205038130f1f49e3102919da /packages/zbedic/zbedic | |
parent | 60205852a362e22c5f2d59ac731a3dd18822d232 (diff) | |
download | openembedded-da87201253f04e5af788dcd09030f8f0f5114f9d.tar.gz |
zbedic: bump to 1.2.2. fix build problem
* update patch
* drop version.patch, set VERSION in CXXFLAG
* package help file as ${PN}-doc
Diffstat (limited to 'packages/zbedic/zbedic')
-rw-r--r-- | packages/zbedic/zbedic/opie-icons.patch | 18 | ||||
-rw-r--r-- | packages/zbedic/zbedic/qtopia17.patch | 32 | ||||
-rw-r--r-- | packages/zbedic/zbedic/version.patch | 13 |
3 files changed, 23 insertions, 40 deletions
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)" ) ); - - } - |