update to version 2.4.1

3 files changed, 23 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3199f61a212e..a9b62be06c51 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = stack-client
 	pkgdesc = The STACK Client provides file sync to desktop clients.
-	pkgver = 2.2.4
+	pkgver = 2.4.1
 	pkgrel = 1
 	url = https://www.transip.nl/stack/
 	arch = x86_64
@@ -13,14 +13,11 @@ pkgbase = stack-client
 	depends = xdg-utils
 	optdepends = python2-nautilus: integration with Nautilus
 	optdepends = nemo-python: integration with Nemo
-	provides = mirall-git
-	provides = owncloud-client
-	provides = owncloud-client-ngs
 	conflicts = stack-client-bin
-	source = http://mirror.transip.net/stack/software/source/stackclient-2.2.4-sources.zip
-	source = SSLeay_OpenSSL.diff
-	sha256sums = 65540597542b2af3f195742ffb4983cdb9030370f44482451d7a622d033ae661
-	sha256sums = fd07efe4d09a086ec827e9618818a7839fae43db6192b693307977fa84842582
+	source = client-v2.4.1.tar.gz::https://github.com/owncloud/client/archive/v2.4.1.tar.gz
+	source = http://mirror.transip.net/stack/software/source/stack-client-source-2.4.1.tar.gz
+	sha256sums = 89a29ce91f49160cae4f04129a9d1e0757b665300db68d4449849c847627d337
+	sha256sums = 802b9032408118cff2852965f8c0ae87733205db86a8d386c2a4fb3c43e9a4d8
 
 pkgname = stack-client
 
diff --git a/PKGBUILD b/PKGBUILD
index f24c8d32359f..211712ab1f1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=stack-client
-pkgver=2.2.4
+pkgver=2.4.1
 pkgrel=1
 pkgdesc="The STACK Client provides file sync to desktop clients."
 arch=('x86_64')
@@ -10,33 +10,37 @@ optdepends=('python2-nautilus: integration with Nautilus' 'nemo-python:
 integration with Nemo')
 makedepends=('cmake' 'qt5-tools')
 conflicts=('stack-client-bin')
-provides=('mirall-git' 'owncloud-client' 'owncloud-client-ngs')
-source=("http://mirror.transip.net/stack/software/source/stackclient-${pkgver}-sources.zip"
-        "SSLeay_OpenSSL.diff")
-sha256sums=('65540597542b2af3f195742ffb4983cdb9030370f44482451d7a622d033ae661'
-            'fd07efe4d09a086ec827e9618818a7839fae43db6192b693307977fa84842582')
+source=("client-v${pkgver}.tar.gz::https://github.com/owncloud/client/archive/v${pkgver}.tar.gz"
+        "http://mirror.transip.net/stack/software/source/stack-client-source-${pkgver}.tar.gz")
+sha256sums=('89a29ce91f49160cae4f04129a9d1e0757b665300db68d4449849c847627d337'
+            '802b9032408118cff2852965f8c0ae87733205db86a8d386c2a4fb3c43e9a4d8')
  
 prepare() {
-  tar xzf ${pkgname}_${pkgver}.orig.tar.gz
-  gunzip ${pkgname}_${pkgver}-1.1.diff.gz
-  patch -p1 < SSLeay_OpenSSL.diff
+  cd client-2.4.1
+  for file in ${srcdir}/patches/*
+  do
+    patch -p1 < ${file}
+  done
 }
  
 build() {
-  cd transipclient-${pkgver}
+  mkdir -p stack-client-build
+  cd stack-client-build
  
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+  cmake ../client-2.4.1 \
+        -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}/transiptheme \
         -DQTKEYCHAIN_LIBRARY=/usr/lib/libqt5keychain.so \
-        -DQTKEYCHAIN_INCLUDE_DIR=/usr/include/qt5keychain/ \
-        -DOEM_THEME_DIR=${srcdir}/transipclient-${pkgver}/transip/mirall
+        -DQTKEYCHAIN_INCLUDE_DIR=/usr/include/qt5keychain/
   make
 }
  
 package() {
-  cd ${srcdir}/transipclient-${pkgver}
+  cd ${srcdir}/stack-client-build
   make DESTDIR=${pkgdir} install
 }
diff --git a/SSLeay_OpenSSL.diff b/SSLeay_OpenSSL.diff
deleted file mode 100644
index ee55ddb80b2a..000000000000
--- a/SSLeay_OpenSSL.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/transipclient-2.2.4/src/3rdparty/certificates/p12topem.cpp
-+++ b/transipclient-2.2.4/src/3rdparty/certificates/p12topem.cpp
-@@ -65,7 +65,7 @@ resultP12ToPem p12ToPem(string p12File,
-     ret.PrivateKey = "";
-     ret.Certificate = "";
-     
--    SSLeay_add_all_algorithms();
-+    OpenSSL_add_all_algorithms();
-     ERR_load_crypto_strings();
-     if(!(fp = fopen(p12File.c_str(), "rb"))) {
-         ret.ErrorCode = 1;
-