Update to 2.6.0

2 files changed, 13 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 25e18ff49091..975c533da591 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = crow-translate
 	pkgdesc = A simple and lightweight translator that allows to translate and say selected text using Google, Yandex and Bing translate API
-	pkgver = 2.5.1
+	pkgver = 2.6.0
 	pkgrel = 1
 	url = https://github.com/crow-translate/crow-translate
 	arch = x86_64
@@ -13,16 +13,9 @@ pkgbase = crow-translate
 	depends = qt5-x11extras
 	depends = gst-plugins-good
 	depends = openssl
-	source = crow-translate-2.5.1.tar.gz::https://github.com/crow-translate/crow-translate/archive/2.5.1.tar.gz
-	source = QOnlineTranslator-1.3.1.tar.gz::https://github.com/Shatur95/QOnlineTranslator/archive/1.3.1.tar.gz
-	source = QHotkey-1.4.1.tar.gz::https://github.com/Skycoder42/QHotkey/archive/1.4.1.tar.gz
-	source = QTaskbarControl-2.0.1.tar.gz::https://github.com//Skycoder42/QTaskbarControl/archive/2.0.1.tar.gz
-	source = SingleApplication-3.1.4.tar.gz::https://github.com/itay-grudev/SingleApplication/archive/v3.1.4.tar.gz
-	sha256sums = 23a7c5faed049b92e71a038384787f6dc56da7210e74e33d02df514595c650e2
-	sha256sums = af4a4495b2ddfc6f8e7eccc9fc871d253848620fd43a3d342e50ed974f822442
-	sha256sums = 516726432ba21aeab11c37d979d80a300108b774ee43be078dddd2e6055226d8
-	sha256sums = b2f956bdc5fdba1477ca7f4bde9759a120055407e4a7cc0c9efbc3934ae72b01
-	sha256sums = e3b75de67999d340e17f224286622ed8ffc3ed023bc573e369309181c1a365a9
+	depends = tesseract
+	source = crow-translate-2.6.0.tar.gz::https://github.com/crow-translate/crow-translate/archive/2.6.0.tar.gz
+	sha256sums = 882a92d1ebcfe22fce2c9931be895ac2c8f324e857950a29fabf915f0dc6a0a2
 
 pkgname = crow-translate
 
diff --git a/PKGBUILD b/PKGBUILD
index 8d63d2cd6663..800918bcae11 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,27 @@
 # Maintainer: Shatur95 <genaloner@gmail.com>
 
-# Submodule versions
-_qonlinetranslator=1.3.1
-_qhotkey=1.4.1
-_qtaskbarcontrol=2.0.1
-_singleapplication=3.1.4
-
 pkgname=crow-translate
-pkgver=2.5.1
+pkgver=2.6.0
 pkgrel=1
 pkgdesc='A simple and lightweight translator that allows to translate and say selected text using Google, Yandex and Bing translate API'
 arch=(x86_64)
 url=https://github.com/crow-translate/crow-translate
 license=(GPL3)
-depends=(qt5-base qt5-svg qt5-multimedia qt5-x11extras gst-plugins-good openssl)
+depends=(qt5-base qt5-svg qt5-multimedia qt5-x11extras gst-plugins-good openssl tesseract)
 makedepends=(qt5-tools extra-cmake-modules)
-source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz
-        QOnlineTranslator-$_qonlinetranslator.tar.gz::https://github.com/Shatur95/QOnlineTranslator/archive/$_qonlinetranslator.tar.gz
-        QHotkey-$_qhotkey.tar.gz::https://github.com/Skycoder42/QHotkey/archive/$_qhotkey.tar.gz
-        QTaskbarControl-$_qtaskbarcontrol.tar.gz::https://github.com//Skycoder42/QTaskbarControl/archive/$_qtaskbarcontrol.tar.gz
-        SingleApplication-$_singleapplication.tar.gz::https://github.com/itay-grudev/SingleApplication/archive/v$_singleapplication.tar.gz)
-sha256sums=(23a7c5faed049b92e71a038384787f6dc56da7210e74e33d02df514595c650e2
-            af4a4495b2ddfc6f8e7eccc9fc871d253848620fd43a3d342e50ed974f822442
-            516726432ba21aeab11c37d979d80a300108b774ee43be078dddd2e6055226d8
-            b2f956bdc5fdba1477ca7f4bde9759a120055407e4a7cc0c9efbc3934ae72b01
-            e3b75de67999d340e17f224286622ed8ffc3ed023bc573e369309181c1a365a9)
-
-# Move submodules into the project
-prepare() {
-  mv QOnlineTranslator-$_qonlinetranslator/* $pkgname-$pkgver/src/qonlinetranslator
-  mv QHotkey-$_qhotkey/* $pkgname-$pkgver/src/third-party/qhotkey
-  mv QTaskbarControl-$_qtaskbarcontrol/* $pkgname-$pkgver/src/third-party/qtaskbarcontrol
-  mv SingleApplication-$_singleapplication/* $pkgname-$pkgver/src/third-party/singleapplication
-}
+source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz)
+sha256sums=(882a92d1ebcfe22fce2c9931be895ac2c8f324e857950a29fabf915f0dc6a0a2)
 
 build() {
-  mkdir -p $pkgname-$pkgver/build
-  cd $pkgname-$pkgver/build
+  cd $pkgname-$pkgver
 
-  cmake -D CMAKE_INSTALL_PREFIX="$pkgdir/usr" ..
-  cmake --build .
+  cmake -B build -D CMAKE_INSTALL_PREFIX="$pkgdir/usr"
+  cmake --build build
 }
 
 package() {
-  cd $pkgname-$pkgver/build
+  cd $pkgname-$pkgver
 
-  cmake --install .
+  cmake --install build
   rm -f "${pkgdir}/usr/share/icons/hicolor/icon-theme.cache"
 }