pkgsrc-WIP-changes archive

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

qgis: Disable spatialite



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Fri Jan 26 14:18:10 2024 -0500
Changeset:	95ab16c92d69eea80fd540c0199517f47f1895b1

Modified Files:
	qgis/Makefile

Log Message:
qgis: Disable spatialite

It drags in minizip which shadows real zip.  Disable for now to try to
get to a working package.

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

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

diffstat:
 qgis/Makefile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diffs:
diff --git a/qgis/Makefile b/qgis/Makefile
index 34bd126df3..e29afe0931 100644
--- a/qgis/Makefile
+++ b/qgis/Makefile
@@ -73,6 +73,9 @@ CMAKE_ARGS+=		-DWITH_INTERNAL_MARKUPSAFE=FALSE
 CMAKE_ARGS+=		-DWITH_DRACO=FALSE
 # \todo Understand and probably add.
 CMAKE_ARGS+=		-DWITH_3D=FALSE
+# \todo Resolve minizip shadowing zip, and minizip needing to be bl3d
+# because qgis seems to -lminizip.
+CMAKE_ARGS+=		-DWITH_SPATIALITE=FALSE
 
 # Server support is WIP; it has merely been tested that regular use
 # has not been broken.
@@ -105,6 +108,14 @@ CMAKE_ARG_PATH=	..
 pre-configure:
 	${MKDIR} ${WRKSRC}/build
 
+# \todo Does qgis properly depend on minizip, or is this a bug in
+# libspatialite's bl3?
+#.include "../../archivers/minizip/buildlink3.mk"
+# \todo Does qgis properly depend on librrtopo, or is this a bug in
+# libspatialite's bl3?
+#.include "../../geography/librttopo/buildlink3.mk"
+#.include "../../geography/libspatialite/buildlink3.mk"
+
 .include "../../lang/python/pyversion.mk"
 .include "../../archivers/libzip/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
@@ -121,7 +132,6 @@ pre-configure:
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../www/fcgi/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../geography/libspatialite/buildlink3.mk"
 .include "../../geography/spatialindex/buildlink3.mk"
 .include "../../security/libtasn1/buildlink3.mk"
 .include "../../security/qca2-qt5/buildlink3.mk"


Home | Main Index | Thread Index | Old Index