From ad8ac5bb3c6acd523390e26a61b61c6820d9cdd3 Mon Sep 17 00:00:00 2001
From: Marko Saukko <marko.saukko@jolla.com>
Date: Thu, 30 Oct 2014 13:53:41 +0200
Subject: [PATCH] Use qt5 booster instead of generic one.

[boosting] Use qt5 booster instead of generic one.
[dbus] Systemd file for dbus service so we get dependencies set.

Signed-off-by: Marko Saukko <marko.saukko@jolla.com>
---
 dbus/org.nemo.transferengine.service |  3 ++-
 rpm/transfer-engine-qt5.spec         |  2 ++
 src/main.cpp                         |  2 +-
 src/src.pro                          |  6 ++++++
 transfer-engine.pro                  |  5 +++++
 transferengine.service               | 10 ++++++++++
 6 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 transferengine.service

diff --git a/dbus/org.nemo.transferengine.service b/dbus/org.nemo.transferengine.service
index 945e5d7..cbebefd 100644
--- a/dbus/org.nemo.transferengine.service
+++ b/dbus/org.nemo.transferengine.service
@@ -1,4 +1,5 @@
 [D-BUS Service]
 Interface=/org/nemo/transferengine
 Name=org.nemo.transferengine
-Exec=/usr/bin/invoker --type=generic /usr/bin/nemo-transfer-engine
+Exec=/usr/bin/invoker --type=qt5 --global-syms /usr/bin/nemo-transfer-engine
+SystemdService=transferengine.service
diff --git a/rpm/transfer-engine-qt5.spec b/rpm/transfer-engine-qt5.spec
index 4cdcb7d..741530b 100644
--- a/rpm/transfer-engine-qt5.spec
+++ b/rpm/transfer-engine-qt5.spec
@@ -20,6 +20,7 @@ BuildRequires: qt5-qttools-linguist
 BuildRequires: qt5-qttools-qthelp-devel
 BuildRequires: qt5-plugin-platform-minimal
 BuildRequires: qt5-plugin-sqldriver-sqlite
+BuildRequires: pkgconfig(qt5-boostable)
 Requires: libnemotransferengine-qt5 = %{version}
 Provides: nemo-transferengine > 0.0.19
 Obsoletes: nemo-transferengine <= 0.0.19
@@ -29,6 +30,7 @@ Obsoletes: nemo-transferengine <= 0.0.19
 
 %files
 %defattr(-,root,root,-)
+%{_libdir}/systemd/user/transferengine.service
 %dir %{_datadir}/nemo-transferengine
 %{_bindir}/nemo-transfer-engine
 %{_datadir}/dbus-1/services/org.nemo.transferengine.service
diff --git a/src/main.cpp b/src/main.cpp
index b4d47b2..ca110ff 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -30,7 +30,7 @@
 #include "transferengine.h"
 
 
-int main(int argc, char *argv[])
+Q_DECL_EXPORT int main(int argc, char *argv[])
 {
     QCoreApplication app(argc, argv);
 
diff --git a/src/src.pro b/src/src.pro
index 33ba388..cfdc6bf 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -5,6 +5,12 @@ INCLUDEPATH += . ../lib
 
 QT += dbus sql
 
+packagesExist(qt5-boostable) {
+  PKGCONFIG += qt5-boostable
+} else {
+  warning("qt5-boostable not available; startup times will be slower")
+}
+
 equals(QT_MAJOR_VERSION, 4): LIBS += -L../lib -lnemotransferengine
 equals(QT_MAJOR_VERSION, 5): LIBS += -L../lib -lnemotransferengine-qt5
 
diff --git a/transfer-engine.pro b/transfer-engine.pro
index 8129f64..309f791 100644
--- a/transfer-engine.pro
+++ b/transfer-engine.pro
@@ -11,9 +11,14 @@ equals(QT_MAJOR_VERSION, 4): SUBDIRS -= src
 # docs only for Qt 5
 equals(QT_MAJOR_VERSION, 5): include(doc/doc.pri)
 
+systemd.files = transferengine.service
+systemd.path  = /usr/lib/systemd/user/
+
 OTHER_FILES += \
     rpm/*.spec \
     nemo-transfer-engine.conf \
     doc/src/* \
     doc/config/*
 
+INSTALLS += systemd
+
diff --git a/transferengine.service b/transferengine.service
new file mode 100644
index 0000000..f175d92
--- /dev/null
+++ b/transferengine.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Transfer engine
+After=dbus.socket booster-qt5.service
+Requires=dbus.socket
+
+[Service]
+ExecStart=/usr/bin/invoker --type=qt5 --global-syms /usr/bin/nemo-transfer-engine
+Type=dbus
+BusName=org.nemo.transferengine
+