pkgsrc-WIP-changes archive

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

qgis: Adjust \todo in Makefile and TODO



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sun Mar 1 07:34:41 2026 -0500
Changeset:	baa5057b832e177a955162990d6f97edc3b8e579

Modified Files:
	qgis/Makefile
	qgis/TODO

Log Message:
qgis: Adjust \todo in Makefile and TODO

The only significant change is a decision to create a default-off
option for qtwebengine, because it's beastly and I don't understand
how qgis with it does anything more useful.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=baa5057b832e177a955162990d6f97edc3b8e579

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

diffstat:
 qgis/Makefile | 15 +++++++++------
 qgis/TODO     | 14 ++++++++------
 2 files changed, 17 insertions(+), 12 deletions(-)

diffs:
diff --git a/qgis/Makefile b/qgis/Makefile
index c4b7c1f046..0d8983562e 100644
--- a/qgis/Makefile
+++ b/qgis/Makefile
@@ -68,17 +68,21 @@ SUBST_SED.pyqt+=	-e '/ *FIND_PROGRAM(__pyuic6 /s,"pyuic6,&-${PYVERSSUFFIX},'
 # because it is only examined when there are failures.
 CMAKE_CONFIGURE_ARGS+=		-DCMAKE_VERBOSE_MAKEFILE=TRUE
 
-# qgis looks for ccache and uses it, which does not play well with wrappers.
-# Plus, there's something buggy about ccache, precompiled headers, and gcc.
+# qgis looks for ccache and uses it, which does not play well with
+# wrappers.  Disable, so pkgsrc controls if ccache is used.
 CMAKE_CONFIGURE_ARGS+=		-DUSE_CCACHE:BOOL=FALSE
 
 # Precompiled headers are buggy in the presence of ASLR.
 #   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71934
 #   https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=59746
+# \todo Recheck and perhaps limit.
 CMAKE_CONFIGURE_ARGS+=		-DUSE_PRECOMPILED_HEADERS:BOOL=FALSE
 
+# \todo Check if needed; should be default.
 CMAKE_CONFIGURE_ARGS+=		-DWITH_BINDINGS:BOOL=TRUE
 
+# Disable vendored code, to guard against silent failure to accept
+# pkgsrc-provided versions.
 CMAKE_CONFIGURE_ARGS+=		-DWITH_INTERNAL_MARKUPSAFE=FALSE
 CMAKE_CONFIGURE_ARGS+=		-DWITH_INTERNAL_NLOHMANN_JSON=OFF
 
@@ -86,9 +90,8 @@ CMAKE_CONFIGURE_ARGS+=		-DWITH_INTERNAL_NLOHMANN_JSON=OFF
 # We patch cmake to look only in QWT_DIR, so provide it.
 #CMAKE_CONFIGURE_ARGS+=		-DQWT_DIR=${QWT_DIR}
 
-# \todo Understand and fix
 CMAKE_CONFIGURE_ARGS+=		-DWITH_QTWEBENGINE=FALSE
-# ? DEPENDS+= ../../www/qt6-qtwebengine
+# DEPENDS+= ../../www/qt6-qtwebengine
 
 CMAKE_CONFIGURE_ARGS+=		-DWITH_SERVER:BOOL=TRUE
 # Upstream installs in an OS-specific place by default, but
@@ -110,11 +113,11 @@ DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 DEPENDS+=	${PYPKGPREFIX}-owslib-[0-9]*:../../geography/py-owslib
 
 .include "../../lang/python/pyversion.mk"
-# qgis 4 has not been tested with 311, 312, 314.
-PYTHON_VERSIONS_INCOMPATIBLE=	310
+ooPYTHON_VERSIONS_INCOMPATIBLE=	310
 
 .include "../../mk/pgsql.buildlink3.mk"
 
+# \todo package
 # ?bl3 or DEPENDS: ../../not-in-pkgsrc/laz-perf
 
 .include "../../archivers/libzip/buildlink3.mk"
diff --git a/qgis/TODO b/qgis/TODO
index 19249728bb..c3193fa1c4 100644
--- a/qgis/TODO
+++ b/qgis/TODO
@@ -3,17 +3,19 @@
   - Write COMMIT_MSG.
   - Go over cmake configure output and check dependencies.
   - Grasp/fix lack of secret storage access.
+  - Create a default-off option to qtwebengine.  It's at best beastly,
+    and didn't build for me on NetBSD 10 amd64.  It's not clear what
+    having it in qgis gains.
 
 # \todo in makefile
 
+This section omits things that were \todo in geography/qgis, or aren't
+reasons the upgrade isn't ready.  (e.g., BSD make) 
+
   - Grasp qca2-qt6-ossl and package or decide it isn't needed.
-  - Package qwt-qt6 and and re-add QWT_DIR patch and cmake arg.
-  - Package and add qtwebengine.
-  - Package/add laz-perf.
   - Redo apple bundle exclusion.
   - Leave note about making apple bundle an option.
-  - Test with BSD make.
+  - Package/add laz-perf.
   - Recheck precompiled headers exclusion.
   - Recheck having to set bindings on.
-  - Recheck having to disable internal markupsafe, nlohmann_json.
-  - Maybe check python 310, 311, 312, 314.
+  - Package qwt-qt6 and and re-add QWT_DIR patch and cmake arg.


Home | Main Index | Thread Index | Old Index