CVS commit: pkgsrc/x11/py-sip6

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Dec 12 14:14:15 UTC 2023

Modified Files:
        pkgsrc/x11/py-sip6: Makefile distinfo
        pkgsrc/x11/py-sip6/patches: patch-sipbuild_buildable.py

Log Message:
x11/py-sip6: Strengthen needing to test with qgis and annotate patch

The 6.8.0 release was very broken.  It built and packaged, but
generated code that doesn't build.  Thus, it's clear that new sip
releases need to be used to build-test demanding sip users, and so far
the most demanding user seems to be qgis.  This testing appears not to
have been done upstream.  Include a caution about .0 releases of sip,
based on this experience.

Annote a patch as having been sent upstream, and note upstream's
decision to partially merge and partially explain that it is
incorrect.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/py-sip6/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/py-sip6/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/py-sip6/patches/patch-sipbuild_buildable.py

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

Modified files:

Index: pkgsrc/x11/py-sip6/Makefile
diff -u pkgsrc/x11/py-sip6/Makefile:1.12 pkgsrc/x11/py-sip6/Makefile:1.13
--- pkgsrc/x11/py-sip6/Makefile:1.12    Fri Dec  8 15:04:29 2023
+++ pkgsrc/x11/py-sip6/Makefile Tue Dec 12 14:14:15 2023
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.12 2023/12/08 15:04:29 gdt Exp $
+# $NetBSD: Makefile,v 1.13 2023/12/12 14:14:15 gdt Exp $
 
+# Before updating sip, geography/qgis (as the most demanding sip user
+# currently known) must be tested to build ok.  The 6.8.0 release of
+# sip was very broken, and .0 releases of sip should be viewed with
+# extreme caution and probably skipped.
 DISTNAME=      sip-6.8.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/sip/sip6/}
 PKGREVISION=   1
 CATEGORIES=    x11 python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/sip/}
 
-# When updating, please verify that geography/qgis still builds and
-# starts.  (The 6.8.0 release of sip was very broken.)
 
 MAINTAINER=    rhialto%NetBSD.org@localhost
 HOMEPAGE=      https://www.riverbankcomputing.com/software/sip/

Index: pkgsrc/x11/py-sip6/distinfo
diff -u pkgsrc/x11/py-sip6/distinfo:1.10 pkgsrc/x11/py-sip6/distinfo:1.11
--- pkgsrc/x11/py-sip6/distinfo:1.10    Fri Dec  8 15:04:29 2023
+++ pkgsrc/x11/py-sip6/distinfo Tue Dec 12 14:14:15 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2023/12/08 15:04:29 gdt Exp $
+$NetBSD: distinfo,v 1.11 2023/12/12 14:14:15 gdt Exp $
 
 BLAKE2s (sip-6.8.0.tar.gz) = f6c62272c15b96ac07b6267ac7fd6e4e44cc4c4d78697a7641cdbd270395b61c
 SHA512 (sip-6.8.0.tar.gz) = 09e25e3937339b6dbaa0b693bf0b99e5c225751ca79e0a307387c331f2b84e4e5a276897b471a123d24715e5d9cb85e84d244cf07960ff6f53f75859bbb2f901
 Size (sip-6.8.0.tar.gz) = 985563 bytes
-SHA1 (patch-sipbuild_buildable.py) = a914fcd890f5f1228a09f40617e5da0e1ed9830b
+SHA1 (patch-sipbuild_buildable.py) = 0f82fff298a0b4cc90ee6f0d68c62c1c3211bcae
 SHA1 (patch-sipbuild_generator_outputs_code.py) = 176ea3ecf02037cb59a2550c5a2a78be30073e86

Index: pkgsrc/x11/py-sip6/patches/patch-sipbuild_buildable.py
diff -u pkgsrc/x11/py-sip6/patches/patch-sipbuild_buildable.py:1.1 pkgsrc/x11/py-sip6/patches/patch-sipbuild_buildable.py:1.2
--- pkgsrc/x11/py-sip6/patches/patch-sipbuild_buildable.py:1.1  Sun Aug  6 19:18:35 2023
+++ pkgsrc/x11/py-sip6/patches/patch-sipbuild_buildable.py      Tue Dec 12 14:14:15 2023
@@ -1,8 +1,13 @@
-$NetBSD: patch-sipbuild_buildable.py,v 1.1 2023/08/06 19:18:35 adam Exp $
+$NetBSD: patch-sipbuild_buildable.py,v 1.2 2023/12/12 14:14:15 gdt Exp $
 
 Fix for Python < 3.11: importlib.machinery has to be imported directly.
 For consitent PLISTs across platforms, always return .abi3 suffix.
 
+Sent upstream 202312.  Upstream has applied the first hunk.
+Upstream said the that second hunk is wrong; things really do change
+with the limited api.  To be dropped on update to 6.8.1 and we'll have
+to revisit the original problem.
+
 --- sipbuild/buildable.py.orig 2023-08-02 11:50:08.000000000 +0000
 +++ sipbuild/buildable.py
 @@ -21,7 +21,7 @@