Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/.SRCINFO b/.SRCINFO
- index fc97153..df8cb20 100644
- --- a/.SRCINFO
- +++ b/.SRCINFO
- @@ -1,7 +1,7 @@
- pkgbase = mycroft-core
- pkgdesc = The Mycroft Artificial Intelligence platform.
- - pkgver = 18.8.4
- - pkgrel = 2
- + pkgver = 19.2.2
- + pkgrel = 1
- url = https://github.com/MycroftAI/mycroft-core
- install = mycroft-core.install
- arch = i686
- @@ -29,16 +29,14 @@ pkgbase = mycroft-core
- depends = pulseaudio
- depends = pulseaudio-alsa
- depends = fann
- - source = https://github.com/MycroftAI/mycroft-core/archive/release/v18.8.4.tar.gz
- + source = https://github.com/MycroftAI/mycroft-core/archive/release/v19.2.2.tar.gz
- source = mycroft-core.install
- source = venv_init
- source = mycroft.service
- - source = notify.patch
- - sha512sums = 8e1168779cfaf74f7e01f2d5de189e3ec528b2e2380c656724162e006caebfbcc61482421751f81c417d9423615d33413370daa58901e337cb4dedfe1ac9cb73
- + sha512sums = 846290fb680da5d07d77429071286425e890d71ba6fe7c2337b755f6dc15ddb0924c6abf73f21a21572874778f777f34dba820eb9129e9cb52f52acbe2f70847
- sha512sums = 415cc1b32933303a4e730b365b70f3310fd3bb691675f6fe31247e2e64c2e4e58d3919659f021f4195ee51424c882f7d52812c89b8a62c57b23e477586cbb04d
- - sha512sums = 2ec4d296d45c0f3c63c6253a110638b4a87835865b974460d4a592e562f2325c83d3eb18b1a0272622e088469383a0349d65779a5081b1da3d624c6e3d3be8f0
- + sha512sums = 27aa7641f394c33179a6c3ba5862f22ad81254875b08c444479d210d9eac66e0e90da26bb6d7c482939ad5b7e58ad25e709c8b81231763af8d6d1aed4d2acf97
- sha512sums = 67c228fb4a25d1ce529d1689e81703284015ab2721cecdac8264a94e1a41e629e6b6cb82566d41744ebce0d84b7e5c54156cc62c447f7b10b41e012682d0e146
- - sha512sums = 4d0793e1d9c569e586ed951b7e60f16da3fe008f39b298a4747168e294cea2d5dff3b13c188368b336e8642b4b1a08e1a275816c8e5fb386566c729e9761d372
- pkgname = mycroft-core
- diff --git a/PKGBUILD b/PKGBUILD
- index 91d7b53..d9b18b1 100644
- --- a/PKGBUILD
- +++ b/PKGBUILD
- @@ -1,8 +1,8 @@
- # Maintainer: Thorben Guenther <echo YWRtaW5AeGVucm94Lm5ldAo= | base64 -d>
- pkgname=mycroft-core
- -pkgver=18.8.4
- -pkgrel=2
- +pkgver=19.2.2
- +pkgrel=1
- pkgdesc="The Mycroft Artificial Intelligence platform."
- arch=('i686' 'x86_64')
- url='https://github.com/MycroftAI/mycroft-core'
- @@ -36,17 +36,15 @@ install=mycroft-core.install
- source=("https://github.com/MycroftAI/mycroft-core/archive/release/v${pkgver}.tar.gz"
- "mycroft-core.install"
- "venv_init"
- - "mycroft.service"
- - "notify.patch")
- -sha512sums=('8e1168779cfaf74f7e01f2d5de189e3ec528b2e2380c656724162e006caebfbcc61482421751f81c417d9423615d33413370daa58901e337cb4dedfe1ac9cb73'
- + "mycroft.service")
- +sha512sums=('846290fb680da5d07d77429071286425e890d71ba6fe7c2337b755f6dc15ddb0924c6abf73f21a21572874778f777f34dba820eb9129e9cb52f52acbe2f70847'
- '415cc1b32933303a4e730b365b70f3310fd3bb691675f6fe31247e2e64c2e4e58d3919659f021f4195ee51424c882f7d52812c89b8a62c57b23e477586cbb04d'
- - '2ec4d296d45c0f3c63c6253a110638b4a87835865b974460d4a592e562f2325c83d3eb18b1a0272622e088469383a0349d65779a5081b1da3d624c6e3d3be8f0'
- - '67c228fb4a25d1ce529d1689e81703284015ab2721cecdac8264a94e1a41e629e6b6cb82566d41744ebce0d84b7e5c54156cc62c447f7b10b41e012682d0e146'
- - '4d0793e1d9c569e586ed951b7e60f16da3fe008f39b298a4747168e294cea2d5dff3b13c188368b336e8642b4b1a08e1a275816c8e5fb386566c729e9761d372')
- + '27aa7641f394c33179a6c3ba5862f22ad81254875b08c444479d210d9eac66e0e90da26bb6d7c482939ad5b7e58ad25e709c8b81231763af8d6d1aed4d2acf97'
- + '67c228fb4a25d1ce529d1689e81703284015ab2721cecdac8264a94e1a41e629e6b6cb82566d41744ebce0d84b7e5c54156cc62c447f7b10b41e012682d0e146')
- prepare() {
- cd $srcdir/$pkgname-release-v$pkgver
- - patch -N -i "${srcdir}/notify.patch"
- + sed -i 's/^check-dependencies$/#check-dependencies/g' start-mycroft.sh
- }
- package() {
- diff --git a/notify.patch b/notify.patch
- deleted file mode 100644
- index d8b2485..0000000
- --- a/notify.patch
- +++ /dev/null
- @@ -1,20 +0,0 @@
- ---- start-mycroft.sh 2018-10-15 15:34:39.869047990 +0200
- -+++ start_ew 2018-10-15 15:35:34.687065663 +0200
- -@@ -150,17 +150,6 @@
- - else
- - auto_update="false"
- - fi
- --
- -- if [ "$auto_update" == "true" ] ; then
- -- bash dev_setup.sh
- -- else
- -- echo "Please update dependencies by running ./dev_setup.sh again."
- -- if command -v notify-send >/dev/null ; then
- -- # Generate a desktop notification (ArchLinux)
- -- notify-send "Mycroft Dependencies Outdated" "Run ./dev_setup.sh again"
- -- fi
- -- exit 1
- -- fi
- - fi
- - }
- -
- diff --git a/venv_init b/venv_init
- index 216be45..fbb1829 100755
- --- a/venv_init
- +++ b/venv_init
- @@ -2,31 +2,33 @@
- # Virtualenv initialization
- TOP=/usr/share/mycroft-core
- VIRTUALENV_ROOT=${VIRTUALENV_ROOT:-"${TOP}/.venv"}
- -install_venv() {
- - python -m venv "${VIRTUALENV_ROOT}/" --without-pip
- - curl https://bootstrap.pypa.io/get-pip.py | "${VIRTUALENV_ROOT}/bin/python" - 'pip==18.0.0'
- +function install_venv() {
- + /usr/bin/python -m venv "${VIRTUALENV_ROOT}/" --without-pip
- + curl https://bootstrap.pypa.io/3.3/get-pip.py | "${VIRTUALENV_ROOT}/bin/python" - 'pip==18.0.0'
- }
- -if [ ! -x "${VIRTUALENV_ROOT}/bin/activate" ]; then
- - install_venv
- +if [ ! -x "${VIRTUALENV_ROOT}/bin/activate" ] ; then
- + install_venv
- fi
- source "${VIRTUALENV_ROOT}/bin/activate"
- +cd "${TOP}"
- +
- PYTHON=$( python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))" )
- VENV_PATH_FILE="${VIRTUALENV_ROOT}/lib/$PYTHON/site-packages/_virtualenv_path_extensions.pth"
- if [ ! -f "$VENV_PATH_FILE" ] ; then
- echo "import sys; sys.__plen = len(sys.path)" > "$VENV_PATH_FILE" || return 1
- echo "import sys; new=sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p=getattr(sys,'__egginsert',0); sys.path[p:p]=new; sys.__egginsert = p+len(new)" >> "$VENV_PATH_FILE" || return 1
- fi
- -if ! grep -q "$TOP" $VENV_PATH_FILE; then
- - echo "Adding mycroft-core to virtualenv path"
- - sed -i.tmp '1 a\
- +if ! grep -q "$TOP" $VENV_PATH_FILE ; then
- + echo "Adding mycroft-core to virtualenv path"
- + sed -i.tmp '1 a\
- '"$TOP"'
- ' "${VENV_PATH_FILE}"
- fi
- # install required python modules
- -if ! pip install -r /usr/share/mycroft-core/requirements.txt; then
- +if ! pip install -r requirements.txt ; then
- echo "Warning: Failed to install all requirements. Continue? y/N"
- read -n1 continue
- if [[ "$continue" != "y" ]] ; then
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement