summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2010-01-13 00:11:27 +0100
committerHenning Heinold <heinold@inf.fu-berlin.de>2010-01-13 00:11:27 +0100
commit63004ac58ade27db5f1a242bf2bb416b0d01e863 (patch)
tree7ecd2d6b11c4012d971034ac9045aed1e3df9ae0
parente679efd298d37a773e037aec0d1daf6249b39a06 (diff)
opie-taskbar: compile fix
* comment the use of LnkProperties * maybee opie losses some functionality, but it's better to have something working for now * bump PR
-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, 19 insertions, 1 deletions
diff --git a/recipes/opie-taskbar/opie-taskbar/launcher.patch b/recipes/opie-taskbar/opie-taskbar/launcher.patch
new file mode 100644
index 0000000000..e7f90f9185
--- /dev/null
+++ b/recipes/opie-taskbar/opie-taskbar/launcher.patch
@@ -0,0 +1,17 @@
+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 aa6db3ca36..7648747fa6 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 = "r1"
+PR = "r2"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
@@ -14,4 +14,5 @@ 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 \
"