Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2399E84EEA for ; Fri, 8 Dec 2023 15:04:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 43CpHmP5Iw4E for ; Fri, 8 Dec 2023 15:04:29 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 797F884CED for ; Fri, 8 Dec 2023 15:04:29 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6D394FA42; Fri, 8 Dec 2023 15:04:29 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_170204786929450" MIME-Version: 1.0 Date: Fri, 8 Dec 2023 15:04:29 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/x11/py-sip6 To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20231208150429.6D394FA42@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_170204786929450 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Fri Dec 8 15:04:29 UTC 2023 Modified Files: pkgsrc/x11/py-sip6: Makefile distinfo Added Files: pkgsrc/x11/py-sip6/patches: patch-sipbuild_generator_outputs_code.py Log Message: x11/py-sip6: Apply upstream fix for bug that breaks everything The 6.8.0 was defective and caused many, if not almost all, uses of sip to break. E.g. https://github.com/qgis/QGIS/issues/55481 Cherry-pick upstream change from 30 November, because for reasons I do not understand there isn't a fixed point release. Add a note that updates should be build tested with qgis, as upstream's QA is clearly not good enough to assume that will be ok. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/py-sip6/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/py-sip6/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/x11/py-sip6/patches/patch-sipbuild_generator_outputs_code.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_170204786929450 Content-Disposition: inline Content-Length: 2807 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/py-sip6/Makefile diff -u pkgsrc/x11/py-sip6/Makefile:1.11 pkgsrc/x11/py-sip6/Makefile:1.12 --- pkgsrc/x11/py-sip6/Makefile:1.11 Fri Dec 1 13:28:40 2023 +++ pkgsrc/x11/py-sip6/Makefile Fri Dec 8 15:04:29 2023 @@ -1,10 +1,14 @@ -# $NetBSD: Makefile,v 1.11 2023/12/01 13:28:40 adam Exp $ +# $NetBSD: Makefile,v 1.12 2023/12/08 15:04:29 gdt Exp $ 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 HOMEPAGE= https://www.riverbankcomputing.com/software/sip/ COMMENT= Tool to create Python bindings for C++ libraries Index: pkgsrc/x11/py-sip6/distinfo diff -u pkgsrc/x11/py-sip6/distinfo:1.9 pkgsrc/x11/py-sip6/distinfo:1.10 --- pkgsrc/x11/py-sip6/distinfo:1.9 Fri Dec 1 13:28:40 2023 +++ pkgsrc/x11/py-sip6/distinfo Fri Dec 8 15:04:29 2023 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.9 2023/12/01 13:28:40 adam Exp $ +$NetBSD: distinfo,v 1.10 2023/12/08 15:04:29 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_generator_outputs_code.py) = 176ea3ecf02037cb59a2550c5a2a78be30073e86 Added files: Index: pkgsrc/x11/py-sip6/patches/patch-sipbuild_generator_outputs_code.py diff -u /dev/null pkgsrc/x11/py-sip6/patches/patch-sipbuild_generator_outputs_code.py:1.1 --- /dev/null Fri Dec 8 15:04:29 2023 +++ pkgsrc/x11/py-sip6/patches/patch-sipbuild_generator_outputs_code.py Fri Dec 8 15:04:29 2023 @@ -0,0 +1,18 @@ +$NetBSD: patch-sipbuild_generator_outputs_code.py,v 1.1 2023/12/08 15:04:29 gdt Exp $ + +Cherry-pick upstream fix for egregious typo in 6.8.0, which causes +pretty much everything to break. (Should be fixed in 6.8.1.) + +https://www.riverbankcomputing.com/hg/sip/rev/67e0294b505c + +--- sipbuild/generator/outputs/code.py.orig 2023-12-08 14:48:11.909538594 +0000 ++++ sipbuild/generator/outputs/code.py +@@ -8408,7 +8408,7 @@ def _class_docstring(sf, spec, bindings, + else: + is_first = True + +- if klass.docstring is None or klass.docstring.signature is not SocstringSignature.DISCARDED: ++ if klass.docstring is None or klass.docstring.signature is not DocstringSignature.DISCARDED: + for ctor in klass.ctors: + if ctor.access_specifier is AccessSpecifier.PRIVATE: + continue --_----------=_170204786929450--