diff options
author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-08-23 13:03:59 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-08-23 13:03:59 +0000 |
commit | 85d5a47a22f6b65960cc1f341a43102bf1f74a66 (patch) | |
tree | 02b867dbbed0ab5ef3ee68aa31aad1262cde6868 /packages | |
parent | 361980fb1ccfbb4dcc263819d3ef4b2716a0bc49 (diff) | |
parent | 68c2f6a64ebf1cd9215886e21526961d9dca7f8a (diff) |
merge of '62f049c7930cc7dcd9a1736a717fff802998ca78'
and 'c58e498fe9feb390a56441e07fec74a56405b6b1'
Diffstat (limited to 'packages')
-rw-r--r-- | packages/libqpe/libqpe-opie/argv.patch | 13 | ||||
-rw-r--r-- | packages/libqpe/libqpe-opie_cvs.bb | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/packages/libqpe/libqpe-opie/argv.patch b/packages/libqpe/libqpe-opie/argv.patch new file mode 100644 index 0000000000..5926a8d000 --- /dev/null +++ b/packages/libqpe/libqpe-opie/argv.patch @@ -0,0 +1,13 @@ +Index: library/qpeapplication.h +=================================================================== +--- library.orig/qpeapplication.h 2008-06-12 01:18:24.548201862 +0200 ++++ library/qpeapplication.h 2008-06-12 01:18:30.861635469 +0200 +@@ -127,7 +127,7 @@ + static void showWidget( QWidget*, bool nomax=FALSE ) QPE_WEAK_SYMBOL; + /* Merge setTempScreenSaverMode */ + #ifdef QTOPIA_INTERNAL_INITAPP +- void initApp( int argv, char **argv ); ++ void initApp( int argc, char **argv ); + #endif + + static void setKeepRunning(); diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb index e6bf737efa..0085003303 100644 --- a/packages/libqpe/libqpe-opie_cvs.bb +++ b/packages/libqpe/libqpe-opie_cvs.bb @@ -1,11 +1,12 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r2" +PR = "r3" SRC_URI = "${HANDHELDS_CVS};module=opie/library \ file://fix-titleheight.patch;patch=1 \ file://unbreak-logging.patch;patch=1 \ file://citytime-path.patch;patch=1 \ + file://argv.patch;patch=1 \ " |