diff options
| -rw-r--r-- | recipes/libqpe/libqpe-opie/unhide_lnkproperties_destructor.patch | 24 | ||||
| -rw-r--r-- | recipes/libqpe/libqpe-opie_1.2.4.bb | 3 | ||||
| -rw-r--r-- | recipes/opie-taskbar/opie-taskbar/launcher.patch | 17 | ||||
| -rw-r--r-- | recipes/opie-taskbar/opie-taskbar_1.2.4.bb | 3 |
4 files changed, 27 insertions, 20 deletions
diff --git a/recipes/libqpe/libqpe-opie/unhide_lnkproperties_destructor.patch b/recipes/libqpe/libqpe-opie/unhide_lnkproperties_destructor.patch new file mode 100644 index 0000000000..65e790a145 --- /dev/null +++ b/recipes/libqpe/libqpe-opie/unhide_lnkproperties_destructor.patch @@ -0,0 +1,24 @@ +Dont hide destructor, if we do then in moc_lnkproperties.cpp its not +seen and compiler puts in a default one and inlines it which is then +hidden as we ask it to use -fvisibility-inlines-hidden + +Now linker can merge the symbol visivility and promotes the most +restrictive visivility in output which means that the library will have +the destructor but it will be hidden + +-Khem + +Index: library/lnkproperties.h +=================================================================== +--- library.orig/lnkproperties.h 2010-01-19 10:49:36.771348810 -0800 ++++ library/lnkproperties.h 2010-01-19 10:49:59.318857574 -0800 +@@ -45,8 +45,8 @@ + // have this class. + #ifdef QTOPIA_INTERNAL_FSLP + LnkProperties( AppLnk* lnk, QWidget* parent = 0 ); +- ~LnkProperties(); + #endif ++ ~LnkProperties(); + + void done(int); + private slots: diff --git a/recipes/libqpe/libqpe-opie_1.2.4.bb b/recipes/libqpe/libqpe-opie_1.2.4.bb index 5c1690ec12..bb154d013f 100644 --- a/recipes/libqpe/libqpe-opie_1.2.4.bb +++ b/recipes/libqpe/libqpe-opie_1.2.4.bb @@ -1,6 +1,6 @@ require ${PN}.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ @@ -8,5 +8,6 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ file://unbreak-logging.patch;patch=1 \ file://citytime-path-2.patch;patch=1 \ file://no-include-pro.patch;patch=1 \ + file://unhide_lnkproperties_destructor.patch;patch=1 \ " diff --git a/recipes/opie-taskbar/opie-taskbar/launcher.patch b/recipes/opie-taskbar/opie-taskbar/launcher.patch deleted file mode 100644 index e7f90f9185..0000000000 --- a/recipes/opie-taskbar/opie-taskbar/launcher.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: launcher/launcher.cpp -=================================================================== ---- launcher.orig/launcher.cpp 2009-12-23 22:29:17.396221157 +0100 -+++ launcher/launcher.cpp 2009-12-23 22:31:45.849117517 +0100 -@@ -646,10 +646,10 @@ - // Not supported: flat is simpler for the user - } else { - /* ### libqtopia FIXME also moving docLnks... */ -- LnkProperties prop(appLnk,0 ); -+ /* LnkProperties prop(appLnk,0 ); - - if (QPEApplication::execDialog( &prop )==QDialog::Accepted && tabs->currentView()==tabs->docView()) { -- } -+ }*/ - } - } - diff --git a/recipes/opie-taskbar/opie-taskbar_1.2.4.bb b/recipes/opie-taskbar/opie-taskbar_1.2.4.bb index 7648747fa6..b5660451a6 100644 --- a/recipes/opie-taskbar/opie-taskbar_1.2.4.bb +++ b/recipes/opie-taskbar/opie-taskbar_1.2.4.bb @@ -1,5 +1,5 @@ require ${PN}.inc -PR = "r2" +PR = "r3" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ @@ -14,5 +14,4 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ file://restart-from-bindir.patch;patch=1 \ file://server-pro-1.2.4.patch;patch=1 \ file://firstuse-path.patch;patch=1 \ - file://launcher.patch;patch=1 \ " |