qgis3, qgis3-ltr: use CMake's default FindSQLite3 to configure with P…

…ROJ 9.4

Closes: https://trac.macports.org/ticket/69507

gis/qgis3/Portfile

@@ -107,7 +107,9 @@ qt5.depends_component \
 patchfiles-append   patch-app_info_plist_in.diff \
                     patch-CMakelists_txt.diff \
                     patch-MacBundleMacros.cmake.diff \
-                    patch-SIPMacros.cmake.diff
+                    patch-SIPMacros.cmake.diff \
+                    patch-PROJ94.diff \
+                    patch-configure_PROJ94.diff
 
 post-patch {
     reinplace -E "s|@PREFIX@|${prefix}|g" \
@@ -119,6 +121,10 @@ post-patch {
 
     reinplace -E "s|@APP_NAME@|${app_name}|" \
         ${worksrcpath}/CMakeLists.txt
+
+    # Fix configure with PROJ 9.4, use CMake default FindSQLite3
+    # works together with patch-configure_PROJ94.diff
+    file delete ${worksrcpath}/cmake/FindSqlite3.cmake
 }
 
 cmake.install_prefix    ${applications_dir}

gis/qgis3/files/patch-PROJ94.diff

@@ -0,0 +1,16 @@
+From 893483fdfd240f20aa7fbec3d2fe35dde469d503 Mon Sep 17 00:00:00 2001
+From: Nyall Dawson <[email protected]>
+Date: Fri, 8 Mar 2024 09:17:28 +1000
+Subject: [PATCH] Fix compilation with proj 9.4+
+
+--- src/core/proj/qgscoordinatereferencesystemutils.cpp.orig
++++ src/core/proj/qgscoordinatereferencesystemutils.cpp
+@@ -348,6 +348,8 @@
+     return QObject::tr( "Miller Oblated Stereographic" );
+   if ( projection == QLatin1String( "mill" ) )
+     return QObject::tr( "Miller Cylindrical" );
++  if ( projection == QLatin1String( "mod_krovak" ) )
++    return QObject::tr( "Modified Krovak" );
+   if ( projection == QLatin1String( "moll" ) )
+     return QObject::tr( "Mollweide" );
+   if ( projection == QLatin1String( "murd1" ) )

gis/qgis3/files/patch-configure_PROJ94.diff

@@ -0,0 +1,123 @@
+# 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}
+ )
+