Fri Dec 2 15:44:27 2022 UTC ()
qgis: update to 3.28.1nb1.

Switch to sip6, latest py-qt5*.

This adds support for python 3.11.


(wiz)
diff -r1.160 -r1.161 pkgsrc/geography/qgis/Makefile
diff -r1.47 -r1.48 pkgsrc/geography/qgis/distinfo
cvs diff -r1.160 -r1.161 pkgsrc/geography/qgis/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/qgis/Makefile 2022/11/30 21:12:28 1.160
+++ pkgsrc/geography/qgis/Makefile 2022/12/02 15:44:27 1.161
@@ -1,45 +1,51 @@ @@ -1,45 +1,51 @@
1# $NetBSD: Makefile,v 1.160 2022/11/30 21:12:28 gdt Exp $ 1# $NetBSD: Makefile,v 1.161 2022/12/02 15:44:27 wiz Exp $
2 2
3# This is intentionally 3.28 Long Term Release. Please do not update 3# This is intentionally 3.28 Long Term Release. Please do not update
4# to later branches, and instead discuss whether/how we want multiple 4# to later branches, and instead discuss whether/how we want multiple
5# versions. 5# versions.
6DISTNAME= qgis-3.28.1 6DISTNAME= qgis-3.28.1
 7PKGREVISION= 1
7CATEGORIES= geography 8CATEGORIES= geography
8MASTER_SITES= https://qgis.org/downloads/ 9MASTER_SITES= https://qgis.org/downloads/
9EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
10 11
11MAINTAINER= gdt@NetBSD.org 12MAINTAINER= gdt@NetBSD.org
12#MAINTAINER+= brook@nmsu.edu 13#MAINTAINER+= brook@nmsu.edu
13#MAINTAINER+= bouyer@NetBSD.orrg 14#MAINTAINER+= bouyer@NetBSD.orrg
14HOMEPAGE= http://www.qgis.org/ 15HOMEPAGE= http://www.qgis.org/
15COMMENT= Geographic Information System (GIS) 16COMMENT= Geographic Information System (GIS)
16LICENSE= gnu-gpl-v2 17LICENSE= gnu-gpl-v2
17 18
18USE_CMAKE= yes 19USE_CMAKE= yes
19USE_LANGUAGES= c c++17 fortran77 20USE_LANGUAGES= c c++17 fortran77
20USE_LIBTOOL= yes 21USE_LIBTOOL= yes
21USE_PKGLOCALEDIR= yes 22USE_PKGLOCALEDIR= yes
22USE_TOOLS+= cmake bison flex perl pkg-config 23USE_TOOLS+= cmake bison flex perl pkg-config
23# Building 3.28.1 fails with BSD make. One issue seem to be a 24# Building 3.28.1 fails with BSD make. One issue seem to be a
24# difference of opinion about quoting of $, with gmake wanting 25# difference of opinion about quoting of $, with gmake wanting
25# "$$area" vs bmake perhaps wanting "$$$$area". Another is filenames 26# "$$area" vs bmake perhaps wanting "$$$$area". Another is filenames
26# with spaces, which are \-quoted in Makefiles, but bmake sees them as 27# with spaces, which are \-quoted in Makefiles, but bmake sees them as
27# separate files. 28# separate files.
28USE_TOOLS+= gmake 29USE_TOOLS+= gmake
29 30
30PLIST_SRC= PLIST 31PLIST_SRC= PLIST
31 32
32DEPENDS+= qca2-qt5-ossl-[0-9]*:../../security/qca2-qt5-ossl 33DEPENDS+= qca2-qt5-ossl-[0-9]*:../../security/qca2-qt5-ossl
 34TOOL_DEPENDS+= ${PYPKGPREFIX}-sip6-[0-9]*:../../x11/py-sip6
 35TOOL_DEPENDS+= ${PYPKGPREFIX}-qt-builder-[0-9]*:../../x11/py-qt-builder
 36DEPENDS+= ${PYPKGPREFIX}-qt5-[0-9]*:../../x11/py-qt5
 37DEPENDS+= ${PYPKGPREFIX}-qt5-qscintilla-[0-9]*:../../x11/py-qt5-qscintilla
 38
33# This is needed to find qca2. 39# This is needed to find qca2.
34CMAKE_PREFIX_PATH+= ${QTDIR} 40CMAKE_PREFIX_PATH+= ${QTDIR}
35 41
36# This could be used if we want to build pdf doc, which is currently false 42# This could be used if we want to build pdf doc, which is currently false
37#BUILD_DEPENDS+= txt2tags-[0-9]*:../../wip/txt2tags 43#BUILD_DEPENDS+= txt2tags-[0-9]*:../../wip/txt2tags
38 44
39# Disable building of QGIS.app 45# Disable building of QGIS.app
40# (XXX For now, we might want to find a way to do this later.) 46# (XXX For now, we might want to find a way to do this later.)
41SUBST_CLASSES+= xapple 47SUBST_CLASSES+= xapple
42SUBST_STAGE.xapple= pre-configure 48SUBST_STAGE.xapple= pre-configure
43SUBST_MESSAGE.xapple= Disabling APPLE App in cmake scripts 49SUBST_MESSAGE.xapple= Disabling APPLE App in cmake scripts
44xapple_FIND_CMD= cd ${WRKSRC} && \ 50xapple_FIND_CMD= cd ${WRKSRC} && \
45 find . -name '*.cmake' -o -name CMakeLists.txt 51 find . -name '*.cmake' -o -name CMakeLists.txt
@@ -47,70 +53,65 @@ SUBST_FILES.xapple= ${xapple_FIND_CMD:s @@ -47,70 +53,65 @@ SUBST_FILES.xapple= ${xapple_FIND_CMD:s
47SUBST_SED.xapple+= -e 's,APPLE,XAPPLE,' 53SUBST_SED.xapple+= -e 's,APPLE,XAPPLE,'
48SUBST_SED.xapple+= -e 's,MACOSX_BUNDLE ,,' 54SUBST_SED.xapple+= -e 's,MACOSX_BUNDLE ,,'
49SUBST_NOOP_OK.xapple= yes # since SUBST_FILES is generated 55SUBST_NOOP_OK.xapple= yes # since SUBST_FILES is generated
50 56
51SUBST_CLASSES+= pyqt 57SUBST_CLASSES+= pyqt
52SUBST_STAGE.pyqt= pre-configure 58SUBST_STAGE.pyqt= pre-configure
53SUBST_MESSAGE.pyqt= Use correct python version for PyQt5 programs 59SUBST_MESSAGE.pyqt= Use correct python version for PyQt5 programs
54SUBST_FILES.pyqt= cmake/PyQtMacros.cmake cmake/FindPyQt5.cmake 60SUBST_FILES.pyqt= cmake/PyQtMacros.cmake cmake/FindPyQt5.cmake
55SUBST_SED.pyqt+= -e '/^SET/s,pyuic5,&-${PYVERSSUFFIX},' 61SUBST_SED.pyqt+= -e '/^SET/s,pyuic5,&-${PYVERSSUFFIX},'
56SUBST_SED.pyqt+= -e '/^SET/s,pyrcc5,&-${PYVERSSUFFIX},' 62SUBST_SED.pyqt+= -e '/^SET/s,pyrcc5,&-${PYVERSSUFFIX},'
57SUBST_SED.pyqt+= -e '/ *FIND_PROGRAM(__pyuic5 /s,"pyuic5,&-${PYVERSSUFFIX},' 63SUBST_SED.pyqt+= -e '/ *FIND_PROGRAM(__pyuic5 /s,"pyuic5,&-${PYVERSSUFFIX},'
58 64
59CMAKE_ARGS+= -DWITH_BINDINGS:BOOL=TRUE 65CMAKE_ARGS+= -DWITH_BINDINGS:BOOL=TRUE
60CMAKE_ARGS+= -DSIP_BINARY_PATH:PATH=${BUILDLINK_PREFIX.py-sip}/bin 
61CMAKE_ARGS+= -DWITH_INTERNAL_MARKUPSAFE=FALSE 66CMAKE_ARGS+= -DWITH_INTERNAL_MARKUPSAFE=FALSE
62 67
63.include "../../lang/python/application.mk" 
64PYTHON_VERSIONS_INCOMPATIBLE= 27 37 # py-gdal 68PYTHON_VERSIONS_INCOMPATIBLE= 27 37 # py-gdal
65PYTHON_VERSIONS_INCOMPATIBLE+= 311 # py-sip 
66 69
67DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests 70DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
68DEPENDS+= ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2 71DEPENDS+= ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2
69DEPENDS+= ${PYPKGPREFIX}-gdal-[0-9]*:../../geography/py-gdal 72DEPENDS+= ${PYPKGPREFIX}-gdal-[0-9]*:../../geography/py-gdal
70DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2 73DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
71DEPENDS+= ${PYPKGPREFIX}-markupsafe-[0-9]*:../../textproc/py-markupsafe 74DEPENDS+= ${PYPKGPREFIX}-markupsafe-[0-9]*:../../textproc/py-markupsafe
72# for quickosm 75# for quickosm
73DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml 76DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
74# for metasearch 77# for metasearch
75#DEPENDS+= ${PYPKGPREFIX}-wip-[0-9]*:../../wip/py-owslib 78#DEPENDS+= ${PYPKGPREFIX}-wip-[0-9]*:../../wip/py-owslib
76 79
77CMAKE_ARGS+= -DWITH_QTWEBKIT=FALSE 80CMAKE_ARGS+= -DWITH_QTWEBKIT=FALSE
78CMAKE_ARGS+= -DQWT_DIR=${QWT_DIR} 81CMAKE_ARGS+= -DQWT_DIR=${QWT_DIR}
79# Useful for package development: 82# Useful for package development:
80#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=TRUE 83#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=TRUE
81 84
82CONFIGURE_DIRS= build 85CONFIGURE_DIRS= build
83CMAKE_ARG_PATH= .. 86CMAKE_ARG_PATH= ..
84 87
85pre-configure: 88pre-configure:
86 ${MKDIR} ${WRKSRC}/build 89 ${MKDIR} ${WRKSRC}/build
87 90
 91.include "../../lang/python/pyversion.mk"
88.include "../../archivers/libzip/buildlink3.mk" 92.include "../../archivers/libzip/buildlink3.mk"
89.include "../../archivers/zstd/buildlink3.mk" 93.include "../../archivers/zstd/buildlink3.mk"
90##.include "../../devel/qjson/buildlink3.mk" 94##.include "../../devel/qjson/buildlink3.mk"
91.include "../../devel/protobuf/buildlink3.mk" 95.include "../../devel/protobuf/buildlink3.mk"
92.include "../../geography/gdal-lib/buildlink3.mk" 96.include "../../geography/gdal-lib/buildlink3.mk"
93.include "../../geography/proj/buildlink3.mk" 97.include "../../geography/proj/buildlink3.mk"
94.include "../../graphics/exiv2/buildlink3.mk" 98.include "../../graphics/exiv2/buildlink3.mk"
95.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 99.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
96.include "../../graphics/tiff/buildlink3.mk" 100.include "../../graphics/tiff/buildlink3.mk"
97.include "../../math/gsl/buildlink3.mk" 101.include "../../math/gsl/buildlink3.mk"
98.include "../../math/py-numpy/buildlink3.mk" 102.include "../../math/py-numpy/buildlink3.mk"
99.include "../../textproc/expat/buildlink3.mk" 103.include "../../textproc/expat/buildlink3.mk"
100.include "../../www/fcgi/buildlink3.mk" 104.include "../../www/fcgi/buildlink3.mk"
101.include "../../databases/sqlite3/buildlink3.mk" 105.include "../../databases/sqlite3/buildlink3.mk"
102.include "../../geography/libspatialite/buildlink3.mk" 106.include "../../geography/libspatialite/buildlink3.mk"
103.include "../../geography/spatialindex/buildlink3.mk" 107.include "../../geography/spatialindex/buildlink3.mk"
104.include "../../security/qca2-qt5/buildlink3.mk" 108.include "../../security/qca2-qt5/buildlink3.mk"
105.include "../../security/qt5-qtkeychain/buildlink3.mk" 109.include "../../security/qt5-qtkeychain/buildlink3.mk"
106.include "../../x11/py-sip/buildlink3.mk" 
107.include "../../x11/py-qt5/buildlink3.mk" 
108.include "../../x11/py-qt5-qscintilla/buildlink3.mk" 
109.include "../../x11/qt5-qtbase/buildlink3.mk" 110.include "../../x11/qt5-qtbase/buildlink3.mk"
110.include "../../x11/qt5-qttools/buildlink3.mk" 111.include "../../x11/qt5-qttools/buildlink3.mk"
111.include "../../x11/qwt6-qt5/buildlink3.mk" 112.include "../../x11/qwt6-qt5/buildlink3.mk"
112.include "../../x11/qt5-qscintilla/buildlink3.mk" 113.include "../../x11/qt5-qscintilla/buildlink3.mk"
113.include "../../x11/qt5-qtserialport/buildlink3.mk" 114.include "../../x11/qt5-qtserialport/buildlink3.mk"
114.include "../../x11/qt5-qtlocation/buildlink3.mk" 115.include "../../x11/qt5-qtlocation/buildlink3.mk"
115.include "../../mk/pgsql.buildlink3.mk" 116.include "../../mk/pgsql.buildlink3.mk"
116.include "../../mk/bsd.pkg.mk" 117.include "../../mk/bsd.pkg.mk"
cvs diff -r1.47 -r1.48 pkgsrc/geography/qgis/distinfo (expand / switch to unified diff)

--- pkgsrc/geography/qgis/distinfo 2022/11/30 19:40:12 1.47
+++ pkgsrc/geography/qgis/distinfo 2022/12/02 15:44:27 1.48
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.47 2022/11/30 19:40:12 wiz Exp $ 1$NetBSD: distinfo,v 1.48 2022/12/02 15:44:27 wiz Exp $
2 2
3BLAKE2s (qgis-3.28.1.tar.bz2) = 9ad72cb4a2f66403b6326c027c39c05a365379c58ae56f3401558ef9842dcba6 3BLAKE2s (qgis-3.28.1.tar.bz2) = 9ad72cb4a2f66403b6326c027c39c05a365379c58ae56f3401558ef9842dcba6
4SHA512 (qgis-3.28.1.tar.bz2) = f10e67b24abe9881ad447495d144a92ad7aa8f5b826606ce6407f65261ef4521e8b7d2e257079cb11247cdd991afbdf6e49e772649e2d1f5827ceff190caa514 4SHA512 (qgis-3.28.1.tar.bz2) = f10e67b24abe9881ad447495d144a92ad7aa8f5b826606ce6407f65261ef4521e8b7d2e257079cb11247cdd991afbdf6e49e772649e2d1f5827ceff190caa514
5Size (qgis-3.28.1.tar.bz2) = 158612624 bytes 5Size (qgis-3.28.1.tar.bz2) = 158612624 bytes
6SHA1 (patch-cmake_FindQwt.cmake) = e6999791328ea54cd0e457ade13f4e608df3d903 6SHA1 (patch-cmake_FindQwt.cmake) = e6999791328ea54cd0e457ade13f4e608df3d903
7SHA1 (patch-mac_CMakeLists.txt) = 7967c0fa4eed8dc2ce24192bdbec8ae8a336be1c 7SHA1 (patch-mac_CMakeLists.txt) = 7967c0fa4eed8dc2ce24192bdbec8ae8a336be1c
8SHA1 (patch-mac_cmake_1qt.cmake.in) = d74f7201849ef6dd83f39251e466eb04c791c0e6 8SHA1 (patch-mac_cmake_1qt.cmake.in) = d74f7201849ef6dd83f39251e466eb04c791c0e6
9SHA1 (patch-src_core_qgsapplication.cpp) = 54bba734969cd9fd90a2317d8c1531da2827d145 9SHA1 (patch-src_core_qgsapplication.cpp) = 54bba734969cd9fd90a2317d8c1531da2827d145
10SHA1 (patch-src_crssync_CMakeLists.txt) = a751be3f55b57a3d039e07c441a4ac81ba735e60 10SHA1 (patch-src_crssync_CMakeLists.txt) = a751be3f55b57a3d039e07c441a4ac81ba735e60
11SHA1 (patch-src_gui_plot_qgsplotrubberband.cpp) = 29a2994bcfc01f601bfe7b337d1928b366496db7 11SHA1 (patch-src_gui_plot_qgsplotrubberband.cpp) = 29a2994bcfc01f601bfe7b337d1928b366496db7