From 68e30e344e19c212b59fe4bd7363cb82b6a06f0d Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Tue, 10 Apr 2012 12:55:02 +0100
Subject: opie-taskbar: fix git version for upstream changes

Fix for changes in current git master; in particular, ensure we enable
the sync protocol v2 in the launcher.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../opie-taskbar/opie-taskbar/server-pro-git.patch | 25 ++++++++++++----------
 recipes-opie/opie-taskbar/opie-taskbar_git.bb      |  2 --
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/recipes-opie/opie-taskbar/opie-taskbar/server-pro-git.patch b/recipes-opie/opie-taskbar/opie-taskbar/server-pro-git.patch
index 82c4a50..cb7dbf6 100644
--- a/recipes-opie/opie-taskbar/opie-taskbar/server-pro-git.patch
+++ b/recipes-opie/opie-taskbar/opie-taskbar/server-pro-git.patch
@@ -24,10 +24,10 @@
  		  screensaver.h \
 -		  $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.h \
 +		  mediummount/mediumwidget.h \
-                   mediadlg.h \
- 		  virtualfs.h \
-           syncaccessmanager.h
-@@ -52,7 +52,7 @@ SOURCES		+= server.cpp \
+                   mediadlg.h
+ 
+ SOURCES		+= server.cpp \
+@@ -50,7 +50,7 @@ SOURCES		+= server.cpp \
  		  shutdownimpl.cpp \
  		  launcher.cpp \
  		  launcherview.cpp \
@@ -36,15 +36,13 @@
  		  transferserver.cpp \
  		  packageslave.cpp \
     		  irserver.cpp \
-@@ -65,22 +65,22 @@ SOURCES		+= server.cpp \
+@@ -63,18 +63,18 @@ SOURCES		+= server.cpp \
  		  qprocess.cpp \
  		  qprocess_unix.cpp \
  		  screensaver.cpp \
 -		  $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.cc \
 +		  mediummount/mediumwidget.cc \
-                   mediadlg.cpp \
- 		  virtualfs.cpp \
-           syncaccessmanager.cpp
+                   mediadlg.cpp
  
  
 -INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate
@@ -62,8 +60,13 @@
 +INCLUDEPATH += mediummount
 +DEPENDPATH  += mediummount
  
--LIBS        += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync -lsysfs -lcrypt -lm
-+LIBS         = -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lopiepim2 -lqrsync -lsysfs -lcrypt -lm
+ LIBS        += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync -lsysfs -lcrypt -lm
  TARGET       = qpe
+@@ -84,6 +84,7 @@ TARGET       = qpe
+ 
+ include( $(OPIEDIR)/include.pro )
  
- ## not ready for use yet
++CONFIG += LAUNCHER_SYNC_V2
+ contains( CONFIG, LAUNCHER_SYNC_V2 ){
+     DEFINES += OPIE_SYNC_V2
+     SOURCES += virtualfs.cpp \
diff --git a/recipes-opie/opie-taskbar/opie-taskbar_git.bb b/recipes-opie/opie-taskbar/opie-taskbar_git.bb
index 062ff32..7a9be31 100644
--- a/recipes-opie/opie-taskbar/opie-taskbar_git.bb
+++ b/recipes-opie/opie-taskbar/opie-taskbar_git.bb
@@ -12,9 +12,7 @@ SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/apps/calibrate \
            file://nomax.patch;striplevel=3 \
            file://no-builtin-qss-startup-2.patch \
            file://kbdlocks-runtime.patch \
-           file://restart-from-bindir.patch \
            file://server-pro-git.patch \
-           file://firstuse-path.patch \
            file://force-firstuse-calibrate.patch \
           "
 
-- 
cgit 1.2.3-korg