upgrade to 2.11.1

3 files changed, 14 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 14e7926f6194..03fb326c69aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = stack-client
 	pkgdesc = The STACK Client provides file sync to desktop clients.
-	pkgver = 2.6.5
-	pkgrel = 2
+	pkgver = 2.11.1
+	pkgrel = 1
 	url = https://www.transip.nl/stack/
 	arch = x86_64
 	license = GPL2
@@ -17,12 +17,9 @@ pkgbase = stack-client
 	optdepends = python-nautilus: integration with Nautilus
 	optdepends = nemo-python: integration with Nemo
 	conflicts = stack-client-bin
-	source = client-v2.6.5.tar.gz::https://github.com/nextcloud/client/archive/v2.6.5.tar.gz
-	source = http://mirror.transip.net/stack/software/source/stack-client-source-2.6.5.20200909.tar.gz
+	source = http://filehosting-client.transip.nl/packages/stack/v2.11.1-20220906/source/stack-v2.11.1-20220906.tar.gz
 	source = APPLICATION_NAME.patch
-	sha256sums = 935385ff07174a4d85c2d4eda4d069aeb4aa8d0e68865b2cf8a24ca8cc883288
-	sha256sums = b3b5e7fe98df6c8cb8e7020115e58007c902604b5928616c8fd2134dcd127e3a
-	sha256sums = 65a37003112bbc07bb372693793ff5a2dba86199d0da845e7203096ecc33c559
+	sha256sums = c3107d11f3b3bc9680e11f56cb9b1a4f691f93d8fe9990bfebd1a2556e21df82
+	sha256sums = 977dbb37deac79bbd65c822887c92a44fde66a5fb65d73d27b326099996309bd
 
 pkgname = stack-client
-
diff --git a/APPLICATION_NAME.patch b/APPLICATION_NAME.patch
index abd68693e814..e3be930728db 100644
--- a/APPLICATION_NAME.patch
+++ b/APPLICATION_NAME.patch
@@ -1,5 +1,5 @@
---- a/stackheme/OEM.cmake	2018-12-02 13:28:38.808807308 +0100
-+++ b/stacktheme/OEM.cmake	2018-03-09 11:10:44.000000000 +0100
+--- a/branding/OEM.cmake	2018-12-02 13:28:38.808807308 +0100
++++ b/branding/OEM.cmake	2018-03-09 11:10:44.000000000 +0100
 @@ -1,6 +1,6 @@
  set( APPLICATION_SHORTNAME  "stack" )
  set( APPLICATION_NAME       "STACK" )
diff --git a/PKGBUILD b/PKGBUILD
index a728ad8b2f00..4ad3291b77c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=stack-client
-pkgver=2.6.5
-pkgrel=2
+pkgver=2.11.1
+pkgrel=1
 pkgdesc="The STACK Client provides file sync to desktop clients."
 arch=('x86_64')
 url='https://www.transip.nl/stack/'
@@ -9,38 +9,26 @@ depends=('qtkeychain' 'qt5-webengine' 'hicolor-icon-theme' 'xdg-utils' 'libcloud
 optdepends=('python-nautilus: integration with Nautilus' 'nemo-python: integration with Nemo')
 makedepends=('cmake' 'qt5-tools' 'extra-cmake-modules' 'frameworkintegration')
 conflicts=('stack-client-bin')
-source=("client-v${pkgver}.tar.gz::https://github.com/nextcloud/client/archive/v${pkgver}.tar.gz"
-        "http://mirror.transip.net/stack/software/source/stack-client-source-${pkgver}.20200909.tar.gz"
+source=("http://filehosting-client.transip.nl/packages/stack/v${pkgver}-20220906/source/stack-v${pkgver}-20220906.tar.gz"
         "APPLICATION_NAME.patch")
-sha256sums=('935385ff07174a4d85c2d4eda4d069aeb4aa8d0e68865b2cf8a24ca8cc883288'
-            'b3b5e7fe98df6c8cb8e7020115e58007c902604b5928616c8fd2134dcd127e3a'
-            '65a37003112bbc07bb372693793ff5a2dba86199d0da845e7203096ecc33c559')
+sha256sums=('c3107d11f3b3bc9680e11f56cb9b1a4f691f93d8fe9990bfebd1a2556e21df82'
+            '977dbb37deac79bbd65c822887c92a44fde66a5fb65d73d27b326099996309bd')
  
 prepare() {
+  cd client
   patch -p1 < ${srcdir}/APPLICATION_NAME.patch
-  
-  cd desktop-${pkgver}
-  for file in ${srcdir}/patches/*
-  do
-    patch -p1 < ${file}
-  done
 }
  
 build() {
   mkdir -p stack-client-build
   cd stack-client-build
  
-  cmake ../desktop-${pkgver} \
+  cmake ../client \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_INSTALL_LIBDIR=lib \
         -DLINUX_PACKAGE_SHORTNAME=stack \
         -DCMAKE_BUILD_TYPE="Release" \
         -DCMAKE_INSTALL_SYSCONFDIR=/etc/${pkgname} \
-        -DWITH_DOC=FALSE \
-        -DOEM_THEME_DIR=${srcdir}/stacktheme \
-        -DNO_SHIBBOLETH=ON \
-        -DQTKEYCHAIN_LIBRARY=/usr/lib/libqt5keychain.so \
-        -DQTKEYCHAIN_INCLUDE_DIR=/usr/include/qt5keychain/ \
         -DAPPLICATION_EXECUTABLE=stack-client \
         -DMIRALL_VERSION_SUFFIX=
   make