From 52efb3c09b438eced17d7d19ca393212e3dc3393 Mon Sep 17 00:00:00 2001
From: Mathieu Pellerin <nirvn.asia@gmail.com>
Date: Sun, 1 Dec 2024 12:21:22 +0700
Subject: [PATCH] Update to QGIS 3.40.1

---
 vcpkg/ports/qgis/meshoptimizer.patch | 54 ----------------------------
 vcpkg/ports/qgis/portfile.cmake      |  5 ++-
 2 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100644 vcpkg/ports/qgis/meshoptimizer.patch

diff --git a/vcpkg/ports/qgis/meshoptimizer.patch b/vcpkg/ports/qgis/meshoptimizer.patch
deleted file mode 100644
index 7d565ebfb9..0000000000
--- a/vcpkg/ports/qgis/meshoptimizer.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 49b44a30810..2c54551457d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -31,6 +31,7 @@ set(SDK_PATH "" CACHE STRING "Build with VCPKG SDK")
- if(NOT SDK_PATH STREQUAL "")
-   message(STATUS "Building with SDK -- ${SDK_PATH}")
-   set(CMAKE_TOOLCHAIN_FILE "${SDK_PATH}/scripts/buildsystems/vcpkg.cmake")
-+  set(VCPKG_INSTALL_PREFIX "${SDK_PATH}/installed")
-   if(APPLE AND NOT VCPKG_TARGET_TRIPLET)
-     set(VCPKG_TARGET_TRIPLET "x64-osx-dynamic")
-   endif()
-@@ -43,7 +44,7 @@ else()
- endif()
- 
- if(WITH_VCPKG)
--  list(APPEND CMAKE_PROGRAM_PATH "${VCPKG_INSTALL_PREFIX}/${VCPKG_TARGET_TRIPLET}/")
-+  list(APPEND CMAKE_PROGRAM_PATH "${VCPKG_INSTALL_PREFIX}/${VCPKG_TARGET_TRIPLET}/tools/python3/Scripts/")
-   set(PREFER_INTERNAL_LIBS FALSE)
- else()
-   set(PREFER_INTERNAL_LIBS TRUE)
-@@ -274,8 +275,8 @@ if(WITH_CORE)
-   endif()
- 
-   # try to configure and build POLY2TRI support
--  set (WITH_INTERNAL_POLY2TRI PREFER_INTERNAL_LIBS CACHE BOOL "Determines whether POLY2TRI should be built from internal copy")
--  set (WITH_INTERNAL_MESHOPTIMIZER PREFER_INTERNAL_LIBS CACHE BOOL "Determines whether MESHOPTIMIZER should be built from internal copy")
-+  set (WITH_INTERNAL_POLY2TRI ${PREFER_INTERNAL_LIBS} CACHE BOOL "Determines whether POLY2TRI should be built from internal copy")
-+  set (WITH_INTERNAL_MESHOPTIMIZER ${PREFER_INTERNAL_LIBS} CACHE BOOL "Determines whether MESHOPTIMIZER should be built from internal copy")
- 
-   # try to configure and build POSTGRESQL support
-   set (WITH_POSTGRESQL TRUE CACHE BOOL "Determines whether POSTGRESQL support should be built")
-@@ -388,7 +389,7 @@ if(WITH_CORE)
-   find_package(EXPAT REQUIRED)
-   find_package(Spatialindex REQUIRED)
-   find_package(LibZip REQUIRED)
--  set (WITH_INTERNAL_NLOHMANN_JSON PREFER_INTERNAL_LIBS CACHE BOOL "Determines whether the vendored copy of nlohmann-json should be used")
-+  set (WITH_INTERNAL_NLOHMANN_JSON ${PREFER_INTERNAL_LIBS} CACHE BOOL "Determines whether the vendored copy of nlohmann-json should be used")
-   find_package(nlohmann_json REQUIRED)
- 
-   # The following bypasses the FindSQLite3 module introduced in CMake 3.14
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 763de0f4968..808540650d2 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -2350,7 +2350,7 @@ if(WITH_INTERNAL_MESHOPTIMIZER)
-   )
- else()
-   find_package(meshoptimizer CONFIG REQUIRED)
--  target_link_libraries(qgis_core PRIVATE meshoptimizer::meshoptimizer)
-+  target_link_libraries(qgis_core meshoptimizer::meshoptimizer)
- endif()
- 
- # require c++17
diff --git a/vcpkg/ports/qgis/portfile.cmake b/vcpkg/ports/qgis/portfile.cmake
index a363b0abe2..a8231c6489 100644
--- a/vcpkg/ports/qgis/portfile.cmake
+++ b/vcpkg/ports/qgis/portfile.cmake
@@ -1,5 +1,5 @@
-set(QGIS_REF final-3_40_0)
-set(QGIS_SHA512 2c7348790748b979cdda280e60649ad64de232b0894f1310f4558b19e20ba834f832e92e814cb94b2b089406c2448013def5b3cbd932b8e2892a2b7570721764)
+set(QGIS_REF final-3_40_1)
+set(QGIS_SHA512 58d42dafe9174ec6962d851eea5754f30b88dfbe281f5c17c69edfb379658da310c5426882200210c6a95e08d08b36e84cd7288c5e3893aebf8ec3418d911e3a)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -16,7 +16,6 @@ vcpkg_from_github(
         crssync-no-install.patch
         include-qthread.patch
         processing.patch # Needed to avoid link issue with tinygltf (ATM embedded into QGIS) and _GEOSQueryCallback defined multiple times
-        meshoptimizer.patch
         locatorcontext.patch # Remove when upgrading to QGIS 3.42  
         rectangle.patch # Remove when upgrading to QGIS 3.42
 )