Patching config to avoid issue with php macro

3 files changed, 33 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c6e1f63c7c2f..865b18638d93 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kanboard
 	pkgdesc = Simple visual task board
 	pkgver = 1.2.11
-	pkgrel = 2
+	pkgrel = 3
 	url = http://kanboard.net/
 	install = kanboard.install
 	arch = any
@@ -23,6 +23,7 @@ pkgbase = kanboard
 	source = kanboard-cron
 	source = kanboard.service
 	source = kanboard.timer
+	source = config.patch
 	validpgpkeys = DCF1D3CBC1E43342116F760E112C718C894226ED
 	validpgpkeys = 112C718C894226ED
 	sha256sums = 0424ebe188919311708100cf0122b9e78b9e34c3aef0160c069f0b201c39ac86
@@ -32,6 +33,7 @@ pkgbase = kanboard
 	sha256sums = 0efff866815a47329767bb00482f9fc1adff77a6e0e62889ea666ecd930d6f1d
 	sha256sums = 5353560c7664db99a2845a39750a2c5e62045083f7e3f835a198158faa809c64
 	sha256sums = b030b1655cfca20700faa5d3f4dac87bacc24e7070517af041f2ffb25ba46292
+	sha256sums = 3dfa63a56e11185132a07c146dcaf1d5131fd61e610fdb463e039eb8ff2fb944
 
 pkgname = kanboard
 
diff --git a/PKGBUILD b/PKGBUILD
index ed1c63fe08ee..d5b924476ca0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=kanboard
 pkgver=1.2.11
-pkgrel=2
+pkgrel=3
 pkgdesc='Simple visual task board'
 arch=('any')
 url='http://kanboard.net/'
@@ -20,7 +20,8 @@ source=("https://github.com/kanboard/kanboard/archive/v$pkgver/kanboard-$pkgver.
 	"kanboard-nginx-subdir.conf"
 	"kanboard-cron"
 	"kanboard.service"
-	"kanboard.timer")
+	"kanboard.timer"
+ 	"config.patch")
 validpgpkeys=(
 	'DCF1D3CBC1E43342116F760E112C718C894226ED'
 	'112C718C894226ED')
@@ -29,6 +30,7 @@ package() {
     mkdir -p ${pkgdir}/usr/share/webapps
     mkdir -p ${pkgdir}/usr/lib/systemd/system
     mkdir -p ${pkgdir}/usr/share/licenses/kanboard
+    patch ${srcdir}/${pkgname}-${pkgver}/config.default.php ${srcdir}/config.patch
     cp -R ${srcdir}/${pkgname}-${pkgver} ${pkgdir}/usr/share/webapps/${pkgname}
     install -D -m 644 "${srcdir}/kanboard-apache.conf" ${pkgdir}/etc/webapps/${pkgname}/kanboard-apache.conf
     install -D -m 644 "${srcdir}/kanboard-nginx.conf" ${pkgdir}/etc/webapps/${pkgname}/kanboard-nginx.conf
@@ -46,4 +48,5 @@ sha256sums=('0424ebe188919311708100cf0122b9e78b9e34c3aef0160c069f0b201c39ac86'
             '5fdf81a69cda8c3c813e5d21f62d4112264645c95d376d7b31dae4573724930a'
             '0efff866815a47329767bb00482f9fc1adff77a6e0e62889ea666ecd930d6f1d'
             '5353560c7664db99a2845a39750a2c5e62045083f7e3f835a198158faa809c64'
-            'b030b1655cfca20700faa5d3f4dac87bacc24e7070517af041f2ffb25ba46292')
+            'b030b1655cfca20700faa5d3f4dac87bacc24e7070517af041f2ffb25ba46292'
+            '3dfa63a56e11185132a07c146dcaf1d5131fd61e610fdb463e039eb8ff2fb944')
diff --git a/config.patch b/config.patch
new file mode 100644
index 000000000000..040d9b1400cf
--- /dev/null
+++ b/config.patch
@@ -0,0 +1,24 @@
+--- config.default.php	2019-10-15 12:14:27.909885285 -0500
++++ config.default.php.arch	2019-10-15 12:16:50.632608374 -0500
+@@ -6,8 +6,11 @@
+ /* Make sure all paths are absolute by using __DIR__ where needed  */
+ /*******************************************************************/
+ 
++// Define base dir as absolute path of Arch Linux install
++define('ARCH_BASE_DIR', '/usr/share/webapps/kanboard');
++
+ // Data folder (must be writeable by the web server user and absolute)
+-define('DATA_DIR', __DIR__.DIRECTORY_SEPARATOR.'data');
++define('DATA_DIR', ARCH_BASE_DIR.DIRECTORY_SEPARATOR.'data');
+ 
+ // Enable/Disable debug
+ define('DEBUG', false);
+@@ -19,7 +22,7 @@
+ define('LOG_FILE', DATA_DIR.DIRECTORY_SEPARATOR.'debug.log');
+ 
+ // Plugins directory
+-define('PLUGINS_DIR', __DIR__.DIRECTORY_SEPARATOR.'plugins');
++define('PLUGINS_DIR', ARCH_BASE_DIR.DIRECTORY_SEPARATOR.'plugins');
+ 
+ // Plugins directory URL
+ define('PLUGIN_API_URL', 'https://kanboard.org/plugins.json');