buteo-mtp: build the fsstorage plugin

recipes-nemomobile/buteo/buteo-mtp/0001-Remove-dependency-to-SSU.patch → recipes-nemomobile/buteo/buteo-mtp/0001-Remove-dependency-to-SSU-and-tests.patch

-From d493df1cd36949f688681f894256bdf883951986 Mon Sep 17 00:00:00 2001
+From 94c9d8c04f6f2a3c7702a6ff75acd3ba6d5232b3 Mon Sep 17 00:00:00 2001
 From: Florent Revest <revestflo@gmail.com>
-Date: Sun, 9 Oct 2016 19:01:52 +0200
-Subject: [PATCH] Remove dependency to SSU
+Date: Sun, 23 Oct 2016 23:23:37 +0200
+Subject: [PATCH] Remove dependency to SSU and tests
 
 ---
- libmeegomtp.pro                                    | 30 ----------------------
+ libmeegomtp.pro                                    | 29 ----------------------
+ mts/common.pri                                     |  2 +-
  mts/mts.pro                                        |  2 --
- mts/platform/deviceinfo/deviceinfoprovider.cpp     |  7 +----
- .../storage/fsstorageplugin/fsstorageplugin.pro    |  2 +-
- 4 files changed, 2 insertions(+), 39 deletions(-)
+ mts/platform/deviceinfo/deviceinfoprovider.cpp     |  7 +-----
+ .../storage/fsstorageplugin/fsstorageplugin.pro    |  4 +--
+ service/service.pro                                |  2 +-
+ service/start-mtp.sh                               |  2 +-
+ 7 files changed, 6 insertions(+), 42 deletions(-)
 
 diff --git a/libmeegomtp.pro b/libmeegomtp.pro
-index db788fb..84136ba 100644
+index db788fb..0b2310d 100644
 --- a/libmeegomtp.pro
 +++ b/libmeegomtp.pro
 @@ -3,33 +3,14 @@ TEMPLATE = subdirs
@@ -48,14 +51,14 @@ index db788fb..84136ba 100644
  service.subdir = service
  service.target = sub-service
  service.depends = sub-mts
-@@ -39,17 +20,6 @@ systemd.target = sub-systemd
+@@ -39,17 +20,7 @@ systemd.target = sub-systemd
  
  SUBDIRS += \
      mts \
 -    test \
      mtpserver \
 -    mts_storage_tests \
--    mts_fsstorage_plugin \
+     mts_fsstorage_plugin \
 -    mts_fsstorage_tests \
 -    mts_deviceinfo_tests \
 -    mts_protocol_tests \
@@ -66,6 +69,14 @@ index db788fb..84136ba 100644
 -citests.path = /opt/tests/buteo-mtp/test-definition/
 -citests.files = tests.xml
 -INSTALLS += citests
+diff --git a/mts/common.pri b/mts/common.pri
+index d1f600c..8364d39 100644
+--- a/mts/common.pri
++++ b/mts/common.pri
+@@ -1,2 +1,2 @@
+ CONFIG += link_pkgconfig
+-PKGCONFIG += contextkit-statefs
++PKGCONFIG += contextkit-statefs contextsubscriber-1.0 contextsubscriber-1.0 contextsubscriber-1.0
 diff --git a/mts/mts.pro b/mts/mts.pro
 index 765dd08..09268dd 100644
 --- a/mts/mts.pro
@@ -112,9 +123,18 @@ index dd0d0d3..cbbfbc0 100644
          setDeviceFriendlyName(deviceModel);
      }
 diff --git a/mts/platform/storage/fsstorageplugin/fsstorageplugin.pro b/mts/platform/storage/fsstorageplugin/fsstorageplugin.pro
-index 3f22edf..14467c3 100644
+index 3f22edf..218a398 100644
 --- a/mts/platform/storage/fsstorageplugin/fsstorageplugin.pro
 +++ b/mts/platform/storage/fsstorageplugin/fsstorageplugin.pro
+@@ -8,7 +8,7 @@ CONFIG += plugin debug qtsparql
+ QT += dbus xml
+ QT -= gui
+ 
+-PKGCONFIG += blkid mount
++PKGCONFIG += blkid mount Qt5Sparql
+ 
+ system(qdbusxml2cpp -c ThumbnailerProxy -p thumbnailerproxy.h:thumbnailerproxy.cpp -i thumbnailpathlist.h ./org.nemomobile.Thumbnailer.xml)
+ 
 @@ -44,7 +44,7 @@ SOURCES += fsstorageplugin.cpp \
             storageitem.cpp
  
@@ -124,6 +144,29 @@ index 3f22edf..14467c3 100644
  
  #install
  target.path = /usr/lib/mtp
+diff --git a/service/service.pro b/service/service.pro
+index baf8c67..86688b6 100644
+--- a/service/service.pro
++++ b/service/service.pro
+@@ -11,7 +11,7 @@ LIBS += -L../mts -lmeegomtp
+ QT -= gui
+ CONFIG += link_pkgconfig
+ equals(QT_MAJOR_VERSION, 4): PKGCONFIG += buteosyncfw
+-equals(QT_MAJOR_VERSION, 5): PKGCONFIG += buteosyncfw5
++equals(QT_MAJOR_VERSION, 5): PKGCONFIG += buteosyncfw5 contextsubscriber-1.0 contextsubscriber-1.0 contextsubscriber-1.0
+ 
+ SOURCES += service.cpp
+ 
+diff --git a/service/start-mtp.sh b/service/start-mtp.sh
+index c20842c..f4b151a 100755
+--- a/service/start-mtp.sh
++++ b/service/start-mtp.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ SERVICE=/usr/lib/mtp/mtp_service
+ STORAGE_PATH=$HOME
 -- 
 2.9.3
 

recipes-nemomobile/buteo/buteo-mtp_git.bb

@@ -4,7 +4,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://mtpserver/mtpserver.cpp;beginline=1;endline=30;md5=a2b2b5351d5e7a0b1f3b62af44e24404"
 
 SRC_URI = "git://git.merproject.org/mer-core/buteo-mtp.git;protocol=https \
-           file://0001-Remove-dependency-to-SSU.patch"
+           file://0001-Remove-dependency-to-SSU-and-tests.patch"
 SRCREV = "dd37c4f61e96bc25dd95d9661310e5326e31b593"
 PR = "r1"
 PV = "+git${SRCREV}"
@@ -17,7 +17,7 @@ do_configure_prepend() {
     sed -i "s@/bin/bash@/bin/sh@" ${S}/service/start-mtp.sh
 }
 
-DEPENDS += "buteo-syncfw statefs-qt"
+DEPENDS += "buteo-syncfw statefs-qt libqtsparql"
 
 FILES_${PN} += "/lib/systemd/system /usr/lib/systemd/user/ /usr/share/mtp/ /usr/lib/mtp/ /usr/lib/buteo-plugins-qt5"
 B="${S}"