Skip to content

Commit

Permalink
x11/py-sip6: Apply upstream fix for bug that breaks everything
Browse files Browse the repository at this point in the history
The 6.8.0 was defective and caused many, if not almost all, uses of
sip to break.  E.g.  qgis/QGIS#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.
  • Loading branch information
gdt committed Dec 8, 2023
1 parent b8b6a4f commit d95397c
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 2 deletions.
6 changes: 5 additions & 1 deletion x11/py-sip6/Makefile
Original file line number Diff line number Diff line change
@@ -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= [email protected]
HOMEPAGE= https://www.riverbankcomputing.com/software/sip/
COMMENT= Tool to create Python bindings for C++ libraries
Expand Down
3 changes: 2 additions & 1 deletion x11/py-sip6/distinfo
Original file line number Diff line number Diff line change
@@ -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
18 changes: 18 additions & 0 deletions x11/py-sip6/patches/patch-sipbuild_generator_outputs_code.py
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit d95397c

Please sign in to comment.