Add PHP 7.4 patch

2 files changed, 10 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8343484b882d..5999e9731084 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = baikal
 	pkgdesc = Lightweight CalDAV+CardDAV server
 	pkgver = 0.6.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://sabre.io/baikal/
 	install = baikal.install
 	arch = any
@@ -14,9 +14,11 @@ pkgbase = baikal
 	source = https://github.com/fruux/Baikal/releases/download/0.6.1/baikal-0.6.1.zip
 	source = baikal.install
 	source = Port-to-PHP-74.patch::https://patch-diff.githubusercontent.com/raw/sabre-io/Baikal/pull/852.patch
+	source = Further-PHP-74-fix.patch::https://github.com/sabre-io/vobject/commit/40b98311c115f511891337231d592f2a0dae4d15.patch
 	sha1sums = c971ee72540d85d747caf8bccd8bcfecf3502873
 	sha1sums = deb948e61c3cd8d6ad560321f78c0b288f7a6210
 	sha1sums = 39bcef492e415cf305afddd5d7918d861fde7b8a
+	sha1sums = 64cd91a8ca19c43fe14ec3f90ceba063fe3311e3
 
 pkgname = baikal
 
diff --git a/PKGBUILD b/PKGBUILD
index 2f82dff76671..cb3c0f30365b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=baikal
 pkgver=0.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight CalDAV+CardDAV server'
 url='http://sabre.io/baikal/'
 arch=('any')
@@ -12,10 +12,12 @@ depends=('php')
 optdepends=('sqlite: Database' 'mariadb: Alternate database' 'php-sqlite: To use the sqlite backend')
 source=("https://github.com/fruux/Baikal/releases/download/$pkgver/baikal-$pkgver.zip"
         'baikal.install'
-        'Port-to-PHP-74.patch::https://patch-diff.githubusercontent.com/raw/sabre-io/Baikal/pull/852.patch')
+        'Port-to-PHP-74.patch::https://patch-diff.githubusercontent.com/raw/sabre-io/Baikal/pull/852.patch'
+        'Further-PHP-74-fix.patch::https://github.com/sabre-io/vobject/commit/40b98311c115f511891337231d592f2a0dae4d15.patch')
 sha1sums=('c971ee72540d85d747caf8bccd8bcfecf3502873'
           'deb948e61c3cd8d6ad560321f78c0b288f7a6210'
-          '39bcef492e415cf305afddd5d7918d861fde7b8a')
+          '39bcef492e415cf305afddd5d7918d861fde7b8a'
+          '64cd91a8ca19c43fe14ec3f90ceba063fe3311e3')
 options=('!strip')
 install=baikal.install
 
@@ -23,6 +25,8 @@ prepare() {
   cd "${srcdir}/baikal"
 
   patch -p1 -i "$srcdir/Port-to-PHP-74.patch"
+  pushd 'vendor/sabre/vobject'
+  patch -p1 -i "$srcdir/Further-PHP-74-fix.patch"
 }
 
 package() {