CVS commit: pkgsrc/net/php-baikal

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jan 31 07:38:20 UTC 2023

Modified Files:
        pkgsrc/net/php-baikal: Makefile distinfo
Added Files:
        pkgsrc/net/php-baikal/patches:
            patch-vendor_sabre_dav_lib_CardDAV_Xml_Request_AddressBookMultiGetReport.php

Log Message:
baikal: fix php 8.2 deprecation issue

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/php-baikal/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/php-baikal/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/php-baikal/patches/patch-vendor_sabre_dav_lib_CardDAV_Xml_Request_AddressBookMultiGetReport.php

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/php-baikal/Makefile
diff -u pkgsrc/net/php-baikal/Makefile:1.22 pkgsrc/net/php-baikal/Makefile:1.23
--- pkgsrc/net/php-baikal/Makefile:1.22 Tue Jan  3 12:45:24 2023
+++ pkgsrc/net/php-baikal/Makefile      Tue Jan 31 07:38:20 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2023/01/03 12:45:24 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2023/01/31 07:38:20 wiz Exp $
 
 DISTNAME=      baikal-0.9.3
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fruux/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -81,6 +82,7 @@ do-install:
        ${RM} -f ${WRKSRC}/*/*/*/*/*orig
        cd ${WRKSRC} && pax -rw -pmp * \
                ${DESTDIR}${PREFIX}/${BAIKALDIR}
+       ${RM} ${DESTDIR}${PREFIX}/share/baikal/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php.orig
 
 .include "../../lang/php/json.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/php-baikal/distinfo
diff -u pkgsrc/net/php-baikal/distinfo:1.17 pkgsrc/net/php-baikal/distinfo:1.18
--- pkgsrc/net/php-baikal/distinfo:1.17 Tue Jan  3 12:45:24 2023
+++ pkgsrc/net/php-baikal/distinfo      Tue Jan 31 07:38:20 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.17 2023/01/03 12:45:24 wiz Exp $
+$NetBSD: distinfo,v 1.18 2023/01/31 07:38:20 wiz Exp $
 
 BLAKE2s (baikal-0.9.3.zip) = c6d6de37c7b1a01a396aed288bf01b145ed665a3496310f0741981dff4274912
 SHA512 (baikal-0.9.3.zip) = bdcd3848ba7c99f94a1f20c9fee48f24bb9e004a325f482d6b5324eff1f0aa2fddd284ff5f9ae6dd0b67455852aa82e434174358c58d76b6009945bc3395768c
 Size (baikal-0.9.3.zip) = 2978666 bytes
+SHA1 (patch-vendor_sabre_dav_lib_CardDAV_Xml_Request_AddressBookMultiGetReport.php) = 44dfa0a934ed615a1b3aa68591fbfa58417b07bd

Added files:

Index: pkgsrc/net/php-baikal/patches/patch-vendor_sabre_dav_lib_CardDAV_Xml_Request_AddressBookMultiGetReport.php
diff -u /dev/null pkgsrc/net/php-baikal/patches/patch-vendor_sabre_dav_lib_CardDAV_Xml_Request_AddressBookMultiGetReport.php:1.1
--- /dev/null   Tue Jan 31 07:38:20 2023
+++ pkgsrc/net/php-baikal/patches/patch-vendor_sabre_dav_lib_CardDAV_Xml_Request_AddressBookMultiGetReport.php  Tue Jan 31 07:38:20 2023
@@ -0,0 +1,30 @@
+$NetBSD: patch-vendor_sabre_dav_lib_CardDAV_Xml_Request_AddressBookMultiGetReport.php,v 1.1 2023/01/31 07:38:20 wiz Exp $
+
+Fix deprecation with php 8.2.
+https://github.com/sabre-io/dav/pull/1446
+
+--- vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php.orig        2022-01-20 13:59:29.000000000 +0000
++++ vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php
+@@ -38,7 +38,7 @@ class AddressBookMultiGetReport implemen
+     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
+@@ -54,6 +54,13 @@ class AddressBookMultiGetReport implemen
+     public $version = null;
+ 
+     /**
++     * An array with requested vcard properties.
++     *
++     * @var array
++     */
++    public $addressDataProperties;
++
++    /**
+      * The deserialize method is called during xml parsing.
+      *
+      * This method is called statically, this is because in theory this method