CVS commit: pkgsrc/www/py-hyperkitty

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Wed Oct  7 19:37:03 UTC 2026

Modified Files:
        pkgsrc/www/py-hyperkitty: Makefile distinfo
Added Files:
        pkgsrc/www/py-hyperkitty/patches: patch-hyperkitty_forms.py
            patch-pyproject.toml

Log Message:
py-hyperkitty: bump the highest version of django claimed to be supported.
also fix issue with tag widget rendering properly with Django 5.2


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/py-hyperkitty/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/py-hyperkitty/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/py-hyperkitty/patches/patch-hyperkitty_forms.py \
    pkgsrc/www/py-hyperkitty/patches/patch-pyproject.toml

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

Modified files:

Index: pkgsrc/www/py-hyperkitty/Makefile
diff -u pkgsrc/www/py-hyperkitty/Makefile:1.11 pkgsrc/www/py-hyperkitty/Makefile:1.12
--- pkgsrc/www/py-hyperkitty/Makefile:1.11      Thu Oct  9 08:02:00 2025
+++ pkgsrc/www/py-hyperkitty/Makefile   Wed Oct  7 19:37:03 2026
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2025/10/09 08:02:00 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2026/10/07 19:37:03 markd Exp $
 
 DISTNAME=      hyperkitty-1.3.12
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
+PKGREVISION=   1
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=h/hyperkitty/}
 
@@ -38,6 +39,7 @@ REPLACE_PYTHON=       hyperkitty/contrib/clean
 
 post-install:
        ${RM} -rf ${DESTDIR}${PREFIX}/${PYSITELIB}/example_project
+       ${RM} -rf ${DESTDIR}${PREFIX}/${PYSITELIB}/hyperkitty/forms.py.orig
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/wheel.mk"

Index: pkgsrc/www/py-hyperkitty/distinfo
diff -u pkgsrc/www/py-hyperkitty/distinfo:1.4 pkgsrc/www/py-hyperkitty/distinfo:1.5
--- pkgsrc/www/py-hyperkitty/distinfo:1.4       Wed Jun  4 11:11:02 2025
+++ pkgsrc/www/py-hyperkitty/distinfo   Wed Oct  7 19:37:03 2026
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.4 2025/06/04 11:11:02 markd Exp $
+$NetBSD: distinfo,v 1.5 2026/10/07 19:37:03 markd Exp $
 
 BLAKE2s (hyperkitty-1.3.12.tar.gz) = bed1af19ba0487870d538b0d196c3b24043fc4dc6cd841fe42da0ad52ba64bc7
 SHA512 (hyperkitty-1.3.12.tar.gz) = 778c77ee52fda775b0acba99654a1023b38fc5a9815c23454759cdf45e6e8cfda1f026f854972f4ffaa09749f341822e9ecd07619cceea842572b90b88e583d1
 Size (hyperkitty-1.3.12.tar.gz) = 2231630 bytes
+SHA1 (patch-hyperkitty_forms.py) = bbd7ee2c00beb57b01089a802a33f69541dcbebf
+SHA1 (patch-pyproject.toml) = 148a828b5620bb375b807ac609999470deb32baf

Added files:

Index: pkgsrc/www/py-hyperkitty/patches/patch-hyperkitty_forms.py
diff -u /dev/null pkgsrc/www/py-hyperkitty/patches/patch-hyperkitty_forms.py:1.1
--- /dev/null   Wed Oct  7 19:37:03 2026
+++ pkgsrc/www/py-hyperkitty/patches/patch-hyperkitty_forms.py  Wed Oct  7 19:37:03 2026
@@ -0,0 +1,34 @@
+$NetBSD: patch-hyperkitty_forms.py,v 1.1 2026/10/07 19:37:03 markd Exp $
+
+Add tag widget now renders properly with Django 5.2.
+https://gitlab.com/mailman/hyperkitty/-/commit/02a3ca5316431bc43fc6ed3fd30d297dfa3f1316
+
+--- hyperkitty/forms.py.orig   2023-10-21 17:37:44.353938000 +0000
++++ hyperkitty/forms.py
+@@ -21,6 +21,7 @@
+ #
+ 
+ from django import forms
++from django.utils.html import format_html
+ from django.utils.safestring import mark_safe
+ from django.utils.translation import gettext_lazy as _
+ 
+@@ -37,13 +38,12 @@ class TextInputWithButton(forms.TextInpu
+         button_text = self.attrs.pop("button_text", "")
+         initial_rendering = forms.TextInput.render(
+                 self, name, value, attrs, renderer=renderer)
+-        button = mark_safe(
++        return format_html(
++            '<span class="input-append"><div class="input-group">{}'
+             '<span class="input-group-btn"><button type="submit" '
+-            'class="btn btn-outline-primary">%s</button></span>'
+-            % button_text)
+-        return "".join([
+-            '<span class="input-append"><div class="input-group">',
+-            initial_rendering, button, '</div></span>'])
++            'class="btn btn-outline-primary">{}</button></span>'
++            '</div></span>',
++            initial_rendering, button_text)
+ 
+ 
+ class AddTagForm(forms.Form):
Index: pkgsrc/www/py-hyperkitty/patches/patch-pyproject.toml
diff -u /dev/null pkgsrc/www/py-hyperkitty/patches/patch-pyproject.toml:1.1
--- /dev/null   Wed Oct  7 19:37:03 2026
+++ pkgsrc/www/py-hyperkitty/patches/patch-pyproject.toml       Wed Oct  7 19:37:03 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-pyproject.toml,v 1.1 2026/10/07 19:37:03 markd Exp $
+
+Bump django top end to 5.3 as per
+https://gitlab.com/mailman/hyperkitty/-/commit/b8b7536c2cb7380ec55ed62140617cff8ae36b1d
+
+--- pyproject.toml.orig        2024-09-21 07:42:09.431132800 +0000
++++ pyproject.toml
+@@ -23,7 +23,7 @@ dependencies = [
+     "django-gravatar2>=1.0.6",
+     "django-haystack>=2.8.0",
+     "django-q2>=1.0.0",
+-    "django>=4.2,<5.1",
++    "django>=4.2,<5.3",
+     "django_mailman3>=1.3.13",
+     "djangorestframework>=3.0.0",
+     "flufl.lock>=4.0",