upgrade to 1.7.54

added option to install Grav on top of php or php-legacy

3 files changed, 21 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7bddd4bfd2db..7bf32e366277 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,17 @@
 pkgbase = grav
 	pkgdesc = Modern, Crazy Fast, Ridiculously Easy and Amazingly Powerful Flat-File CMS
-	pkgver = 1.7.44
+	pkgver = 1.7.45
 	pkgrel = 1
 	url = https://getgrav.org
 	install = grav.install
 	arch = any
 	license = MIT
 	optdepends = php-apcu: Userland caching module for PHP
+	optdepends = php-legacy-apcu: Userland caching module for PHP
 	optdepends = php-yaml: YAML de-/serialization using the LibYAML library
+	optdepends = php-legacy-yaml: YAML de-/serialization using the LibYAML library
 	optdepends = php-fpm: FastCGI Process Manager
+	optdepends = php-legacy-fpm: FastCGI Process Manager
 	optdepends = apache: High performance Unix-based HTTP server
 	optdepends = nginx: Lightweight HTTP server and IMAP/POP3 proxy server
 	optdepends = uwsgi: Fast and highly tuneable application server
@@ -16,7 +19,7 @@ pkgbase = grav
 	provides = grav
 	backup = etc/webapps/grav/config/site.yaml
 	backup = etc/webapps/grav/config/system.yaml
-	source = grav-1.7.44.zip::https://github.com/getgrav/grav/releases/download/1.7.44/grav-v1.7.44.zip
+	source = grav-1.7.45.zip::https://github.com/getgrav/grav/releases/download/1.7.45/grav-v1.7.45.zip
 	source = grav.patch
 	source = grav.user.readme
 	source = grav.sysusers.conf
@@ -25,7 +28,7 @@ pkgbase = grav
 	source = grav.php-fpm.ini
 	source = grav.php-fpm.d.grav.conf
 	source = grav.php-fpm.service.d.override.conf
-	sha256sums = b8dba5e64fed3a43267f9d3fc383daa32fad6324ef5f3a73dd2ec98df8fed97a
+	sha256sums = f7ced39f3b531443a599cab91c0a4ee525751bb9582cfd232d5a45f3667d88be
 	sha256sums = 80d8a9e6788fc7efca9ce78f96902d37a3e3c3df363224480db6901bd7d7fcb3
 	sha256sums = 125e08820ed477582d7ae716dac6495bca4eac485fa4d4263b11f2505fc355db
 	sha256sums = ced168231a98be4816afc0a1928b54218c4ce4081be7b49acd704e2a9325f9db
@@ -36,5 +39,5 @@ pkgbase = grav
 	sha256sums = 13230cd930dccfecd9b3cb5c8b516dc98b3f2167f188305a2e4682f445f9acb9
 
 pkgname = grav
-	depends = php>=7.3.6
-	depends = php-gd
+	depends = php-interpreter
+	depends = php-gd-interpreter
diff --git a/.gitignore b/.gitignore
index ce174edbaa6f..da3b225bbf4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,7 @@
-.BUILDINFO
-.INSTALL
-.PKGINFO
-*.pkg.tar.zst
-grav-*.zip
-pkg
-src
-TODO
-test-*
+/*.pkg.tar.zst
+/grav-*.zip
+/pkg
+/src
+/TODO
+/test-*
+/build
diff --git a/PKGBUILD b/PKGBUILD
index ac8dfcd38cee..6ab36bb24f96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Nils Czernia <nils at czserver dot de>
 
 pkgname=grav
-pkgver=1.7.44
+pkgver=1.7.45
 pkgrel=1
 pkgdesc='Modern, Crazy Fast, Ridiculously Easy and Amazingly Powerful Flat-File CMS'
 arch=('any')
@@ -12,8 +12,11 @@ license=('MIT')
 provides=('grav')
 depends=( )
 optdepends=('php-apcu: Userland caching module for PHP' 
+            'php-legacy-apcu: Userland caching module for PHP' 
             'php-yaml: YAML de-/serialization using the LibYAML library'
+            'php-legacy-yaml: YAML de-/serialization using the LibYAML library'
             'php-fpm: FastCGI Process Manager'
+            'php-legacy-fpm: FastCGI Process Manager'
             'apache: High performance Unix-based HTTP server' 
             'nginx: Lightweight HTTP server and IMAP/POP3 proxy server'
             'uwsgi: Fast and highly tuneable application server'
@@ -28,7 +31,7 @@ source=("${pkgname}-${pkgver}.zip::https://github.com/getgrav/grav/releases/down
         "grav.php-fpm.ini"
         "grav.php-fpm.d.grav.conf"
         "grav.php-fpm.service.d.override.conf")
-sha256sums=('b8dba5e64fed3a43267f9d3fc383daa32fad6324ef5f3a73dd2ec98df8fed97a'
+sha256sums=('f7ced39f3b531443a599cab91c0a4ee525751bb9582cfd232d5a45f3667d88be'
             '80d8a9e6788fc7efca9ce78f96902d37a3e3c3df363224480db6901bd7d7fcb3'
             '125e08820ed477582d7ae716dac6495bca4eac485fa4d4263b11f2505fc355db'
             'ced168231a98be4816afc0a1928b54218c4ce4081be7b49acd704e2a9325f9db'
@@ -51,7 +54,7 @@ prepare() {
 }
 
 package() {
-  depends=('php>=7.3.6' 'php-gd')
+  depends=('php-interpreter' 'php-gd-interpreter')
   mkdir -p "${pkgdir}/usr/share/webapps"
   gravroot="${pkgdir}/usr/share/webapps/${pkgname}"
   cp -ar "${srcdir}/${pkgname}" "${gravroot}"