pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/geography/qgis qgis: update to 3.28.1nb1.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f39cd54e1cde
branches:  trunk
changeset: 389238:f39cd54e1cde
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Dec 02 15:44:27 2022 +0000

description:
qgis: update to 3.28.1nb1.

Switch to sip6, latest py-qt5*.

This adds support for python 3.11.

diffstat:

 geography/qgis/Makefile |  15 ++++++++-------
 geography/qgis/distinfo |   2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diffs (67 lines):

diff -r f6f618849db9 -r f39cd54e1cde geography/qgis/Makefile
--- a/geography/qgis/Makefile   Fri Dec 02 15:42:38 2022 +0000
+++ b/geography/qgis/Makefile   Fri Dec 02 15:44:27 2022 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.160 2022/11/30 21:12:28 gdt Exp $
+# $NetBSD: Makefile,v 1.161 2022/12/02 15:44:27 wiz Exp $
 
 # This is intentionally 3.28 Long Term Release.  Please do not update
 # to later branches, and instead discuss whether/how we want multiple
 # versions.
 DISTNAME=      qgis-3.28.1
+PKGREVISION=   1
 CATEGORIES=    geography
 MASTER_SITES=  https://qgis.org/downloads/
 EXTRACT_SUFX=  .tar.bz2
@@ -30,6 +31,11 @@
 PLIST_SRC=             PLIST
 
 DEPENDS+=              qca2-qt5-ossl-[0-9]*:../../security/qca2-qt5-ossl
+TOOL_DEPENDS+=         ${PYPKGPREFIX}-sip6-[0-9]*:../../x11/py-sip6
+TOOL_DEPENDS+=         ${PYPKGPREFIX}-qt-builder-[0-9]*:../../x11/py-qt-builder
+DEPENDS+=              ${PYPKGPREFIX}-qt5-[0-9]*:../../x11/py-qt5
+DEPENDS+=              ${PYPKGPREFIX}-qt5-qscintilla-[0-9]*:../../x11/py-qt5-qscintilla
+
 # This is needed to find qca2.
 CMAKE_PREFIX_PATH+=    ${QTDIR}
 
@@ -57,12 +63,9 @@
 SUBST_SED.pyqt+=               -e '/ *FIND_PROGRAM(__pyuic5 /s,"pyuic5,&-${PYVERSSUFFIX},'
 
 CMAKE_ARGS+=           -DWITH_BINDINGS:BOOL=TRUE
-CMAKE_ARGS+=           -DSIP_BINARY_PATH:PATH=${BUILDLINK_PREFIX.py-sip}/bin
 CMAKE_ARGS+=           -DWITH_INTERNAL_MARKUPSAFE=FALSE
 
-.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
@@ -85,6 +88,7 @@
 pre-configure:
        ${MKDIR} ${WRKSRC}/build
 
+.include "../../lang/python/pyversion.mk"
 .include "../../archivers/libzip/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
 ##.include "../../devel/qjson/buildlink3.mk"
@@ -103,9 +107,6 @@
 .include "../../geography/spatialindex/buildlink3.mk"
 .include "../../security/qca2-qt5/buildlink3.mk"
 .include "../../security/qt5-qtkeychain/buildlink3.mk"
-.include "../../x11/py-sip/buildlink3.mk"
-.include "../../x11/py-qt5/buildlink3.mk"
-.include "../../x11/py-qt5-qscintilla/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../x11/qwt6-qt5/buildlink3.mk"
diff -r f6f618849db9 -r f39cd54e1cde geography/qgis/distinfo
--- a/geography/qgis/distinfo   Fri Dec 02 15:42:38 2022 +0000
+++ b/geography/qgis/distinfo   Fri Dec 02 15:44:27 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2022/11/30 19:40:12 wiz Exp $
+$NetBSD: distinfo,v 1.48 2022/12/02 15:44:27 wiz Exp $
 
 BLAKE2s (qgis-3.28.1.tar.bz2) = 9ad72cb4a2f66403b6326c027c39c05a365379c58ae56f3401558ef9842dcba6
 SHA512 (qgis-3.28.1.tar.bz2) = f10e67b24abe9881ad447495d144a92ad7aa8f5b826606ce6407f65261ef4521e8b7d2e257079cb11247cdd991afbdf6e49e772649e2d1f5827ceff190caa514



Home | Main Index | Thread Index | Old Index