update version and dependences

3 files changed, 24 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5719ac1c1e8d..587ade013990 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vasisualy-git
 	pkgdesc = Vasisualy is a simple Russian voice assistant written on python 3 for GNU/Linux and Windows.
-	pkgver = 0.6.2
-	pkgrel = 2
+	pkgver = 0.6.3
+	pkgrel = 1
 	url = https://github.com/Oknolaz/vasisualy
 	arch = i686
 	arch = x86_64
@@ -11,12 +11,15 @@ pkgbase = vasisualy-git
 	depends = speech-dispatcher
 	depends = python>3
 	depends = python-beautifulsoup4
+	depends = python-future
 	depends = python-geocoder
 	depends = python-lxml
 	depends = python-mss
 	depends = python-pyaudio
+	depends = python-pyalsaaudio
 	depends = python-pyowm
 	depends = python-pyqt5
+	depends = python-pyqt5-webengine
 	depends = python-qt-material
 	depends = python-scipy
 	depends = python-shell
@@ -30,6 +33,8 @@ pkgbase = vasisualy-git
 	source = vasisualy-git::git+https://github.com/Oknolaz/vasisualy.git
 	source = vasisualy-git-pi::git+https://github.com/Oknolaz/vasisualy-pi.git
 	source = vasisualy-git-files::git+https://github.com/Oknolaz/vasisualy-additional-files.git
+	source = ru_w2n::git+https://github.com/Oknolaz/Russian_w2n.git
+	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
diff --git a/.gitignore b/.gitignore
index 4f518972149f..08a625aac541 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /pkg/*
 /src/*
 /vasisualy-git/*
-/vasisualy-git-r*
+/vasisualy-git-*/*
+/ru_w2n/*
diff --git a/PKGBUILD b/PKGBUILD
index 8a40777434d4..2082dace9bec 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Contributor: vantu5z <vantu5z@mail.ru>
 
 pkgname=vasisualy-git
-pkgver=0.6.2
-pkgrel=2
+pkgver=0.6.3
+pkgrel=1
 pkgdesc="Vasisualy is a simple Russian voice assistant written on python 3 for GNU/Linux and Windows."
 arch=('i686' 'x86_64')
 url="https://github.com/Oknolaz/vasisualy"
@@ -10,12 +10,15 @@ license=('GPL3')
 depends=('rhvoice' 'speech-dispatcher'
          'python>3'
          'python-beautifulsoup4'
+         'python-future'
          'python-geocoder'
          'python-lxml'
          'python-mss'
          'python-pyaudio'
+         'python-pyalsaaudio'
          'python-pyowm'
          'python-pyqt5'
+         'python-pyqt5-webengine'
          'python-qt-material'
          'python-scipy'
          'python-shell'
@@ -29,9 +32,11 @@ provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 source=($pkgname::'git+https://github.com/Oknolaz/vasisualy.git'
         ${pkgname}-pi::'git+https://github.com/Oknolaz/vasisualy-pi.git'
-        ${pkgname}-files::'git+https://github.com/Oknolaz/vasisualy-additional-files.git')
+        ${pkgname}-files::'git+https://github.com/Oknolaz/vasisualy-additional-files.git'
+        ru_w2n::'git+https://github.com/Oknolaz/Russian_w2n.git')
 sha256sums=('SKIP'
             'SKIP'
+            'SKIP'
             'SKIP')
 
 pkgver() {
@@ -45,6 +50,9 @@ build() {
 
     cd "${srcdir}/${pkgname}-pi"
     python setup.py build
+
+    cd "${srcdir}/ru_w2n"
+    python setup.py build
 }
 
 package()
@@ -62,4 +70,8 @@ package()
     python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
     install -Dm0755 "run.py" "${pkgdir}/usr/bin/vasisualy-pi"
     install -Dm0644 LICENSE  "${pkgdir}/usr/share/licenses/${pkgname%-git}-pi/LICENSE"
+
+    cd "${srcdir}/ru_w2n"
+    python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+    install -Dm0644 LICENSE.txt  "${pkgdir}/usr/share/licenses/ru_w2n/LICENSE"
 }