From 01fc31b47918017b1b1a951cf244e40cc1c51de6 Mon Sep 17 00:00:00 2001 From: Nicklas Larsson Date: Mon, 24 Feb 2025 15:11:21 +0100 Subject: [PATCH] qgis3: update to 3.42.0 qgis3-ltr: update to 3.40.4 --- gis/qgis3/Portfile | 33 ++---- gis/qgis3/files/patch-configure_PROJ94.diff | 123 -------------------- 2 files changed, 11 insertions(+), 145 deletions(-) delete mode 100644 gis/qgis3/files/patch-configure_PROJ94.diff diff --git a/gis/qgis3/Portfile b/gis/qgis3/Portfile index ec7056d7844c2..b13788add825e 100644 --- a/gis/qgis3/Portfile +++ b/gis/qgis3/Portfile @@ -25,36 +25,25 @@ subport ${name-ltr} {} if {${subport} eq ${name}} { # Latest version - github.setup qgis QGIS 3_40_3 final- + github.setup qgis QGIS 3_42_0 final- github.tarball_from archive - revision 1 + revision 0 set app_name QGIS3 - checksums rmd160 63458d5e7cffca50e3ff71f31ad85f05e551a3f0 \ - sha256 5590ab80f78f3311a5d7d72f5543538203151040dd098c695e773f56c8832338 \ - size 210945106 - - set grass_utils_file grass_utils.py + checksums rmd160 b89f5717b4daceb4a6c31634efc25eebe430187b \ + sha256 9b2714bde3f4d72be39e5c253997d894143e294f51b9dfe3c5c2d01cefeb0078 \ + size 215467357 } else { # LTR version - github.setup qgis QGIS 3_34_15 final- + github.setup qgis QGIS 3_40_4 final- github.tarball_from archive revision 0 set app_name QGIS3-LTR description {*}${description} (LTR) - checksums rmd160 658a73d8056582383f9941f57bb9f49b3e0c52eb \ - sha256 d16a05ebd7acfba25fe330552ec3d66227f892525f3159cc5388e121adbeae27 \ - size 198080196 - - set grass_utils_file Grass7Utils.py - - patchfiles-append patch-configure_PROJ94.diff - post-patch { - # Fix configure with PROJ 9.4, use CMake default FindSQLite3 - # works together with patch-configure_PROJ94.diff - file delete ${worksrcpath}/cmake/FindSqlite3.cmake - } + checksums rmd160 e5118df097cbb31cda0569d968cc700e5e991fb4 \ + sha256 e8ac20aaf5d1022d31ca569e10203d86202317897195a42f803fc9b0e6b707f9 \ + size 211674268 } version [string map {_ .} ${github.version}] @@ -208,7 +197,7 @@ variant grass7 conflicts grass description "Build GRASS 7 plugin" { } post-patch { reinplace "s|command = None|command = '${prefix}/bin/grass${grass_version}'|g" \ - ${worksrcpath}/python/plugins/grassprovider/${grass_utils_file} + ${worksrcpath}/python/plugins/grassprovider/grass_utils.py } } @@ -222,7 +211,7 @@ variant grass conflicts grass7 description "Build GRASS (latest) plugin" { } post-patch { reinplace "s|command = None|command = '${prefix}/bin/grass'|g" \ - ${worksrcpath}/python/plugins/grassprovider/${grass_utils_file} + ${worksrcpath}/python/plugins/grassprovider/grass_utils.py } } diff --git a/gis/qgis3/files/patch-configure_PROJ94.diff b/gis/qgis3/files/patch-configure_PROJ94.diff deleted file mode 100644 index 70ab92c134e38..0000000000000 --- a/gis/qgis3/files/patch-configure_PROJ94.diff +++ /dev/null @@ -1,123 +0,0 @@ -# Addressed upstream with https://github.com/qgis/QGIS/issues/56885 - - ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -368,7 +368,7 @@ - find_package(Spatialindex REQUIRED) - find_package(LibZip REQUIRED) - -- find_package(Sqlite3) -+ find_package(SQLite3) - if (NOT SQLITE3_FOUND) - message (SEND_ERROR "sqlite3 dependency was not found!") - endif() - - ---- src/providers/mdal/CMakeLists.txt.orig -+++ src/providers/mdal/CMakeLists.txt -@@ -91,11 +91,11 @@ - set (HAVE_HDF5 TRUE) - endif() - -- if(SQLITE3_FOUND) -+ if(SQLite3_FOUND) - set(HAVE_SQLITE3 TRUE) - endif() - -- if(SQLITE3_FOUND AND NETCDF_FOUND) -+ if(SQLite3_FOUND AND NETCDF_FOUND) - set(MDAL_LIB_SRCS ${MDAL_LIB_SRCS} - ${CMAKE_SOURCE_DIR}/external/mdal/frmts/mdal_sqlite3.cpp - ${CMAKE_SOURCE_DIR}/external/mdal/frmts/mdal_3di.cpp - - ---- src/core/CMakeLists.txt.orig -+++ src/core/CMakeLists.txt -@@ -2282,7 +2282,7 @@ - ${${QT_VERSION_BASE}Concurrent_INCLUDE_DIRS} - ${LIBZIP_INCLUDE_DIRS} - ${SPATIALINDEX_INCLUDE_DIR} # before GEOS for case-insensitive filesystems -- ${SQLITE3_INCLUDE_DIR} -+ ${SQLite3_INCLUDE_DIRS} - ${QCA_INCLUDE_DIR} - ${${QT_VERSION_BASE}SerialPort_INCLUDE_DIRS} - ${Protobuf_INCLUDE_DIRS} -@@ -2458,7 +2458,7 @@ - GDAL::GDAL - ${SPATIALINDEX_LIBRARY} - EXPAT::EXPAT -- ${SQLITE3_LIBRARY} -+ ${SQLite3_LIBRARIES} - ${LIBZIP_LIBRARY} - ${Protobuf_LITE_LIBRARY} - ${ZLIB_LIBRARIES} - - ---- tests/bench/CMakeLists.txt.orig -+++ tests/bench/CMakeLists.txt -@@ -20,12 +20,12 @@ - ${CMAKE_BINARY_DIR} - ) - include_directories(SYSTEM -- ${SQLITE3_INCLUDE_DIR} -+ ${SQLite3_INCLUDE_DIRS} - ) - - target_link_libraries(qgis_bench - qgis_core -- ${SQLITE3_LIBRARY} -+ ${SQLite3_LIBRARIES} - ${QT_VERSION_BASE}::Core - ${QT_VERSION_BASE}::Network - ${QT_VERSION_BASE}::Svg - - ---- external/qspatialite/CMakeLists.txt.orig -+++ external/qspatialite/CMakeLists.txt -@@ -6,7 +6,7 @@ - add_definitions(-DQT_SHARED) - - include_directories(SYSTEM -- ${SQLITE3_INCLUDE_DIR} -+ ${SQLite3_INCLUDE_DIRS} - ${Qt5Sql_PRIVATE_INCLUDE_DIRS} - ) - - ---- python/CMakeLists.txt.orig -+++ python/CMakeLists.txt -@@ -77,7 +77,7 @@ - ${QWT_INCLUDE_DIR} - ${QCA_INCLUDE_DIR} - ${QTKEYCHAIN_INCLUDE_DIR} -- ${SQLITE3_INCLUDE_DIR} -+ ${SQLite3_INCLUDE_DIRS} - ${SPATIALINDEX_INCLUDE_DIR} - ) - - ---- src/analysis/CMakeLists.txt.orig -+++ src/analysis/CMakeLists.txt -@@ -468,7 +468,7 @@ - endif() - - include_directories(SYSTEM ${SPATIALINDEX_INCLUDE_DIR}) --include_directories(SYSTEM ${SQLITE3_INCLUDE_DIR}) -+include_directories(SYSTEM ${SQLite3_INCLUDE_DIRS}) - include_directories(BEFORE raster) - include_directories(BEFORE mesh) - - ---- src/quickgui/plugin/CMakeLists.txt.orig -+++ src/quickgui/plugin/CMakeLists.txt -@@ -30,7 +30,7 @@ - include_directories(SYSTEM - ${LIBZIP_INCLUDE_DIRS} - ${SPATIALINDEX_INCLUDE_DIR} -- ${SQLITE3_INCLUDE_DIR} -+ ${SQLite3_INCLUDE_DIRS} - ${QCA_INCLUDE_DIR} - ${QTKEYCHAIN_INCLUDE_DIR} - ) -