summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Michalopoulos2021-05-19 00:59:32 +0300
committerAlexander Michalopoulos2021-05-19 00:59:32 +0300
commit3a1a378067fc11da131c1c3da96cb3ebcebdd594 (patch)
tree20af064579ec0dc08e4dc6e62f497618633c1494
parentdf7401c334eedd952cdc58cf44ad4f4e12e3c60d (diff)
downloadaur-3a1a378067fc11da131c1c3da96cb3ebcebdd594.tar.gz
v=1.36.0,r=3 - Temporary fix for GCC11 compatibility
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD8
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3629e8fc0db..6012ba66d30 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.36.0
- pkgrel = 2
+ pkgrel = 3
url = https://www.zoneminder.com/
install = zoneminder.install
arch = any
diff --git a/PKGBUILD b/PKGBUILD
index acc86700716..e407165c631 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -44,7 +44,7 @@
pkgname=zoneminder
pkgver=1.36.0
-pkgrel=2
+pkgrel=3
pkgdesc='A full-featured, open source, state-of-the-art video surveillance software system'
arch=('any')
url='https://www.zoneminder.com/'
@@ -98,12 +98,12 @@ sha256sums=('SKIP'
prepare () {
cd $pkgname-git
- # Temporary fix for CakePHP (courtesy of @compgamer89 on AUR)
- # Relevant commit: https://github.com/ZoneMinder/zoneminder/commit/2fa0fbe448058f2826dadc44572a822af2a177d5
+ # Temporary fix for GCC11 compatibility
+ # Relevant commit: https://github.com/ZoneMinder/zoneminder/commit/a335e740f3b8abcd3085afaa06820074e4f20e95
#
# A fix for the fix: added the '--no-commit' argument to prevent build errors on systems where a git identity
# is not configured (e.g. in Docker or chroot environments) as suggested by @wuestengecko on AUR
- git cherry-pick 2fa0fbe448058f2826dadc44572a822af2a177d5 --no-commit
+ git cherry-pick a335e740f3b8abcd3085afaa06820074e4f20e95 --no-commit
# Download and move extra PHP plugins into place
git submodule update --init --recursive