Update to version 1.5.2

3 files changed, 18 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 268d15d4d409..493d78bcb1d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = screencloud
 	pkgdesc = An easy to use screenshot sharing application
-	pkgver = 1.5.1
+	pkgver = 1.5.2
 	pkgrel = 1
 	url = https://github.com/olav-st/screencloud/
 	arch = x86_64
@@ -18,11 +18,11 @@ pkgbase = screencloud
 	depends = qt5-multimedia
 	depends = hicolor-icon-theme
 	depends = pythonqt
-	optdepends = python-pycryptodome: for SFTP support
-	source = screencloud-1.5.1.tar.gz::https://github.com/olav-st/screencloud/archive/v1.5.1.tar.gz
+	optdepends = python-ssh2: for SFTP support
+	source = screencloud-1.5.2.tar.gz::https://github.com/olav-st/screencloud/archive/v1.5.2.tar.gz
 	source = 010-screencloud-fix-python-link-libraries.patch
-	sha256sums = 2a22ca06fc217574aee2204fdae4ba9c01cf6d5d78a63334ae95207bfbf0fc72
-	sha256sums = 5526080cd195127cc94f4c8d69ae3e55e6d3b24b6feeb23c1d5f8f885c87d7f4
+	sha256sums = c7bcc21873fbd9f2dff30d7a4834516828b76a4cdd533be25656dc210310978c
+	sha256sums = bf9327568513852f02b87c7a72474b50ed323ed525098e790e190472f9b1fa8e
 
 pkgname = screencloud
 
diff --git a/010-screencloud-fix-python-link-libraries.patch b/010-screencloud-fix-python-link-libraries.patch
index 68dfdd82676d..7dde6e125737 100644
--- a/010-screencloud-fix-python-link-libraries.patch
+++ b/010-screencloud-fix-python-link-libraries.patch
@@ -1,7 +1,6 @@
-diff -Naurp a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2020-01-11 15:33:41.000000000 +0000
-+++ b/CMakeLists.txt	2020-01-11 16:22:36.000000000 +0000
-@@ -272,17 +272,6 @@ set(REQUIRED_LIBS ${REQUIRED_LIBS}
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -263,17 +263,6 @@ set(REQUIRED_LIBS ${REQUIRED_LIBS}
    ${QUAZIP_LIBRARY}
  )
  
@@ -19,7 +18,7 @@ diff -Naurp a/CMakeLists.txt b/CMakeLists.txt
  #Find PythonQt
  find_package(PythonQt REQUIRED)
  include_directories(${PYTHONQT_INCLUDE_DIR})
-@@ -302,6 +291,17 @@ else(PYTHONQT_QTALL_FOUND)
+@@ -293,6 +282,17 @@ else(PYTHONQT_QTALL_FOUND)
      message(STATUS "Using PythonQt_QtBindings (old) for Qt bindings.")
  endif(PYTHONQT_QTALL_FOUND)
  
diff --git a/PKGBUILD b/PKGBUILD
index 52d6d750ce75..78753f7f8884 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Lev Lybin <lev.lybin@gmail.com>
 
 pkgname=screencloud
-pkgver=1.5.1
+pkgver=1.5.2
 pkgrel=1
 pkgdesc='An easy to use screenshot sharing application'
 arch=('x86_64')
@@ -16,23 +16,26 @@ depends=(
         'pythonqt'
 )
 makedepends=('cmake' 'zlib' 'openssl' 'qt5-svg' 'qt5-tools')
-optdepends=('python-pycryptodome: for SFTP support')
+optdepends=('python-ssh2: for SFTP support')
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/olav-st/${pkgname}/archive/v${pkgver}.tar.gz"
         '010-screencloud-fix-python-link-libraries.patch')
-sha256sums=('2a22ca06fc217574aee2204fdae4ba9c01cf6d5d78a63334ae95207bfbf0fc72'
-            '5526080cd195127cc94f4c8d69ae3e55e6d3b24b6feeb23c1d5f8f885c87d7f4')
+sha256sums=('c7bcc21873fbd9f2dff30d7a4834516828b76a4cdd533be25656dc210310978c'
+            'bf9327568513852f02b87c7a72474b50ed323ed525098e790e190472f9b1fa8e')
 
 prepare() {
     patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/010-screencloud-fix-python-link-libraries.patch"
 }
 
 build() {
+    local _quazip_include
+    _quazip_include="$(find /usr/include -type d -name 'QuaZip-Qt5*')/quazip"
+    
     cmake -B build -S "${pkgname}-${pkgver}" \
         -DCMAKE_BUILD_TYPE:STRING='None' \
         -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
-        -DCOLOR_OUTPUT:BOOL='ON' \
         -DPYTHON_USE_PYTHON3:BOOL='ON' \
-        -DQT_USE_QT5:BOOL='ON' \
+        -DQUAZIP_INCLUDE_DIR:PATH="${_quazip_include}" \
+        -DQUAZIP_LIBRARY:FILEPATH='/usr/lib/libquazip1-qt5.so' \
         -Wno-dev
     make -C build
 }