diff options
| author | Paul Eggleton <bluelightning@bluelightning.org> | 2009-07-17 00:25:46 +0100 |
|---|---|---|
| committer | Paul Eggleton <bluelightning@bluelightning.org> | 2009-07-17 00:25:46 +0100 |
| commit | 2e000d15a166e32f57ab762a53b173db98596ee4 (patch) | |
| tree | a9673c8d92dece6845f459314d721794d59e8fb3 /recipes | |
| parent | 1f7f23f2b79aba5223bdb578a3c2b875af1d23ba (diff) | |
opie-taskbar: add patch for server.pro to cvs version
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/opie-taskbar/opie-taskbar/server-pro-cvs.patch | 68 | ||||
| -rw-r--r-- | recipes/opie-taskbar/opie-taskbar_cvs.bb | 4 |
2 files changed, 70 insertions, 2 deletions
diff --git a/recipes/opie-taskbar/opie-taskbar/server-pro-cvs.patch b/recipes/opie-taskbar/opie-taskbar/server-pro-cvs.patch new file mode 100644 index 0000000000..72d6ce55eb --- /dev/null +++ b/recipes/opie-taskbar/opie-taskbar/server-pro-cvs.patch @@ -0,0 +1,68 @@ +--- launcher/server.pro 2009-07-13 23:55:07.000000000 +0100 ++++ launcher/server.pro 2009-07-17 00:03:40.000000000 +0100 +@@ -2,7 +2,7 @@ + + CONFIG += qt warn_on + +-DESTDIR = $$(OPIEDIR)/bin ++DESTDIR = + + HEADERS += server.h \ + qrr.h \ +@@ -20,7 +20,7 @@ + shutdownimpl.h \ + launcher.h \ + launcherview.h \ +- $$(OPIEDIR)/core/apps/calibrate/calibrate.h \ ++ calibrate/calibrate.h \ + startmenu.h \ + transferserver.h \ + qcopbridge.h \ +@@ -31,7 +31,7 @@ + serverapp.h \ + qprocess.h \ + screensaver.h \ +- $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.h \ ++ mediummount/mediumwidget.h \ + mediadlg.h \ + virtualfs.h + +@@ -51,7 +51,7 @@ + shutdownimpl.cpp \ + launcher.cpp \ + launcherview.cpp \ +- $$(OPIEDIR)/core/apps/calibrate/calibrate.cpp \ ++ calibrate/calibrate.cpp \ + transferserver.cpp \ + packageslave.cpp \ + irserver.cpp \ +@@ -64,21 +64,21 @@ + qprocess.cpp \ + qprocess_unix.cpp \ + screensaver.cpp \ +- $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.cc \ ++ mediummount/mediumwidget.cc \ + mediadlg.cpp \ + virtualfs.cpp + + +-INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate +-DEPENDPATH += $(OPIEDIR)/core/apps/calibrate ++INCLUDEPATH += calibrate ++DEPENDPATH += calibrate + +-INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync +-DEPENDPATH += $(OPIEDIR)/rsync ++INCLUDEPATH += $(OPIEDIR)/include rsync ++DEPENDPATH += rsync + +-INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount +-DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount ++INCLUDEPATH += mediummount ++DEPENDPATH += mediummount + +-LIBS += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync ++LIBS = -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync + TARGET = qpe + + ## not ready for use yet diff --git a/recipes/opie-taskbar/opie-taskbar_cvs.bb b/recipes/opie-taskbar/opie-taskbar_cvs.bb index e84e35d820..08c4d3bbec 100644 --- a/recipes/opie-taskbar/opie-taskbar_cvs.bb +++ b/recipes/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r16" +PR = "r17" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ @@ -13,6 +13,6 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ file://no-builtin-qss-startup.patch;patch=1 \ file://kbdlocks-runtime.patch;patch=1 \ file://restart-from-bindir.patch;patch=1 \ - file://server.pro \ + file://server-pro-cvs.patch;patch=1 \ file://firstuse-path.patch;patch=1 \ " |