Update to 2.6.2.20200306 release.

author: Ruben Van Boxem 2020-04-12 17:16:46 +0200
committer: Ruben Van Boxem 2020-04-12 17:16:46 +0200
commit: 1ea123f424bdcbddad57b240250cc3521916c3be (patch)
tree: 7e13d27e706473bcd0b40824497f2cb6a4a3da2b
parent: ce0ba93d6ab931ee414a3204d60fdee41cbedf96 (diff)
download: aur-1ea123f424bdcbddad57b240250cc3521916c3be.tar.gz
4 files changed, 22 insertions, 135 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e0b2edb7a319..b6d4274d0bea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = stack-client
 	pkgdesc = The STACK Client provides file sync to desktop clients.
-	pkgver = 2.4.1
-	pkgrel = 5
+	pkgver = 2.6.2
+	pkgrel = 1
 	url = https://www.transip.nl/stack/
 	arch = x86_64
 	license = GPL2
@@ -16,14 +16,12 @@ pkgbase = stack-client
 	optdepends = python2-nautilus: integration with Nautilus
 	optdepends = nemo-python: integration with Nemo
 	conflicts = stack-client-bin
-	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
-	source = cmake_qt5.patch
+	source = client-v2.6.2.tar.gz::https://github.com/nextcloud/client/archive/v2.6.2.tar.gz
+	source = http://mirror.transip.net/stack/software/source/stack-client-source-2.6.2.20200306.tar.gz
 	source = APPLICATION_NAME.patch
-	sha256sums = 89a29ce91f49160cae4f04129a9d1e0757b665300db68d4449849c847627d337
-	sha256sums = 802b9032408118cff2852965f8c0ae87733205db86a8d386c2a4fb3c43e9a4d8
-	sha256sums = 25ab3c8010f5b031bad4b671d80487889506b43e42b3f16f2329e58bfabe5fae
-	sha256sums = 95f27580ce24eceae7b5b366ece4229f73104c4041dee9e42b3a46cc94625e43
+	sha256sums = bbcb6593134836226640b108da7ad3db061417681e2d843bc371b1d697fb0551
+	sha256sums = d52cbf0ff3370e681b3275ef8004eede0563fff64563afa8de1ba53236024988
+	sha256sums = 65a37003112bbc07bb372693793ff5a2dba86199d0da845e7203096ecc33c559
 
 pkgname = stack-client
 
diff --git a/APPLICATION_NAME.patch b/APPLICATION_NAME.patch
index 92bcdbd908d1..abd68693e814 100644
--- a/APPLICATION_NAME.patch
+++ b/APPLICATION_NAME.patch
@@ -1,11 +1,10 @@
---- a/transiptheme/OEM.cmake	2018-12-02 13:28:38.808807308 +0100
-+++ b/transiptheme/OEM.cmake	2018-03-09 11:10:44.000000000 +0100
-@@ -1,7 +1,7 @@
- # Generated by OWNBRANDER on Mon, 25 Apr 2016 15:49:22 +0000
+--- a/stackheme/OEM.cmake	2018-12-02 13:28:38.808807308 +0100
++++ b/stacktheme/OEM.cmake	2018-03-09 11:10:44.000000000 +0100
+@@ -1,6 +1,6 @@
  set( APPLICATION_SHORTNAME  "stack" )
  set( APPLICATION_NAME       "STACK" )
 -set( APPLICATION_EXECUTABLE "stack"        )
 +set( APPLICATION_EXECUTABLE "stack-client"        )
  set( APPLICATION_DOMAIN     "transip.nl/stack"          )
  set( APPLICATION_VENDOR     "TransIP"     )
- set( APPLICATION_REV_DOMAIN "nl.transip.stack" )
+ set( APPLICATION_UPDATE_URL "https://mirror.transip.net/stack/update/" CACHE string "URL for updater" )
diff --git a/PKGBUILD b/PKGBUILD
index dc5ea8bdf544..41bd2a11698b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=stack-client
-pkgver=2.4.1
-pkgrel=5
+pkgver=2.6.2
+pkgrel=1
 pkgdesc="The STACK Client provides file sync to desktop clients."
 arch=('x86_64')
 url='https://www.transip.nl/stack/'
@@ -10,20 +10,17 @@ optdepends=('python2-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/owncloud/client/archive/v${pkgver}.tar.gz"
-        "http://mirror.transip.net/stack/software/source/stack-client-source-${pkgver}.tar.gz"
-        "cmake_qt5.patch"
+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}.20200306.tar.gz"
         "APPLICATION_NAME.patch")
-sha256sums=('89a29ce91f49160cae4f04129a9d1e0757b665300db68d4449849c847627d337'
-            '802b9032408118cff2852965f8c0ae87733205db86a8d386c2a4fb3c43e9a4d8'
-            '25ab3c8010f5b031bad4b671d80487889506b43e42b3f16f2329e58bfabe5fae'
-            '95f27580ce24eceae7b5b366ece4229f73104c4041dee9e42b3a46cc94625e43')
+sha256sums=('bbcb6593134836226640b108da7ad3db061417681e2d843bc371b1d697fb0551'
+            'd52cbf0ff3370e681b3275ef8004eede0563fff64563afa8de1ba53236024988'
+            '65a37003112bbc07bb372693793ff5a2dba86199d0da845e7203096ecc33c559')
  
 prepare() {
-  patch -p1 < ${srcdir}/cmake_qt5.patch
   patch -p1 < ${srcdir}/APPLICATION_NAME.patch
   
-  cd client-2.4.1
+  cd desktop-${pkgver}
   for file in ${srcdir}/patches/*
   do
     patch -p1 < ${file}
@@ -34,20 +31,20 @@ build() {
   mkdir -p stack-client-build
   cd stack-client-build
  
-  cmake ../client-2.4.1 \
+  cmake ../desktop-${pkgver} \
         -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 \
+        -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= \
-        -DMIRALL_VERSION_BUILD=70896
+        -DMIRALL_VERSION_BUILD=20200306
   make
 }
  
diff --git a/cmake_qt5.patch b/cmake_qt5.patch
deleted file mode 100644
index e91ed5a969f2..000000000000
--- a/cmake_qt5.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -upr src-old/client-2.4.1/cmake/modules/QtVersionAbstraction.cmake src/client-2.4.1/cmake/modules/QtVersionAbstraction.cmake
---- src-old/client-2.4.1/cmake/modules/QtVersionAbstraction.cmake	2018-06-15 23:41:00.778417109 +0200
-+++ src/client-2.4.1/cmake/modules/QtVersionAbstraction.cmake	2018-06-16 12:25:32.250294653 +0200
-@@ -9,6 +9,7 @@ find_package(Qt5Core REQUIRED)
- find_package(Qt5Network REQUIRED)
- find_package(Qt5Xml REQUIRED)
- find_package(Qt5Concurrent REQUIRED)
-+find_package(Qt5Sql REQUIRED)
- if(UNIT_TESTING)
-     find_package(Qt5Test REQUIRED)
- endif()
-diff -upr src-old/client-2.4.1/CMakeLists.txt src/client-2.4.1/CMakeLists.txt
---- src-old/client-2.4.1/CMakeLists.txt	2018-06-15 23:41:00.571751406 +0200
-+++ src/client-2.4.1/CMakeLists.txt	2018-06-16 12:00:28.329726348 +0200
-@@ -1,5 +1,5 @@
- 
--cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 2.8.12)
- cmake_policy(VERSION 2.8.0)
- if(POLICY CMP0020)
-   cmake_policy(SET CMP0020 NEW)
-diff -upr src-old/client-2.4.1/src/cmd/CMakeLists.txt src/client-2.4.1/src/cmd/CMakeLists.txt
---- src-old/client-2.4.1/src/cmd/CMakeLists.txt	2018-06-15 23:41:01.605079928 +0200
-+++ src/client-2.4.1/src/cmd/CMakeLists.txt	2018-06-16 11:59:45.359770661 +0200
-@@ -27,7 +27,7 @@ endif()
- 
- if(NOT BUILD_LIBRARIES_ONLY)
-    add_executable(${cmd_NAME}  ${cmd_SRC})
--	qt5_use_modules(${cmd_NAME} Network )
-+	target_link_libraries(${cmd_NAME} Qt5::Network )
- 	set_target_properties(${cmd_NAME} PROPERTIES
- 	        RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY} )
-         set_target_properties(${cmd_NAME} PROPERTIES
-diff -upr src-old/client-2.4.1/src/csync/CMakeLists.txt src/client-2.4.1/src/csync/CMakeLists.txt
---- src-old/client-2.4.1/src/csync/CMakeLists.txt	2018-06-15 23:41:01.658413013 +0200
-+++ src/client-2.4.1/src/csync/CMakeLists.txt	2018-06-15 23:43:19.384535393 +0200
-@@ -134,7 +134,7 @@ if(ZLIB_FOUND)
- endif(ZLIB_FOUND)
- 
- find_package(Qt5Core REQUIRED)
--qt5_use_modules(${CSYNC_LIBRARY} Core Concurrent)
-+target_link_libraries(${CSYNC_LIBRARY} Qt5::Core Qt5::Concurrent)
- 
- # For src/common/utility_mac.cpp
- if (APPLE)
-diff -upr src-old/client-2.4.1/src/csync/std/CMakeLists.txt src/client-2.4.1/src/csync/std/CMakeLists.txt
---- src-old/client-2.4.1/src/csync/std/CMakeLists.txt	2018-06-15 23:41:01.698412827 +0200
-+++ src/client-2.4.1/src/csync/std/CMakeLists.txt	2018-06-15 23:42:23.114735762 +0200
-@@ -36,4 +36,4 @@ add_library(${CSTDLIB_LIBRARY} STATIC ${
- if(NOT WIN32)
-     add_definitions( -fPIC )
- endif()
--qt5_use_modules(${CSTDLIB_LIBRARY} Core)
-+target_link_libraries(${CSTDLIB_LIBRARY} Qt5::Core)
-diff -upr src-old/client-2.4.1/src/gui/CMakeLists.txt src/client-2.4.1/src/gui/CMakeLists.txt
---- src-old/client-2.4.1/src/gui/CMakeLists.txt	2018-06-15 23:41:01.735079323 +0200
-+++ src/client-2.4.1/src/gui/CMakeLists.txt	2018-06-16 12:24:22.400232017 +0200
-@@ -236,7 +236,7 @@ list(APPEND final_src ${ownCloud})
- set(ownCloud ${ownCloud_old})
- 
- if (WITH_DBUS)
--    set(ADDITIONAL_APP_MODULES DBus)
-+    set(ADDITIONAL_APP_MODULES Qt5::DBus)
- endif(WITH_DBUS)
- if (NOT NO_SHIBBOLETH)
-     list(APPEND ADDITIONAL_APP_MODULES WebKitWidgets)
-@@ -265,14 +265,14 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
- 
-     # add_executable( ${APPLICATION_EXECUTABLE} main.cpp ${final_src})
-     add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src})
--    qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml Sql ${ADDITIONAL_APP_MODULES})
-+    target_link_libraries(${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network Qt5::Xml Qt5::Sql ${ADDITIONAL_APP_MODULES})
- else()
-     # set(CMAKE_INSTALL_PREFIX ".") # Examples use /Applications. hurmpf.
-     set(MACOSX_BUNDLE_ICON_FILE "ownCloud.icns")
- 
-     # we must add MACOSX_BUNDLE only if building a bundle
-     add_executable( ${APPLICATION_EXECUTABLE} WIN32 MACOSX_BUNDLE main.cpp ${final_src})
--    qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml Sql  ${ADDITIONAL_APP_MODULES})
-+    target_link_libraries(${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network Qt5::Xml Qt5::Sql  ${ADDITIONAL_APP_MODULES})
- 
-     set (QM_DIR ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/Translations)
-     install(FILES ${client_I18N} DESTINATION ${QM_DIR})
-@@ -291,7 +291,7 @@ endif()
- 
- add_library(updater STATIC ${updater_SRCS} ${updaterMoc})
- target_link_libraries(updater ${synclib_NAME})
--qt5_use_modules(updater Widgets Network Xml)
-+target_link_libraries(updater Qt5::Widgets Qt5::Network Qt5::Xml)
- 
- set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
-         RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY}
-diff -upr src-old/client-2.4.1/src/libsync/CMakeLists.txt src/client-2.4.1/src/libsync/CMakeLists.txt
---- src-old/client-2.4.1/src/libsync/CMakeLists.txt	2018-06-15 23:41:02.001744749 +0200
-+++ src/client-2.4.1/src/libsync/CMakeLists.txt	2018-06-15 23:44:08.254383204 +0200
-@@ -120,9 +120,9 @@ GENERATE_EXPORT_HEADER( ${synclib_NAME}
- )
- 
- if(TOKEN_AUTH_ONLY)
--    qt5_use_modules(${synclib_NAME} Network)
-+    target_link_libraries(${synclib_NAME} Qt5::Network)
- else()
--    qt5_use_modules(${synclib_NAME} Widgets Network)
-+    target_link_libraries(${synclib_NAME} Qt5::Widgets Qt5::Network)
- endif()
- 
- set_target_properties( ${synclib_NAME}  PROPERTIES
author	Ruben Van Boxem	2020-04-12 17:16:46 +0200
committer	Ruben Van Boxem	2020-04-12 17:16:46 +0200
commit	1ea123f424bdcbddad57b240250cc3521916c3be (patch)
tree	7e13d27e706473bcd0b40824497f2cb6a4a3da2b
parent	ce0ba93d6ab931ee414a3204d60fdee41cbedf96 (diff)
download	aur-1ea123f424bdcbddad57b240250cc3521916c3be.tar.gz