Add mycroft-core optdepend

4 files changed, 41 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 076d8b8de113..5a754eb67fe6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Mar 28 08:33:12 UTC 2017
+# Tue Mar 28 13:14:11 UTC 2017
 pkgbase = plasma5-applets-mycroft-git
 	pkgdesc = Mycroft Ai Plasmoid / Widget for KDE Plasma 5 Desktop
-	pkgver = r6.f6de0ea
+	pkgver = r9.e7bae6a
 	pkgrel = 1
 	url = https://cgit.kde.org/plasma-mycroft.git/
 	install = plasma5-applets-mycroft-git.install
@@ -16,10 +16,15 @@ pkgbase = plasma5-applets-mycroft-git
 	makedepends = python
 	depends = qt5-websockets
 	depends = qt5-quickcontrols2
+	optdepends = mycroft-core: for using "Installed Using Mycroft Package"
 	provides = plasma5-applets-mycroft
 	conflicts = plasma5-applets-mycroft
 	source = git+https://anongit.kde.org/plasma-mycroft.git
+	source = pkgstartservice.patch
+	source = pkgstopservice.patch
 	sha512sums = SKIP
+	sha512sums = 2f0c41f27c25aa09c059730331255e6fbebb05cac24440d575476d8fab4983837b6cdb1d0bb35f3884ae1a2294c5873aa38ceb4e3aa1c932d3550178919c4ba0
+	sha512sums = 3112eecc59ff26ee6e9e2f07e41c5cd6584fa7311084681d0619c15a1c72771e58e411a76cfee56e56c27c886b88dae36312586be27540635fb0dba092eabd76
 
 pkgname = plasma5-applets-mycroft-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 2108ca05d241..a7dd68cc9cb5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=plasma-mycroft
 pkgname=plasma5-applets-mycroft-git
-pkgver=r6.f6de0ea
+pkgver=r9.e7bae6a
 pkgrel=1
 pkgdesc="Mycroft Ai Plasmoid / Widget for KDE Plasma 5 Desktop"
 arch=("x86_64" "i686")
@@ -10,11 +10,16 @@ url="https://cgit.kde.org/plasma-mycroft.git/"
 license=('GPL3')
 depends=('qt5-websockets' 'qt5-quickcontrols2')
 makedepends=('git' 'cmake' 'extra-cmake-modules' 'plasma-framework' 'python')
+optdepends=('mycroft-core: for using "Installed Using Mycroft Package"')
 provides=("plasma5-applets-mycroft")
 conflicts=("plasma5-applets-mycroft")
 install=$pkgname.install
-source=('git+https://anongit.kde.org/plasma-mycroft.git')
-sha512sums=('SKIP')
+source=('git+https://anongit.kde.org/plasma-mycroft.git'
+        'pkgstartservice.patch'
+        'pkgstopservice.patch')
+sha512sums=('SKIP'
+            '2f0c41f27c25aa09c059730331255e6fbebb05cac24440d575476d8fab4983837b6cdb1d0bb35f3884ae1a2294c5873aa38ceb4e3aa1c932d3550178919c4ba0'
+            '3112eecc59ff26ee6e9e2f07e41c5cd6584fa7311084681d0619c15a1c72771e58e411a76cfee56e56c27c886b88dae36312586be27540635fb0dba092eabd76')
 
 pkgver() {
   cd $srcdir/$_pkgname
@@ -31,5 +36,7 @@ build() {
 package() {
   cd $srcdir/$_pkgname/build
   make DESTDIR="$pkgdir/" install
+  patch -p0 $pkgdir/usr/share/plasma/plasmoids/org.kde.plasma.mycroftplasmoid/contents/code/pkgstartservice.sh < $srcdir/pkgstartservice.patch
+  patch -p0 $pkgdir/usr/share/plasma/plasmoids/org.kde.plasma.mycroftplasmoid/contents/code/pkgstopservice.sh < $srcdir/pkgstopservice.patch
   chmod +x $pkgdir/usr/share/plasma/plasmoids/org.kde.plasma.mycroftplasmoid/contents/code/{startservice,stopservice,pkgstartservice,pkgstopservice}.sh
 }
diff --git a/pkgstartservice.patch b/pkgstartservice.patch
new file mode 100644
index 000000000000..fd69f6498ea1
--- /dev/null
+++ b/pkgstartservice.patch
@@ -0,0 +1,12 @@
+--- pkgstartservice.sh.old	2017-03-28 14:42:59.088314085 +0200
++++ pkgstartservice.sh	2017-03-28 14:49:03.106374563 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ 
+-service mycroft-messagebus start
+-service mycroft-skills start
+-service mycroft-speech-client start
++systemctl --user start mycroft-service.service
++systemctl --user start mycroft-skills.service
++systemctl --user start mycroft-voice.service
+ paplay /usr/share/sounds/freedesktop/stereo/dialog-error.oga
diff --git a/pkgstopservice.patch b/pkgstopservice.patch
new file mode 100644
index 000000000000..e792d288a617
--- /dev/null
+++ b/pkgstopservice.patch
@@ -0,0 +1,12 @@
+--- pkgstopservice.sh.old	2017-03-28 14:43:07.681681401 +0200
++++ pkgstopservice.sh	2017-03-28 14:49:28.926470645 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ 
+-service mycroft-messagebus stop
+-service mycroft-skills stop
+-service mycroft-speech-client stop
++systemctl --user stop mycroft-service.service
++systemctl --user stop mycroft-skills.service
++systemctl --user stop mycroft-voice.service
+ paplay /usr/share/sounds/freedesktop/stereo/dialog-error.oga