Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
saukko committed Oct 30, 2014
1 parent 424546d commit ad8ac5b
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 2 deletions.
3 changes: 2 additions & 1 deletion 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
2 changes: 2 additions & 0 deletions rpm/transfer-engine-qt5.spec
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main.cpp
Expand Up @@ -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);

Expand Down
6 changes: 6 additions & 0 deletions src/src.pro
Expand Up @@ -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

Expand Down
5 changes: 5 additions & 0 deletions transfer-engine.pro
Expand Up @@ -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

10 changes: 10 additions & 0 deletions 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

0 comments on commit ad8ac5b

Please sign in to comment.