Advertisement
Guest User

Untitled

a guest
Mar 31st, 2019
418
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 6.41 KB | None | 0 0
  1. diff --git a/.SRCINFO b/.SRCINFO
  2. index fc97153..df8cb20 100644
  3. --- a/.SRCINFO
  4. +++ b/.SRCINFO
  5. @@ -1,7 +1,7 @@
  6.  pkgbase = mycroft-core
  7.     pkgdesc = The Mycroft Artificial Intelligence platform.
  8. -   pkgver = 18.8.4
  9. -   pkgrel = 2
  10. +   pkgver = 19.2.2
  11. +   pkgrel = 1
  12.     url = https://github.com/MycroftAI/mycroft-core
  13.     install = mycroft-core.install
  14.     arch = i686
  15. @@ -29,16 +29,14 @@ pkgbase = mycroft-core
  16.     depends = pulseaudio
  17.     depends = pulseaudio-alsa
  18.     depends = fann
  19. -   source = https://github.com/MycroftAI/mycroft-core/archive/release/v18.8.4.tar.gz
  20. +   source = https://github.com/MycroftAI/mycroft-core/archive/release/v19.2.2.tar.gz
  21.     source = mycroft-core.install
  22.     source = venv_init
  23.     source = mycroft.service
  24. -   source = notify.patch
  25. -   sha512sums = 8e1168779cfaf74f7e01f2d5de189e3ec528b2e2380c656724162e006caebfbcc61482421751f81c417d9423615d33413370daa58901e337cb4dedfe1ac9cb73
  26. +   sha512sums = 846290fb680da5d07d77429071286425e890d71ba6fe7c2337b755f6dc15ddb0924c6abf73f21a21572874778f777f34dba820eb9129e9cb52f52acbe2f70847
  27.     sha512sums = 415cc1b32933303a4e730b365b70f3310fd3bb691675f6fe31247e2e64c2e4e58d3919659f021f4195ee51424c882f7d52812c89b8a62c57b23e477586cbb04d
  28. -   sha512sums = 2ec4d296d45c0f3c63c6253a110638b4a87835865b974460d4a592e562f2325c83d3eb18b1a0272622e088469383a0349d65779a5081b1da3d624c6e3d3be8f0
  29. +   sha512sums = 27aa7641f394c33179a6c3ba5862f22ad81254875b08c444479d210d9eac66e0e90da26bb6d7c482939ad5b7e58ad25e709c8b81231763af8d6d1aed4d2acf97
  30.     sha512sums = 67c228fb4a25d1ce529d1689e81703284015ab2721cecdac8264a94e1a41e629e6b6cb82566d41744ebce0d84b7e5c54156cc62c447f7b10b41e012682d0e146
  31. -   sha512sums = 4d0793e1d9c569e586ed951b7e60f16da3fe008f39b298a4747168e294cea2d5dff3b13c188368b336e8642b4b1a08e1a275816c8e5fb386566c729e9761d372
  32.  
  33.  pkgname = mycroft-core
  34.  
  35. diff --git a/PKGBUILD b/PKGBUILD
  36. index 91d7b53..d9b18b1 100644
  37. --- a/PKGBUILD
  38. +++ b/PKGBUILD
  39. @@ -1,8 +1,8 @@
  40.  # Maintainer: Thorben Guenther <echo YWRtaW5AeGVucm94Lm5ldAo= | base64 -d>
  41.  
  42.  pkgname=mycroft-core
  43. -pkgver=18.8.4
  44. -pkgrel=2
  45. +pkgver=19.2.2
  46. +pkgrel=1
  47.  pkgdesc="The Mycroft Artificial Intelligence platform."
  48.  arch=('i686' 'x86_64')
  49.  url='https://github.com/MycroftAI/mycroft-core'
  50. @@ -36,17 +36,15 @@ install=mycroft-core.install
  51.  source=("https://github.com/MycroftAI/mycroft-core/archive/release/v${pkgver}.tar.gz"
  52.          "mycroft-core.install"
  53.          "venv_init"
  54. -        "mycroft.service"
  55. -        "notify.patch")
  56. -sha512sums=('8e1168779cfaf74f7e01f2d5de189e3ec528b2e2380c656724162e006caebfbcc61482421751f81c417d9423615d33413370daa58901e337cb4dedfe1ac9cb73'
  57. +        "mycroft.service")
  58. +sha512sums=('846290fb680da5d07d77429071286425e890d71ba6fe7c2337b755f6dc15ddb0924c6abf73f21a21572874778f777f34dba820eb9129e9cb52f52acbe2f70847'
  59.              '415cc1b32933303a4e730b365b70f3310fd3bb691675f6fe31247e2e64c2e4e58d3919659f021f4195ee51424c882f7d52812c89b8a62c57b23e477586cbb04d'
  60. -            '2ec4d296d45c0f3c63c6253a110638b4a87835865b974460d4a592e562f2325c83d3eb18b1a0272622e088469383a0349d65779a5081b1da3d624c6e3d3be8f0'
  61. -            '67c228fb4a25d1ce529d1689e81703284015ab2721cecdac8264a94e1a41e629e6b6cb82566d41744ebce0d84b7e5c54156cc62c447f7b10b41e012682d0e146'
  62. -            '4d0793e1d9c569e586ed951b7e60f16da3fe008f39b298a4747168e294cea2d5dff3b13c188368b336e8642b4b1a08e1a275816c8e5fb386566c729e9761d372')
  63. +            '27aa7641f394c33179a6c3ba5862f22ad81254875b08c444479d210d9eac66e0e90da26bb6d7c482939ad5b7e58ad25e709c8b81231763af8d6d1aed4d2acf97'
  64. +            '67c228fb4a25d1ce529d1689e81703284015ab2721cecdac8264a94e1a41e629e6b6cb82566d41744ebce0d84b7e5c54156cc62c447f7b10b41e012682d0e146')
  65.  
  66.  prepare() {
  67.    cd $srcdir/$pkgname-release-v$pkgver
  68. -  patch -N -i "${srcdir}/notify.patch"
  69. +  sed -i 's/^check-dependencies$/#check-dependencies/g' start-mycroft.sh
  70.  }
  71.  
  72.  package() {
  73. diff --git a/notify.patch b/notify.patch
  74. deleted file mode 100644
  75. index d8b2485..0000000
  76. --- a/notify.patch
  77. +++ /dev/null
  78. @@ -1,20 +0,0 @@
  79. ---- start-mycroft.sh   2018-10-15 15:34:39.869047990 +0200
  80. -+++ start_ew   2018-10-15 15:35:34.687065663 +0200
  81. -@@ -150,17 +150,6 @@
  82. -         else
  83. -             auto_update="false"
  84. -         fi
  85. --
  86. --        if [ "$auto_update" == "true" ] ; then
  87. --            bash dev_setup.sh
  88. --        else
  89. --            echo "Please update dependencies by running ./dev_setup.sh again."
  90. --            if command -v notify-send >/dev/null ; then
  91. --                # Generate a desktop notification (ArchLinux)
  92. --                notify-send "Mycroft Dependencies Outdated" "Run ./dev_setup.sh again"
  93. --            fi
  94. --            exit 1
  95. --        fi
  96. -     fi
  97. - }
  98. -
  99. diff --git a/venv_init b/venv_init
  100. index 216be45..fbb1829 100755
  101. --- a/venv_init
  102. +++ b/venv_init
  103. @@ -2,31 +2,33 @@
  104.  # Virtualenv initialization
  105.  TOP=/usr/share/mycroft-core
  106.  VIRTUALENV_ROOT=${VIRTUALENV_ROOT:-"${TOP}/.venv"}
  107. -install_venv() {
  108. -   python -m venv "${VIRTUALENV_ROOT}/" --without-pip
  109. -   curl https://bootstrap.pypa.io/get-pip.py | "${VIRTUALENV_ROOT}/bin/python" - 'pip==18.0.0'
  110. +function install_venv() {
  111. +    /usr/bin/python -m venv "${VIRTUALENV_ROOT}/" --without-pip
  112. +    curl https://bootstrap.pypa.io/3.3/get-pip.py | "${VIRTUALENV_ROOT}/bin/python" - 'pip==18.0.0'
  113.  }
  114.  
  115. -if [ ! -x "${VIRTUALENV_ROOT}/bin/activate" ]; then
  116. -   install_venv
  117. +if [ ! -x "${VIRTUALENV_ROOT}/bin/activate" ] ; then
  118. +    install_venv
  119.  fi
  120.  
  121.  source "${VIRTUALENV_ROOT}/bin/activate"
  122. +cd "${TOP}"
  123. +
  124.  PYTHON=$( python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))" )
  125.  VENV_PATH_FILE="${VIRTUALENV_ROOT}/lib/$PYTHON/site-packages/_virtualenv_path_extensions.pth"
  126.  if [ ! -f "$VENV_PATH_FILE" ] ; then
  127.      echo "import sys; sys.__plen = len(sys.path)" > "$VENV_PATH_FILE" || return 1
  128.      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
  129.  fi
  130. -if ! grep -q "$TOP" $VENV_PATH_FILE; then
  131. -   echo "Adding mycroft-core to virtualenv path"
  132. -   sed -i.tmp '1 a\
  133. +if ! grep -q "$TOP" $VENV_PATH_FILE ; then
  134. +    echo "Adding mycroft-core to virtualenv path"
  135. +    sed -i.tmp '1 a\
  136.  '"$TOP"'
  137.  ' "${VENV_PATH_FILE}"
  138.  fi
  139.  
  140.  # install required python modules
  141. -if ! pip install -r /usr/share/mycroft-core/requirements.txt; then
  142. +if ! pip install -r requirements.txt ; then
  143.      echo "Warning: Failed to install all requirements. Continue? y/N"
  144.      read -n1 continue
  145.      if [[ "$continue" != "y" ]] ; then
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement