Add PHP 7.4 patch for Baikal

This commit is contained in:
Martchus 2020-01-31 14:38:06 +01:00
parent 9c5a68e30f
commit 7b0972f346
1 changed files with 7 additions and 3 deletions

View File

@ -3,7 +3,7 @@
pkgname=baikal pkgname=baikal
pkgver=0.6.1 pkgver=0.6.1
pkgrel=1 pkgrel=2
pkgdesc='Lightweight CalDAV+CardDAV server' pkgdesc='Lightweight CalDAV+CardDAV server'
url='http://sabre.io/baikal/' url='http://sabre.io/baikal/'
arch=('any') arch=('any')
@ -12,10 +12,12 @@ depends=('php')
optdepends=('sqlite: Database' 'mariadb: Alternate database' 'php-sqlite: To use the sqlite backend') 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" source=("https://github.com/fruux/Baikal/releases/download/$pkgver/baikal-$pkgver.zip"
'baikal.install' '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' sha1sums=('c971ee72540d85d747caf8bccd8bcfecf3502873'
'deb948e61c3cd8d6ad560321f78c0b288f7a6210' 'deb948e61c3cd8d6ad560321f78c0b288f7a6210'
'39bcef492e415cf305afddd5d7918d861fde7b8a') '39bcef492e415cf305afddd5d7918d861fde7b8a'
'64cd91a8ca19c43fe14ec3f90ceba063fe3311e3')
options=('!strip') options=('!strip')
install=baikal.install install=baikal.install
@ -23,6 +25,8 @@ prepare() {
cd "${srcdir}/baikal" cd "${srcdir}/baikal"
patch -p1 -i "$srcdir/Port-to-PHP-74.patch" patch -p1 -i "$srcdir/Port-to-PHP-74.patch"
pushd 'vendor/sabre/vobject'
patch -p1 -i "$srcdir/Further-PHP-74-fix.patch"
} }
package() { package() {