Update libwatchfish, use harbour- prefix

This changes the libwatchfish submodule to now point at Piggz updated fork. Changing to this new fork resolves various compilation issues due to an incomplete implementation of various dbus services. Additionally this changes the asteroidsyncserviced, when compiled with "CONFIG+=starfish" to have "harbour-" prefixed to its name. The reasoning behind this change, is that Jolla has a requirement for all applications that are submittted to the offical store have this prefix. https://harbour.jolla.com/faq#1.1.0
AsteroidOS · Mar 9, 2021 · f5e2f48 · f5e2f48
1 parent 96126da
commit f5e2f48
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -3,4 +3,4 @@
 	url = https://github.com/AsteroidOS/libasteroid
 [submodule "asteroidsyncserviced/libwatchfish"]
 	path = asteroidsyncserviced/libwatchfish
-	url = https://git.javispedro.com/libwatchfish.git
+	url = git@github.com:piggz/libwatchfish.git
diff --git a/asteroidsyncservice/asteroidsyncservice.pro b/asteroidsyncservice/asteroidsyncservice.pro
@@ -9,7 +9,7 @@ uri = org.asteroid.syncservice
 
 contains(CONFIG, telescope) {
     include(telescope.pri)
-} 
+}
 
 contains(CONFIG, starfish) {
     include(starfish.pri)

diff --git a/asteroidsyncservice/platforms/sailfishos/servicecontrol.h b/asteroidsyncservice/platforms/sailfishos/servicecontrol.h
@@ -23,7 +23,7 @@
 #include <QDBusInterface>
 #include <QObject>
 
-static const QString SYNCSERVICED_SYSTEMD_UNIT("asteroidsyncserviced.service");
+static const QString SYNCSERVICED_SYSTEMD_UNIT("harbour-asteroidsyncserviced.service");
 
 class ServiceControl : public QObject
 {

diff --git a/asteroidsyncserviced/asteroidsyncserviced.pro b/asteroidsyncserviced/asteroidsyncserviced.pro
@@ -4,7 +4,13 @@ QT -= gui
 include(../version.pri)
 include(libasteroid/libasteroid.pri)
 
-TARGET = asteroidsyncserviced
+contains(CONFIG, telescope) {
+    TARGET = asteroidsyncserviced
+}
+
+contains(CONFIG, starfish) {
+    TARGET = harbour-asteroidsyncserviced
+}
 
 CONFIG += c++11
 CONFIG += console

diff --git a/...syncserviced/asteroidsyncserviced.service → ...iced/harbour-asteroidsyncserviced.service b/...syncserviced/asteroidsyncserviced.service → ...iced/harbour-asteroidsyncserviced.service
@@ -4,7 +4,7 @@ Requires=dbus.socket bluetooth.target booster-qt5.service
 After=pre-user-session.target lipstick.service dbus.socket bluetooth.target booster-qt5.service
 
 [Service]
-ExecStart=/usr/bin/invoker -o --type=qt5 /usr/bin/asteroidsyncserviced
+ExecStart=/usr/bin/invoker -o --type=qt5 /usr/bin/harbour-asteroidsyncserviced
 Restart=always
 
 [Install]

diff --git a/asteroidsyncserviced/libwatchfish b/asteroidsyncserviced/libwatchfish
diff --git a/asteroidsyncserviced/starfish.pri b/asteroidsyncserviced/starfish.pri
@@ -2,10 +2,13 @@ DEFINES += SAILFISHOS_PLATFORM
 
 WATCHFISH_FEATURES = notificationmonitor walltime music
 
-SUBDIRS += libwatchfish
+include(libwatchfish/libwatchfish.pri)
 
 PKGCONFIG += qt5-boostable
 
 SOURCES += platforms/sailfishos/sailfishplatform.cpp
 
 HEADERS += platforms/sailfishos/sailfishplatform.h
+
+DISTFILES += \
+    $$PWD/harbour-asteroidsyncserviced.service
+27 −0		calendarsource.cpp
+2 −0		calendarsource.h
+16 −5		libwatchfish.pri
+84 −4		musiccontroller.cpp
+1 −0		musiccontroller.h
+4 −0		musiccontroller_p.h
+113 −72		voicecallcontroller.cpp
+3 −0		voicecallcontroller.h
+6 −0		voicecallcontroller_p.h