geography/gdal*: Revbump for geos update
These use the C API which has not had an API change but due to a libtool bug they link against the C++ library also.
This commit is contained in:
gdt
parent
7930f2b59e
commit
21d0b120aa
6 changed files with 96 additions and 10 deletions
|
|
@ -1,6 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.156 2023/08/14 05:24:29 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.157 2023/08/26 00:09:53 gdt Exp $
|
||||
|
||||
PKGREVISION= 4
|
||||
PKGREVISION= 5
|
||||
.include "../../geography/gdal-lib/Makefile.common"
|
||||
PKGNAME= ${DISTNAME:S/gdal/gdal-lib/}
|
||||
#PKGREVISION= 0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.56 2023/08/01 23:20:43 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.57 2023/08/26 00:09:53 gdt Exp $
|
||||
|
||||
PKGREVISION= 3
|
||||
PKGREVISION= 4
|
||||
.include "../../geography/gdal-lib/Makefile.common"
|
||||
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
|
||||
#PKGREVISION= 0
|
||||
|
|
|
|||
|
|
@ -1,16 +1,17 @@
|
|||
# $NetBSD: Makefile,v 1.182 2023/08/25 10:36:48 gdt Exp $
|
||||
# $NetBSD: Makefile,v 1.183 2023/08/26 00:09:54 gdt 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.
|
||||
# versions, or to only track the most recent branch.
|
||||
DISTNAME= qgis-3.28.10
|
||||
PKGREVISION= 1
|
||||
CATEGORIES= geography
|
||||
MASTER_SITES= https://qgis.org/downloads/
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MAINTAINER= gdt@NetBSD.org
|
||||
#MAINTAINER+= brook@nmsu.edu
|
||||
#MAINTAINER+= bouyer@NetBSD.orrg
|
||||
#MAINTAINER+= bouyer@NetBSD.org
|
||||
HOMEPAGE= http://www.qgis.org/
|
||||
COMMENT= Geographic Information System (GIS)
|
||||
LICENSE= gnu-gpl-v2
|
||||
|
|
@ -62,7 +63,11 @@ SUBST_SED.pyqt+= -e '/ *FIND_PROGRAM(__pyuic5 /s,"pyuic5,&-${PYVERSSUFFIX},'
|
|||
|
||||
CMAKE_ARGS+= -DWITH_BINDINGS:BOOL=TRUE
|
||||
CMAKE_ARGS+= -DWITH_INTERNAL_MARKUPSAFE=FALSE
|
||||
#CMAKE_ARGS+= -DWITH_SERVER:BOOL=TRUE
|
||||
|
||||
# Server support is WIP; it has merely been tested that regular use
|
||||
# has not been broken.
|
||||
CMAKE_ARGS+= -DWITH_SERVER:BOOL=TRUE
|
||||
CMAKE_ARGS+= -DQGIS_CGIBIN_SUBDIR=libexec/cgi-bin
|
||||
|
||||
PYTHON_VERSIONS_INCOMPATIBLE= 27 38
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
@comment $NetBSD: PLIST,v 1.24 2023/08/25 10:36:48 gdt Exp $
|
||||
@comment $NetBSD: PLIST,v 1.25 2023/08/26 00:09:54 gdt Exp $
|
||||
bin/qgis
|
||||
bin/qgis_bench
|
||||
bin/qgis_mapserver
|
||||
bin/qgis_process
|
||||
include/qgis/Bezier3D.h
|
||||
include/qgis/CloughTocherInterpolator.h
|
||||
|
|
@ -1699,6 +1700,8 @@ lib/libqgis_gui.so
|
|||
lib/libqgis_gui.so.${PKGVERSION}
|
||||
lib/libqgis_native.so
|
||||
lib/libqgis_native.so.${PKGVERSION}
|
||||
lib/libqgis_server.so
|
||||
lib/libqgis_server.so.${PKGVERSION}
|
||||
lib/libqgispython.so
|
||||
lib/libqgispython.so.${PKGVERSION}
|
||||
lib/qgis/crssync
|
||||
|
|
@ -1729,6 +1732,14 @@ lib/qgis/plugins/libprovider_wcs.so
|
|||
lib/qgis/plugins/libprovider_wfs.so
|
||||
lib/qgis/plugins/libprovider_wms.so
|
||||
lib/qgis/qgiscrashhandler
|
||||
lib/qgis/server/libdummy.so
|
||||
lib/qgis/server/liblandingpage.so
|
||||
lib/qgis/server/libwcs.so
|
||||
lib/qgis/server/libwfs.so
|
||||
lib/qgis/server/libwfs3.so
|
||||
lib/qgis/server/libwms.so
|
||||
lib/qgis/server/libwmts.so
|
||||
libexec/cgi-bin/qgis_mapserv.fcgi
|
||||
man/man1/qgis.1
|
||||
share/applications/org.qgis.qgis.desktop
|
||||
share/icons/hicolor/128x128/apps/qgis.png
|
||||
|
|
@ -3223,6 +3234,8 @@ share/qgis/python/qgis/_core.pyi
|
|||
share/qgis/python/qgis/_core.so
|
||||
share/qgis/python/qgis/_gui.pyi
|
||||
share/qgis/python/qgis/_gui.so
|
||||
share/qgis/python/qgis/_server.pyi
|
||||
share/qgis/python/qgis/_server.so
|
||||
share/qgis/python/qgis/analysis/__init__.py
|
||||
share/qgis/python/qgis/core/__init__.py
|
||||
share/qgis/python/qgis/core/additions/__init__.py
|
||||
|
|
@ -3246,6 +3259,7 @@ share/qgis/python/qgis/core/contextmanagers.py
|
|||
share/qgis/python/qgis/gui/__init__.py
|
||||
share/qgis/python/qgis/processing/__init__.py
|
||||
share/qgis/python/qgis/processing/algfactory.py
|
||||
share/qgis/python/qgis/server/__init__.py
|
||||
share/qgis/python/qgis/testing/__init__.py
|
||||
share/qgis/python/qgis/testing/mocked.py
|
||||
share/qgis/python/qgis/user.py
|
||||
|
|
@ -8781,6 +8795,50 @@ share/qgis/resources/metadata-ISO/mime.csv
|
|||
share/qgis/resources/palettes/new_layer_colors.gpl
|
||||
share/qgis/resources/qgis.db
|
||||
share/qgis/resources/qgis_global_settings.ini
|
||||
share/qgis/resources/server/api/ogc/schema.json
|
||||
share/qgis/resources/server/api/ogc/static/jsonFormatter/LICENSE
|
||||
share/qgis/resources/server/api/ogc/static/jsonFormatter/jsonFormatter.css
|
||||
share/qgis/resources/server/api/ogc/static/jsonFormatter/jsonFormatter.js
|
||||
share/qgis/resources/server/api/ogc/static/jsonFormatter/jsonFormatter.min.css
|
||||
share/qgis/resources/server/api/ogc/static/jsonFormatter/jsonFormatter.min.js
|
||||
share/qgis/resources/server/api/ogc/static/style.css
|
||||
share/qgis/resources/server/api/ogc/templates/wfs3/describeCollection.html
|
||||
share/qgis/resources/server/api/ogc/templates/wfs3/describeCollections.html
|
||||
share/qgis/resources/server/api/ogc/templates/wfs3/footer.html
|
||||
share/qgis/resources/server/api/ogc/templates/wfs3/getApiDescription.html
|
||||
share/qgis/resources/server/api/ogc/templates/wfs3/getFeature.html
|
||||
share/qgis/resources/server/api/ogc/templates/wfs3/getFeatures.html
|
||||
share/qgis/resources/server/api/ogc/templates/wfs3/getLandingPage.html
|
||||
share/qgis/resources/server/api/ogc/templates/wfs3/getRequirementClasses.html
|
||||
share/qgis/resources/server/api/ogc/templates/wfs3/header.html
|
||||
share/qgis/resources/server/api/ogc/templates/wfs3/leaflet_map.html
|
||||
share/qgis/resources/server/api/ogc/templates/wfs3/links.html
|
||||
share/qgis/resources/server/schemaExtension.xsd
|
||||
share/qgis/resources/server/src/landingpage/README.md
|
||||
share/qgis/resources/server/src/landingpage/babel.config.js
|
||||
share/qgis/resources/server/src/landingpage/package.json
|
||||
share/qgis/resources/server/src/landingpage/public/README
|
||||
share/qgis/resources/server/src/landingpage/public/favicon.ico
|
||||
share/qgis/resources/server/src/landingpage/public/index.html
|
||||
share/qgis/resources/server/src/landingpage/src/App.vue
|
||||
share/qgis/resources/server/src/landingpage/src/components/AttributeTable.vue
|
||||
share/qgis/resources/server/src/landingpage/src/components/Error.vue
|
||||
share/qgis/resources/server/src/landingpage/src/components/IdentifyResults.vue
|
||||
share/qgis/resources/server/src/landingpage/src/components/LayerTree.vue
|
||||
share/qgis/resources/server/src/landingpage/src/components/LayerTreeNode.vue
|
||||
share/qgis/resources/server/src/landingpage/src/components/LeftSidebar.vue
|
||||
share/qgis/resources/server/src/landingpage/src/components/MapFooter.vue
|
||||
share/qgis/resources/server/src/landingpage/src/components/MapToolbar.vue
|
||||
share/qgis/resources/server/src/landingpage/src/components/Metadata.vue
|
||||
share/qgis/resources/server/src/landingpage/src/js/Utils.js
|
||||
share/qgis/resources/server/src/landingpage/src/js/WmsSource.js
|
||||
share/qgis/resources/server/src/landingpage/src/main.js
|
||||
share/qgis/resources/server/src/landingpage/src/plugins/vuetify.js
|
||||
share/qgis/resources/server/src/landingpage/src/store.js
|
||||
share/qgis/resources/server/src/landingpage/src/views/Catalog.vue
|
||||
share/qgis/resources/server/src/landingpage/src/views/WebGis.vue
|
||||
share/qgis/resources/server/src/landingpage/vue.config.js
|
||||
share/qgis/resources/server/src/landingpage/yarn.lock
|
||||
share/qgis/resources/spatialite.db
|
||||
share/qgis/resources/srs.db
|
||||
share/qgis/resources/symbology-style.xml
|
||||
|
|
@ -8832,6 +8890,8 @@ share/qgis/resources/themes/Night Mapping/palette.txt
|
|||
share/qgis/resources/themes/Night Mapping/qscintilla.ini
|
||||
share/qgis/resources/themes/Night Mapping/style.qss
|
||||
share/qgis/resources/themes/Night Mapping/variables.qss
|
||||
share/qgis/server/admin.sld
|
||||
share/qgis/server/wms_metadata.xml
|
||||
share/qgis/svg/accommodation/accommodation_alpinehut.svg
|
||||
share/qgis/svg/accommodation/accommodation_bed_and_breakfast.svg
|
||||
share/qgis/svg/accommodation/accommodation_camping.svg
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: distinfo,v 1.55 2023/08/25 10:36:48 gdt Exp $
|
||||
$NetBSD: distinfo,v 1.56 2023/08/26 00:09:54 gdt Exp $
|
||||
|
||||
BLAKE2s (qgis-3.28.10.tar.bz2) = 69335c1257a7668fa30c798ec578850b47a59829d22e7051fbc9f887178ca679
|
||||
SHA512 (qgis-3.28.10.tar.bz2) = 00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56
|
||||
|
|
@ -9,3 +9,4 @@ SHA1 (patch-mac_cmake_1qt.cmake.in) = d74f7201849ef6dd83f39251e466eb04c791c0e6
|
|||
SHA1 (patch-src_core_qgsapplication.cpp) = 54bba734969cd9fd90a2317d8c1531da2827d145
|
||||
SHA1 (patch-src_core_raster_qgsexiftools.cpp) = 83cab7f5a0572edba7fbef5001476955a8ddc937
|
||||
SHA1 (patch-src_crssync_CMakeLists.txt) = a751be3f55b57a3d039e07c441a4ac81ba735e60
|
||||
SHA1 (patch-src_server_CMakeLists.txt) = 7e0017979a3b143800c0b50244e8105f02562a65
|
||||
|
|
|
|||
20
geography/qgis/patches/patch-src_server_CMakeLists.txt
Normal file
20
geography/qgis/patches/patch-src_server_CMakeLists.txt
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
$NetBSD: patch-src_server_CMakeLists.txt,v 1.1 2023/08/26 00:09:54 gdt Exp $
|
||||
|
||||
Upstream installs data files for a webroot into the cgi dir. Fix
|
||||
that.
|
||||
|
||||
\todo File upstream properly, but see
|
||||
|
||||
https://github.com/qgis/QGIS-Documentation/issues/8475
|
||||
|
||||
--- src/server/CMakeLists.txt.orig 2023-08-25 12:02:24.861949784 +0000
|
||||
+++ src/server/CMakeLists.txt
|
||||
@@ -187,7 +187,7 @@ install(TARGETS
|
||||
install(FILES
|
||||
admin.sld
|
||||
wms_metadata.xml
|
||||
- DESTINATION ${QGIS_CGIBIN_DIR}
|
||||
+ DESTINATION ${QGIS_DATA_DIR}/server
|
||||
)
|
||||
add_custom_target(qgis_server_full
|
||||
DEPENDS qgis_mapserv.fcgi wms wfs wcs wfs3 wmts qgis_server landingpage
|
||||
Loading…
Reference in a new issue