summaryrefslogtreecommitdiff
path: root/recipes/opie-taskbar
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2010-01-19 12:01:38 -0800
committerKhem Raj <raj.khem@gmail.com>2010-01-19 12:01:38 -0800
commit487479374e52651b7bf8974a60e8a5e2624ab76b (patch)
tree41954c06c061cb5b64b22ddd1ea58cbd214a1622 /recipes/opie-taskbar
parentb28038e8136bab6c93fd39e199105a72149b8edb (diff)
libqpe, opie-taskbar: Fix linking errors found with 2.20 ld
* Fix PR #5376 * Dont remove ~LnkProperties when QTOPIA_INTERNAL_FSLP is not defined this could cause g++ to emit default destructor which will be inlined and as we asked inlines to have hidden visibility it could make the destructor hidden in the final library this happens now because ld can merge the visibility attributes which it did not do before. * Note that this fix might be needed in few other places too. We will fix them as we encounter them. * Remove the workaround in opie-taskbar Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/opie-taskbar')
-rw-r--r--recipes/opie-taskbar/opie-taskbar/launcher.patch17
-rw-r--r--recipes/opie-taskbar/opie-taskbar_1.2.4.bb3
2 files changed, 1 insertions, 19 deletions
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 \
"