diff options
| author | hauke <hauke@pkgsrc.org> | 2022-09-15 12:59:15 +0000 |
|---|---|---|
| committer | hauke <hauke@pkgsrc.org> | 2022-09-15 12:59:15 +0000 |
| commit | 193ece1ba48cde9846c40c5b3c8f0470458ed42f (patch) | |
| tree | ae549c280c76123a529e06f1ba35be63f27d397f | |
| parent | 6c9e8715cb2eec29ac7605bce7bffbd19e074147 (diff) | |
| download | pkgsrc-193ece1ba48cde9846c40c5b3c8f0470458ed42f.tar.gz | |
Newer PHP versions (8.1 here) want global variables imported to
functions explicitly.
The patch fixes
<https://gitlab.com/davical-project/davical/-/issues/271>.
| -rw-r--r-- | www/davical/Makefile | 4 | ||||
| -rw-r--r-- | www/davical/distinfo | 3 | ||||
| -rw-r--r-- | www/davical/patches/patch-inc_ui_principal-edit.php | 15 |
3 files changed, 19 insertions, 3 deletions
diff --git a/www/davical/Makefile b/www/davical/Makefile index 7d1b5a4a90c..3fbd74378a7 100644 --- a/www/davical/Makefile +++ b/www/davical/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.50 2022/06/28 11:37:03 wiz Exp $ +# $NetBSD: Makefile,v 1.51 2022/09/15 12:59:15 hauke Exp $ DAVICAL_VERSION= 1.1.10 DISTNAME= davical-${DAVICAL_VERSION} PKGNAME= ${PHP_PKG_PREFIX}-davical-${DAVICAL_VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= www # Remove DIST_SUBDIR on next update! DIST_SUBDIR= davical-${DAVICAL_VERSION} diff --git a/www/davical/distinfo b/www/davical/distinfo index 5b26acbb960..6e515207a75 100644 --- a/www/davical/distinfo +++ b/www/davical/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2022/06/27 06:50:07 nia Exp $ +$NetBSD: distinfo,v 1.23 2022/09/15 12:59:15 hauke Exp $ BLAKE2s (davical-1.1.10/davical-1.1.10.tar.gz) = 160dcd270bb2c87c26dd3662f748caeec2f48d95124ff53ea87fc0637e1bd8dc SHA512 (davical-1.1.10/davical-1.1.10.tar.gz) = c46b75c2a9605ebb9db801b4cc28b4ea340992b0e59e8b2598e93ac22e64aacbed9da2e0485bc1c01291e03f444ed4c03095674570c66a4cc8939903f40e7bd4 @@ -8,3 +8,4 @@ SHA1 (patch-ab) = 7ae06c595f54d3a959db481d303978b29ebbd899 SHA1 (patch-ac) = 357abb2ad470121f3f30d19a4602692c77661872 SHA1 (patch-ad) = ecbac45e18ed6cea2915caadfb4dca1a2ce32667 SHA1 (patch-ae) = cb753f0490ef3e5c5d8ff67b8d0aec7c4fe7d384 +SHA1 (patch-inc_ui_principal-edit.php) = 57d69d52d036d942f043299dd9f66ea8ab40bf96 diff --git a/www/davical/patches/patch-inc_ui_principal-edit.php b/www/davical/patches/patch-inc_ui_principal-edit.php new file mode 100644 index 00000000000..31f1b51d2f4 --- /dev/null +++ b/www/davical/patches/patch-inc_ui_principal-edit.php @@ -0,0 +1,15 @@ +$NetBSD: patch-inc_ui_principal-edit.php,v 1.1 2022/09/15 12:59:16 hauke Exp $ + +PHP 8.1 mandates globals be declared. +Fixes <https://gitlab.com/davical-project/davical/-/issues/271> + +--- inc/ui/principal-edit.php.orig 2021-03-01 13:24:48.000000000 +0000 ++++ inc/ui/principal-edit.php +@@ -180,6 +180,7 @@ function handle_subaction( $subaction ) + + function principal_editor() { + global $c, $id, $can_write_principal, $session; ++ global $privilege_names; + $editor = new Editor(translate('Principal'), 'dav_principal'); + + $editor->SetLookup( 'date_format_type', "SELECT 'E', 'European' UNION SELECT 'U', 'US Format' UNION SELECT 'I', 'ISO Format'" ); |