summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Weiss2017-02-21 08:03:51 +0100
committerLuca Weiss2017-02-21 08:03:51 +0100
commit7a1e50219fcde36d5bab5bf0c707a58a9ae41130 (patch)
tree03c9d39a9ba38d8a211bc3a032b025fb0b7488c0
parentf2a230d87ab5d84b83e5ec41cd61f83a8bbbcd36 (diff)
downloadaur-7a1e50219fcde36d5bab5bf0c707a58a9ae41130.tar.gz
Update to kde git, unfortunately the revision is <10 so upgrades will be delayed for 7 more commits, but epoch is ugly :(
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD26
-rw-r--r--mycroft-location.patch22
3 files changed, 9 insertions, 47 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b1fb8f1b027..91270a26d43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun Feb 5 21:20:58 UTC 2017
+# Tue Feb 21 07:01:39 UTC 2017
pkgbase = plasma5-applets-mycroft-git
pkgdesc = Mycroft Ai Plasmoid / Widget for KDE Plasma 5 Desktop
- pkgver = r10.c3a46f6
+ pkgver = r3.cead38b
pkgrel = 1
url = https://github.com/AIIX/MycroftPlasmoid
install = plasma5-applets-mycroft-git.install
@@ -18,10 +18,8 @@ pkgbase = plasma5-applets-mycroft-git
depends = qt5-quickcontrols2
provides = plasma5-applets-mycroft
conflicts = plasma5-applets-mycroft
- source = git+https://github.com/AIIX/MycroftPlasmoid.git
- source = mycroft-location.patch
+ source = git+https://anongit.kde.org/plasma-mycroft.git
sha512sums = SKIP
- sha512sums = 42076d6fb29c002dcda804263ce40fa621a3de4487fecd433bc4acb42564c46138cc409c58e450ef962bb720e98f7ad73eefd1176e0d0b7c68bb7161da24e6de
pkgname = plasma5-applets-mycroft-git
diff --git a/PKGBUILD b/PKGBUILD
index c81e06a127d..48e372491b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,26 @@
# Maintainer: Luca Weiss <luca (at) z3ntu (dot) xyz>
-_pkgname=MycroftPlasmoid
+_pkgname=plasma-mycroft
pkgname=plasma5-applets-mycroft-git
-pkgver=r10.c3a46f6
+pkgver=r3.cead38b
pkgrel=1
pkgdesc="Mycroft Ai Plasmoid / Widget for KDE Plasma 5 Desktop"
arch=("x86_64" "i686")
url="https://github.com/AIIX/MycroftPlasmoid"
license=('GPL3')
-depends=('qt5-websockets' 'qt5-quickcontrols2') # 'mycroft-core')
+depends=('qt5-websockets' 'qt5-quickcontrols2')
makedepends=('git' 'cmake' 'extra-cmake-modules' 'plasma-framework' 'python')
provides=("plasma5-applets-mycroft")
conflicts=("plasma5-applets-mycroft")
install=$pkgname.install
-source=('git+https://github.com/AIIX/MycroftPlasmoid.git'
- 'mycroft-location.patch')
-sha512sums=('SKIP'
- '42076d6fb29c002dcda804263ce40fa621a3de4487fecd433bc4acb42564c46138cc409c58e450ef962bb720e98f7ad73eefd1176e0d0b7c68bb7161da24e6de')
+source=('git+https://anongit.kde.org/plasma-mycroft.git')
+sha512sums=('SKIP')
pkgver() {
cd $srcdir/$_pkgname
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
-#prepare() {
-# cd $srcdir/$_pkgname
-# patch -p1 < $srcdir/mycroft-location.patch
-#}
-
build() {
cd $srcdir/$_pkgname
mkdir -p build && cd build
@@ -35,15 +28,8 @@ build() {
make
}
-#check() {
-# cd "$srcdir/${pkgname%-VCS}"
-# make -k check
-#}
-
package() {
cd $srcdir/$_pkgname/build
make DESTDIR="$pkgdir/" install
- chmod +x $pkgdir/usr/share/plasma/plasmoids/org.kde.plasma.projectmycroftplasmoid/contents/code/{startservice,stopservice}.sh
- sed -i 's:cd /home/$USER/mycroft-core*/:/usr/share/mycroft-core/:' $pkgdir/usr/share/plasma/plasmoids/org.kde.plasma.projectmycroftplasmoid/contents/code/startservice.sh
- sed -i 's:cd /home/$USER/mycroft-core*/:/usr/share/mycroft-core/:' $pkgdir/usr/share/plasma/plasmoids/org.kde.plasma.projectmycroftplasmoid/contents/code/stopservice.sh
+ chmod +x $pkgdir/usr/share/plasma/plasmoids/org.kde.plasma.mycroftplasmoid/contents/code/{startservice,stopservice,pkgstartservice,pkgstopservice}.sh
}
diff --git a/mycroft-location.patch b/mycroft-location.patch
deleted file mode 100644
index d345c9f0369..00000000000
--- a/mycroft-location.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/plasmoid/contents/code/startservice.sh b/plasmoid/contents/code/startservice.sh
-index 35cfc23..5652cff 100755
---- a/plasmoid/contents/code/startservice.sh
-+++ b/plasmoid/contents/code/startservice.sh
-@@ -1,5 +1,4 @@
- #!/bin/bash
-
--cd /home/$USER/mycroft-core*/
--./mycroft.sh start
-+sudo -Hu mycroft-core bash -c 'cd && ./mycroft.sh start'
- paplay /usr/share/sounds/freedesktop/stereo/dialog-error.oga
-diff --git a/plasmoid/contents/code/stopservice.sh b/plasmoid/contents/code/stopservice.sh
-index 3ace28b..8c0e15d 100755
---- a/plasmoid/contents/code/stopservice.sh
-+++ b/plasmoid/contents/code/stopservice.sh
-@@ -1,5 +1,4 @@
- #!/bin/bash
-
--cd /home/$USER/mycroft-core*/
--./mycroft.sh stop
-+sudo -Hu mycroft-core bash -c 'cd && ./mycroft.sh stop'
- paplay /usr/share/sounds/freedesktop/stereo/dialog-error.oga