From 5619b89c8fda7247679b1c858a2242d51d7e7b3c Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 16 Nov 2023 11:04:18 +0100 Subject: [PATCH] Update baikal to 0.9.4 --- ...bb8969c8712e108bd6a721114cc199bb684c.patch | 39 ------------------- baikal/default/PKGBUILD | 9 ++--- 2 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 baikal/default/906bbb8969c8712e108bd6a721114cc199bb684c.patch diff --git a/baikal/default/906bbb8969c8712e108bd6a721114cc199bb684c.patch b/baikal/default/906bbb8969c8712e108bd6a721114cc199bb684c.patch deleted file mode 100644 index 827c7f4f..00000000 --- a/baikal/default/906bbb8969c8712e108bd6a721114cc199bb684c.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 906bbb8969c8712e108bd6a721114cc199bb684c Mon Sep 17 00:00:00 2001 -From: Phil Davis -Date: Mon, 30 Jan 2023 12:39:44 +0545 -Subject: [PATCH] declare addressDataProperties to avoid PHP 8.2 deprecation - notice - ---- - lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php | 9 ++++++++- - ...ultiGetTest.php => AddressBookMultiGetReportTest.php} | 6 +++--- - 2 files changed, 11 insertions(+), 4 deletions(-) - rename tests/Sabre/CardDAV/Xml/Request/{AddressBookMultiGetTest.php => AddressBookMultiGetReportTest.php} (93%) - -diff --git a/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php b/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php -index c11d2dd736..491f969088 100644 ---- a/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php -+++ b/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php -@@ -38,7 +38,7 @@ class AddressBookMultiGetReport implements XmlDeserializable - public $hrefs; - - /** -- * The mimetype of the content that should be returend. Usually -+ * The mimetype of the content that should be returned. Usually - * text/vcard. - * - * @var string -@@ -53,6 +53,13 @@ class AddressBookMultiGetReport implements XmlDeserializable - */ - public $version = null; - -+ /** -+ * An array with requested vcard properties. -+ * -+ * @var array -+ */ -+ public $addressDataProperties; -+ - /** - * The deserialize method is called during xml parsing. - * diff --git a/baikal/default/PKGBUILD b/baikal/default/PKGBUILD index 7b011c6b..8cba6301 100644 --- a/baikal/default/PKGBUILD +++ b/baikal/default/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Florian Bruhin (The Compiler) pkgname=baikal -pkgver=0.9.3 -pkgrel=2 +pkgver=0.9.4 +pkgrel=1 pkgdesc='Lightweight CalDAV+CardDAV server' url='http://sabre.io/baikal/' arch=('any') @@ -11,17 +11,14 @@ license=('GPL') 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" - "906bbb8969c8712e108bd6a721114cc199bb684c.patch" 'baikal.install') -sha512sums=('bdcd3848ba7c99f94a1f20c9fee48f24bb9e004a325f482d6b5324eff1f0aa2fddd284ff5f9ae6dd0b67455852aa82e434174358c58d76b6009945bc3395768c' - 'bad0002fe73330b0991dc448dc59fcf4257c7c1bfacaa0042ea552ea0fe316e6bf157afed75df7361e707c9bfa258135d8b01dad273adceac0127cb44d4f84d0' +sha512sums=('dd4b66d93e6d2d957db9fd53e9e27d1e1a7c8ea842ed330d0590280c57fcaa7882eea2cf612dcaaad79325605739ecc3adf5013299c95db805310e25a31db57c' '4e28980100ce9fc820a6c40a9cd528a90d62997ac18fb4ea353d8eaba58b320f9c653ba9b066036ff598f1d5a0aafb49ba444f9187c0d3616cbe6fa45222ca3f') options=('!strip') install=baikal.install prepare() { cd "${srcdir}/baikal/vendor/sabre/dav" - patch -p1 -i ../../../../906bbb8969c8712e108bd6a721114cc199bb684c.patch } package() {