On Wed Feb 12, 2020 at 12:16:00PM +0100, Björn Ketelaars wrote:
> Enclosed is another attempt to update devel/py-sip, this time to
> 4.19.18. Previous attempt [0] broke at least py-qt5, and has been
> reverted. Updating to a newer version than 4.19.19 is unfortunately not
> an option as it breaks all kinds of stuff (py-qt5 for example fails to
> build).
>
> Reason for wanting to update py-sip is that git-cola currently segfaults
> on exit. This update fixes it.
>
> I tested this update together with an update of py-qt5 (send in a
> separate mail):
> - Build tested:
> devel/tortoisehg
> geo/qgis
> x11/kde4/py-kde
> x11/py-qt4
> x11/py-qt5
> - Run tested:
> devel/git-cola
> devel/tortoisehg
> geo/qgis
>
> As my track record for this port is poor I think it makes sense to wait
> until I have at least 2 OK's, preferably from heavy hitters.
>
> Comments/OK?
>
> [0] https://marc.info/?l=openbsd-ports&m=158093766318588&w=2
>
>
> diff --git Makefile Makefile
> index c9a03b65cf4..eb8b35bca70 100644
> --- Makefile
> +++ Makefile
> @@ -5,13 +5,13 @@ COMMENT= automatically generate Python bindings for C
> and C++ libs
> # XXX py-sip updates FREQUENTLY break other ports
> # XXX BE ESPECIALLY CAREFUL WHEN TESTING UPDATES!
>
> -MODPY_EGG_VERSION = 4.19.17
> +MODPY_EGG_VERSION = 4.19.18
> EPOCH= 0
After the revert we need a EPOCH bump, otherwise OK rsadowski@ (Please
wait, maybe somebody will raise their hand)
> DISTNAME= sip-${MODPY_EGG_VERSION}
> PKGNAME= py-${DISTNAME}
> CATEGORIES= devel
>
> -HOMEPAGE= https://www.riverbankcomputing.co.uk/software/sip/intro
> +HOMEPAGE= https://www.riverbankcomputing.com/software/sip/intro
>
> # SIP license (Python like)
> PERMIT_PACKAGE= Yes
> diff --git distinfo distinfo
> index 0a2e060db81..d8c32130f79 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (sip-4.19.17.tar.gz) = ErzY9NX+78EFvAddEsUJDueD9zgHKFY8kbi5XQ7EXfM=
> -SIZE (sip-4.19.17.tar.gz) = 1056156
> +SHA256 (sip-4.19.18.tar.gz) = wL2GOADtmxXcrUd8QBfNtz+oBcJZCLAkBWSt101pfh4=
> +SIZE (sip-4.19.18.tar.gz) = 1056840
> diff --git patches/patch-configure_py patches/patch-configure_py
> index 283d332e419..d3b91cc951d 100644
> --- patches/patch-configure_py
> +++ patches/patch-configure_py
> @@ -3,7 +3,7 @@ $OpenBSD: patch-configure_py,v 1.3 2020/02/07 22:10:23 bket
> Exp $
> Index: configure.py
> --- configure.py.orig
> +++ configure.py
> -@@ -269,7 +269,7 @@ def create_config(module, template, macros):
> +@@ -270,7 +270,7 @@ def create_config(module, template, macros):
> "sip_version": sip_version,
> "sip_version_str": sip_version_str,
> "platform": build_platform,
>
