diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-21 19:54:05 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-21 19:54:05 +0100 |
| commit | 33762d41c0e68ea1c130e9fd2e283f70e2338592 (patch) | |
| tree | 04255a24a3c63d6c8a624ebca25db93b5e96f78d /recipes/opie-taskbar | |
| parent | 6cd92d1545ccf5d4f1459f70faa81be68adb0794 (diff) | |
| parent | 21b699c06496cb374dbf05def5c57ff10720392e (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/opie-taskbar')
| -rw-r--r-- | recipes/opie-taskbar/opie-taskbar/launcher.patch | 17 | ||||
| -rw-r--r-- | recipes/opie-taskbar/opie-taskbar_1.2.4.bb | 3 |
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 \ " |