I guess the patches aren't needed anymore

5 files changed, 5 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a754eb67fe6..40598b0959bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Tue Mar 28 13:14:11 UTC 2017
 pkgbase = plasma5-applets-mycroft-git
 	pkgdesc = Mycroft Ai Plasmoid / Widget for KDE Plasma 5 Desktop
-	pkgver = r9.e7bae6a
+	pkgver = r67.2e8a1ec
 	pkgrel = 1
 	url = https://cgit.kde.org/plasma-mycroft.git/
 	install = plasma5-applets-mycroft-git.install
@@ -20,11 +18,7 @@ pkgbase = plasma5-applets-mycroft-git
 	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 a7dd68cc9cb5..2b1f75aa50f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=plasma-mycroft
 pkgname=plasma5-applets-mycroft-git
-pkgver=r9.e7bae6a
+pkgver=r67.2e8a1ec
 pkgrel=1
 pkgdesc="Mycroft Ai Plasmoid / Widget for KDE Plasma 5 Desktop"
 arch=("x86_64" "i686")
@@ -14,12 +14,8 @@ 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'
-        'pkgstartservice.patch'
-        'pkgstopservice.patch')
-sha512sums=('SKIP'
-            '2f0c41f27c25aa09c059730331255e6fbebb05cac24440d575476d8fab4983837b6cdb1d0bb35f3884ae1a2294c5873aa38ceb4e3aa1c932d3550178919c4ba0'
-            '3112eecc59ff26ee6e9e2f07e41c5cd6584fa7311084681d0619c15a1c72771e58e411a76cfee56e56c27c886b88dae36312586be27540635fb0dba092eabd76')
+source=('git+https://anongit.kde.org/plasma-mycroft.git')
+sha512sums=('SKIP')
 
 pkgver() {
   cd $srcdir/$_pkgname
@@ -36,7 +32,4 @@ 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
deleted file mode 100644
index fd69f6498ea1..000000000000
--- a/pkgstartservice.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index e792d288a617..000000000000
--- a/pkgstopservice.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
diff --git a/plasma5-applets-mycroft-git.install b/plasma5-applets-mycroft-git.install
index 2f31fdafa74c..0ad489df4be8 100644
--- a/plasma5-applets-mycroft-git.install
+++ b/plasma5-applets-mycroft-git.install
@@ -1,3 +1,3 @@
 post_install() {
-  echo "You have to have a ~/mycroft-core folder in your home directory! See https://cgit.kde.org/plasma-mycroft.git/tree/Readme.md for more information!"
+  echo "You have to have a ~/mycroft-core folder in your home directory! See https://cgit.kde.org/plasma-mycroft.git/about/ for more information!"
 }