CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Fri, 25 Nov 2022 13:31:35 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Nov 25 13:31:35 UTC 2022

Modified Files:
        pkgsrc/devel/py-tortoisehg: Makefile
        pkgsrc/geography/qgis: Makefile
        pkgsrc/graphics/veusz: Makefile
        pkgsrc/x11/py-qt5: Makefile
        pkgsrc/x11/py-qt5-qscintilla: Makefile
        pkgsrc/x11/py-qt5-webengine: Makefile
        pkgsrc/x11/py-qwt-qt5: Makefile
        pkgsrc/x11/py-sip: Makefile.common

Log Message:
*: mark py-sip and its users as not supporting Python 3.11

Consider switching to py-sip5 (or (unpackaged) py-sip6)


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/devel/py-tortoisehg/Makefile
cvs rdiff -u -r1.156 -r1.157 pkgsrc/geography/qgis/Makefile
cvs rdiff -u -r1.75 -r1.76 pkgsrc/graphics/veusz/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/x11/py-qt5/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/py-qt5-qscintilla/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/py-qt5-webengine/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/py-qwt-qt5/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/py-sip/Makefile.common

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

Modified files:

Index: pkgsrc/devel/py-tortoisehg/Makefile
diff -u pkgsrc/devel/py-tortoisehg/Makefile:1.88 pkgsrc/devel/py-tortoisehg/Makefile:1.89
--- pkgsrc/devel/py-tortoisehg/Makefile:1.88    Wed Nov 23 16:19:53 2022
+++ pkgsrc/devel/py-tortoisehg/Makefile Fri Nov 25 13:31:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2022/11/23 16:19:53 adam Exp $
+# $NetBSD: Makefile,v 1.89 2022/11/25 13:31:34 wiz Exp $
 
 DISTNAME=              tortoisehg-6.2.3
 PKGNAME=               ${PYPKGPREFIX}-${DISTNAME}
@@ -33,6 +33,7 @@ INSTALLATION_DIRS+=   share/doc/tortoisehg
 PYTHON_SELF_CONFLICT=  yes
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_VERSIONS_INCOMPATIBLE+= 311 # py-sip via py-qt5-qscintilla
 
 pre-build:
        ${RUN} cd ${WRKSRC}/doc && ${MAKE_PROGRAM} SPHINXBUILD=sphinx-build-${PYVERSSUFFIX} html

Index: pkgsrc/geography/qgis/Makefile
diff -u pkgsrc/geography/qgis/Makefile:1.156 pkgsrc/geography/qgis/Makefile:1.157
--- pkgsrc/geography/qgis/Makefile:1.156        Wed Nov 23 00:57:21 2022
+++ pkgsrc/geography/qgis/Makefile      Fri Nov 25 13:31:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.156 2022/11/23 00:57:21 gdt Exp $
+# $NetBSD: Makefile,v 1.157 2022/11/25 13:31:34 wiz Exp $
 
 # This is intentionally 3.22 Long Term Release.  Please do not update
 # to later branches, and instead discuss whether/how we want multiple
@@ -63,6 +63,7 @@ CMAKE_ARGS+=          -DWITH_INTERNAL_MARKUPSAFE
 
 .include "../../lang/python/application.mk"
 PYTHON_VERSIONS_INCOMPATIBLE=  27 37 # py-gdal
+PYTHON_VERSIONS_INCOMPATIBLE+= 311 # py-sip
 
 DEPENDS+=      ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
 DEPENDS+=      ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2

Index: pkgsrc/graphics/veusz/Makefile
diff -u pkgsrc/graphics/veusz/Makefile:1.75 pkgsrc/graphics/veusz/Makefile:1.76
--- pkgsrc/graphics/veusz/Makefile:1.75 Wed Nov 23 16:20:23 2022
+++ pkgsrc/graphics/veusz/Makefile      Fri Nov 25 13:31:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2022/11/23 16:20:23 adam Exp $
+# $NetBSD: Makefile,v 1.76 2022/11/25 13:31:34 wiz Exp $
 
 DISTNAME=              veusz-3.1
 PKGREVISION=           15
@@ -29,6 +29,8 @@ INSTALLATION_DIRS+=   share/mime/packages
 ALL_ENV+=              QMAKE_EXE=${QTDIR}/bin/qmake
 ALL_ENV+=              SIP_DIR=${PREFIX}/share/sip${PYVERSSUFFIX}
 
+PYTHON_VERSIONS_INCOMPATIBLE+= 311 # py-sip
+
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/support/veusz.desktop \
                ${DESTDIR}${PREFIX}/share/applications

Index: pkgsrc/x11/py-qt5/Makefile
diff -u pkgsrc/x11/py-qt5/Makefile:1.76 pkgsrc/x11/py-qt5/Makefile:1.77
--- pkgsrc/x11/py-qt5/Makefile:1.76     Wed Nov 23 16:21:26 2022
+++ pkgsrc/x11/py-qt5/Makefile  Fri Nov 25 13:31:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2022/11/23 16:21:26 adam Exp $
+# $NetBSD: Makefile,v 1.77 2022/11/25 13:31:35 wiz Exp $
 
 DISTNAME=      PyQt5-5.15.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/PyQt5/qt5/}
@@ -11,6 +11,8 @@ COMMENT=      Python binding for Qt5
 HOMEPAGE=      https://www.riverbankcomputing.com/software/pyqt/intro
 LICENSE=       gnu-gpl-v3
 
+PYTHON_VERSIONS_INCOMPATIBLE+= 311 # py-sip
+
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
 DEPENDS+=      ${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34

Index: pkgsrc/x11/py-qt5-qscintilla/Makefile
diff -u pkgsrc/x11/py-qt5-qscintilla/Makefile:1.15 pkgsrc/x11/py-qt5-qscintilla/Makefile:1.16
--- pkgsrc/x11/py-qt5-qscintilla/Makefile:1.15  Wed Nov 23 16:19:12 2022
+++ pkgsrc/x11/py-qt5-qscintilla/Makefile       Fri Nov 25 13:31:34 2022
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2022/11/23 16:19:12 adam Exp $
+# $NetBSD: Makefile,v 1.16 2022/11/25 13:31:34 wiz Exp $
+
+PKGREVISION=   6
+
+PYTHON_VERSIONS_INCOMPATIBLE+= 311 # py-sip
 
-PKGREVISION= 6
 .include "../../x11/qt5-qscintilla/Makefile.common"
 
 PKGNAME=       ${PYPKGPREFIX}-qt5-${DISTNAME:tl}

Index: pkgsrc/x11/py-qt5-webengine/Makefile
diff -u pkgsrc/x11/py-qt5-webengine/Makefile:1.4 pkgsrc/x11/py-qt5-webengine/Makefile:1.5
--- pkgsrc/x11/py-qt5-webengine/Makefile:1.4    Wed Nov 23 16:21:27 2022
+++ pkgsrc/x11/py-qt5-webengine/Makefile        Fri Nov 25 13:31:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/11/23 16:21:27 adam Exp $
+# $NetBSD: Makefile,v 1.5 2022/11/25 13:31:35 wiz Exp $
 
 DISTNAME=      PyQtWebEngine-${PKGVERSION_NOREV}
 PKGNAME=       ${PYPKGPREFIX}-qt5-webengine-5.15.5
@@ -13,6 +13,8 @@ LICENSE=      gnu-gpl-v3
 
 DEPENDS+=      ${PYPKGPREFIX}-qt5-[0-9]*:../../x11/py-qt5
 
+PYTHON_VERSIONS_INCOMPATIBLE+= 311 # py-sip
+
 .include "../../lang/python/pyversion.mk"
 
 USE_LANGUAGES= c c++

Index: pkgsrc/x11/py-qwt-qt5/Makefile
diff -u pkgsrc/x11/py-qwt-qt5/Makefile:1.8 pkgsrc/x11/py-qwt-qt5/Makefile:1.9
--- pkgsrc/x11/py-qwt-qt5/Makefile:1.8  Wed Nov 23 16:21:27 2022
+++ pkgsrc/x11/py-qwt-qt5/Makefile      Fri Nov 25 13:31:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2022/11/23 16:21:27 adam Exp $
+# $NetBSD: Makefile,v 1.9 2022/11/25 13:31:35 wiz Exp $
 
 VERSION=       1.02.02
 DISTNAME=      pyqt-qwt-${VERSION}
@@ -24,6 +24,8 @@ USE_LANGUAGES=        c++
 
 PY_PATCHPLIST= yes
 
+PYTHON_VERSIONS_INCOMPATIBLE+= 311 # py-sip
+
 do-configure:
        set -e; cd ${WRKSRC};                                           \
          ${PKGSRC_SETENV} ${CONFIGURE_ENV}                             \

Index: pkgsrc/x11/py-sip/Makefile.common
diff -u pkgsrc/x11/py-sip/Makefile.common:1.12 pkgsrc/x11/py-sip/Makefile.common:1.13
--- pkgsrc/x11/py-sip/Makefile.common:1.12      Tue Nov 15 09:18:20 2022
+++ pkgsrc/x11/py-sip/Makefile.common   Fri Nov 25 13:31:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2022/11/15 09:18:20 wiz Exp $
+# $NetBSD: Makefile.common,v 1.13 2022/11/25 13:31:35 wiz Exp $
 #
 # used by x11/py-sip/Makefile
 # used by x11/py-sip-qt5/Makefile
@@ -32,6 +32,7 @@ CONFIGURE_ARGS+=      LIBDIR=${PREFIX}/lib
 CONFIGURE_ARGS.DragonFly+=     -p freebsd-g++
 
 PY_PATCHPLIST=         yes
+PYTHON_VERSIONS_INCOMPATIBLE+= 311 # as of 4.19.25
 
 .include "../../mk/compiler.mk"

Follow-Ups:
- Re: CVS commit: pkgsrc
  - From: Greg Troxel

Prev by Date: CVS commit: pkgsrc/devel/py-protobuf
Next by Date: CVS commit: pkgsrc/textproc/py-xlsxwriter
Previous by Thread: CVS commit: pkgsrc/devel/py-protobuf
Next by Thread: Re: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index