change binary name to prevent conflicts with e.g. Haskell's stack

3 files changed, 22 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 202565afcf7a..f3ea1211d2e1 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 = 3
+	pkgrel = 4
 	url = https://www.transip.nl/stack/
 	arch = x86_64
 	license = GPL2
@@ -17,9 +17,11 @@ pkgbase = stack-client
 	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 = APPLICATION_NAME.patch
 	sha256sums = 89a29ce91f49160cae4f04129a9d1e0757b665300db68d4449849c847627d337
 	sha256sums = 802b9032408118cff2852965f8c0ae87733205db86a8d386c2a4fb3c43e9a4d8
 	sha256sums = 25ab3c8010f5b031bad4b671d80487889506b43e42b3f16f2329e58bfabe5fae
+	sha256sums = 95f27580ce24eceae7b5b366ece4229f73104c4041dee9e42b3a46cc94625e43
 
 pkgname = stack-client
 
diff --git a/APPLICATION_NAME.patch b/APPLICATION_NAME.patch
new file mode 100644
index 000000000000..92bcdbd908d1
--- /dev/null
+++ b/APPLICATION_NAME.patch
@@ -0,0 +1,11 @@
+--- 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
+ 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" )
diff --git a/PKGBUILD b/PKGBUILD
index f6d08b410834..db1a056a50db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=stack-client
 pkgver=2.4.1
-pkgrel=3
+pkgrel=4
 pkgdesc="The STACK Client provides file sync to desktop clients."
 arch=('x86_64')
 url='https://www.transip.nl/stack/'
@@ -12,13 +12,17 @@ makedepends=('cmake' 'qt5-tools')
 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")
+        "cmake_qt5.patch"
+        "APPLICATION_NAME.patch")
 sha256sums=('89a29ce91f49160cae4f04129a9d1e0757b665300db68d4449849c847627d337'
             '802b9032408118cff2852965f8c0ae87733205db86a8d386c2a4fb3c43e9a4d8'
-            '25ab3c8010f5b031bad4b671d80487889506b43e42b3f16f2329e58bfabe5fae')
+            '25ab3c8010f5b031bad4b671d80487889506b43e42b3f16f2329e58bfabe5fae'
+            '95f27580ce24eceae7b5b366ece4229f73104c4041dee9e42b3a46cc94625e43')
  
 prepare() {
   patch -p1 < ${srcdir}/cmake_qt5.patch
+  patch -p1 < ${srcdir}/APPLICATION_NAME.patch
+  
   cd client-2.4.1
   for file in ${srcdir}/patches/*
   do
@@ -41,6 +45,7 @@ build() {
         -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
   make