v=1.34.23,r=2 - Temp fix for CakePHP

2 files changed, 6 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5930a0072995..cdf9437731cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = zoneminder
 	pkgdesc = A full-featured, open source, state-of-the-art video surveillance software system
 	pkgver = 1.34.23
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.zoneminder.com/
 	install = zoneminder.install
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index b993bc968a76..94884dec4ec6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -44,7 +44,7 @@
 
 pkgname=zoneminder
 pkgver=1.34.23
-pkgrel=1
+pkgrel=2
 pkgdesc='A full-featured, open source, state-of-the-art video surveillance software system'
 arch=('any')
 url='https://www.zoneminder.com/'
@@ -98,6 +98,10 @@ sha256sums=('SKIP'
 prepare () {
     cd $pkgname-git
     
+    # Temporary fix for CakePHP (courtesy of @compgamer89 on AUR)
+    # Relevant commit: https://github.com/ZoneMinder/zoneminder/commit/2fa0fbe448058f2826dadc44572a822af2a177d5
+    git cherry-pick 2fa0fbe448058f2826dadc44572a822af2a177d5
+
     # Download and move extra PHP plugins into place
     git submodule update --init --recursive