qgis{,-qt6}-dev: update revised unmerged PR qgis/QGIS#60676 (after me…

…rge of qgis/QGIS#60674) in and remove merged qgis/QGIS#60677 from patch for nightly

src/qgis-dev/osgeo4w/patch

@@ -24,36 +24,6 @@ index 29ddf2602ce..78c2f124db4 100644
  ENDIF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
 
 
-diff --git a/external/untwine/untwine/windows/mapfile.hpp b/external/untwine/untwine/windows/mapfile.hpp
-index abd7dcfbc08..8cbc4b93b20 100644
---- a/external/untwine/untwine/windows/mapfile.hpp
-+++ b/external/untwine/untwine/windows/mapfile.hpp
-@@ -1,6 +1,6 @@
- #pragma once
-
--#include <Windows.h>
-+#include <windows.h>
- #include <io.h>
- #include <fcntl.h>
-
-diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
-index c633fcd974a..751f0ee52cd 100644
---- a/src/analysis/CMakeLists.txt
-+++ b/src/analysis/CMakeLists.txt
-@@ -483,6 +483,13 @@ if (WITH_PDAL AND PDAL_2_5_OR_HIGHER)
-   include_directories(
-     ${CMAKE_SOURCE_DIR}/external/untwine/api
-   )
-+
-+  IF(MSVC)
-+    set_source_files_properties(
-+      ${CMAKE_SOURCE_DIR}/external/untwine/api/QgisUntwine.cpp
-+      PROPERTIES COMPILE_FLAGS "/DUNICODE"
-+    )
-+  endif()
- endif()
-
- include_directories(SYSTEM ${SPATIALINDEX_INCLUDE_DIR})
 diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
 index b042c860811..d3a4910a039 100644
 --- a/src/app/CMakeLists.txt
@@ -93,23 +63,6 @@ index c50a1c681e3..2e58fb609f5 100644
  #include <sqlite3.h>
 
  #ifdef HAVE_SPATIALITE
-@@ -5503,8 +5493,14 @@ QString QgisApp::getVersionString()
-   versionString += QLatin1String( "</td></tr><tr>" );
-
-   // GDAL version
--  const QString gdalVersionCompiled { GDAL_RELEASE_NAME };
--  const QString gdalVersionRunning { GDALVersionInfo( "RELEASE_NAME" ) };
-+  QString gdalVersionCompiled { GDAL_RELEASE_NAME };
-+#if defined(GDAL_RELEASE_NICKNAME)
-+  gdalVersionCompiled += QStringLiteral( " \"%1\"" ).arg( QStringLiteral( GDAL_RELEASE_NICKNAME ) );
-+#endif
-+  QString gdalVersionRunning { GDALVersionInfo( "RELEASE_NAME" ) };
-+  if ( atoi( GDALVersionInfo("VERSION_NUM") ) >= GDAL_COMPUTE_VERSION( 3, 11, 0 ) )
-+    gdalVersionRunning += QStringLiteral( " \"%1\"" ).arg( GDALVersionInfo("RELEASE_NICKNAME") );
-+
-   versionString += QStringLiteral( "<td>%1</td><td>%2" ).arg( tr( "GDAL/OGR version" ), gdalVersionCompiled );
-   if ( gdalVersionCompiled != gdalVersionRunning )
-   {
 @@ -5569,7 +5565,7 @@ QString QgisApp::getVersionString()
    // postgres
    versionString += QStringLiteral( "<td>%1</td><td>" ).arg( tr( "PostgreSQL client version" ) );
@@ -119,21 +72,3 @@ index c50a1c681e3..2e58fb609f5 100644
  #else
    versionString += tr( "No support" );
  #endif
-diff --git a/src/providers/pdal/CMakeLists.txt b/src/providers/pdal/CMakeLists.txt
-index ff970745fd2..05c49ec6cfa 100644
---- a/src/providers/pdal/CMakeLists.txt
-+++ b/src/providers/pdal/CMakeLists.txt
-@@ -14,6 +14,13 @@ set(PDAL_SRCS
-   ${CMAKE_SOURCE_DIR}/external/untwine/api/QgisUntwine.cpp
- )
-
-+IF(MSVC)
-+  set_source_files_properties(
-+    ${CMAKE_SOURCE_DIR}/external/untwine/api/QgisUntwine.cpp
-+    PROPERTIES COMPILE_FLAGS "/DUNICODE"
-+  )
-+endif()
-+
- set(PDAL_HDRS
-   qgspdalprovider.h
-   qgspdalindexingtask.h

src/qgis-qt6-dev/osgeo4w/patch

@@ -24,36 +24,6 @@ index 29ddf2602ce..78c2f124db4 100644
  ENDIF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
 
 
-diff --git a/external/untwine/untwine/windows/mapfile.hpp b/external/untwine/untwine/windows/mapfile.hpp
-index abd7dcfbc08..8cbc4b93b20 100644
---- a/external/untwine/untwine/windows/mapfile.hpp
-+++ b/external/untwine/untwine/windows/mapfile.hpp
-@@ -1,6 +1,6 @@
- #pragma once
-
--#include <Windows.h>
-+#include <windows.h>
- #include <io.h>
- #include <fcntl.h>
-
-diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
-index c633fcd974a..751f0ee52cd 100644
---- a/src/analysis/CMakeLists.txt
-+++ b/src/analysis/CMakeLists.txt
-@@ -483,6 +483,13 @@ if (WITH_PDAL AND PDAL_2_5_OR_HIGHER)
-   include_directories(
-     ${CMAKE_SOURCE_DIR}/external/untwine/api
-   )
-+
-+  IF(MSVC)
-+    set_source_files_properties(
-+      ${CMAKE_SOURCE_DIR}/external/untwine/api/QgisUntwine.cpp
-+      PROPERTIES COMPILE_FLAGS "/DUNICODE"
-+    )
-+  endif()
- endif()
-
- include_directories(SYSTEM ${SPATIALINDEX_INCLUDE_DIR})
 diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
 index b042c860811..d3a4910a039 100644
 --- a/src/app/CMakeLists.txt
@@ -93,23 +63,6 @@ index c50a1c681e3..2e58fb609f5 100644
  #include <sqlite3.h>
 
  #ifdef HAVE_SPATIALITE
-@@ -5503,8 +5493,14 @@ QString QgisApp::getVersionString()
-   versionString += QLatin1String( "</td></tr><tr>" );
-
-   // GDAL version
--  const QString gdalVersionCompiled { GDAL_RELEASE_NAME };
--  const QString gdalVersionRunning { GDALVersionInfo( "RELEASE_NAME" ) };
-+  QString gdalVersionCompiled { GDAL_RELEASE_NAME };
-+#if defined(GDAL_RELEASE_NICKNAME)
-+  gdalVersionCompiled += QStringLiteral( " \"%1\"" ).arg( QStringLiteral( GDAL_RELEASE_NICKNAME ) );
-+#endif
-+  QString gdalVersionRunning { GDALVersionInfo( "RELEASE_NAME" ) };
-+  if ( atoi( GDALVersionInfo("VERSION_NUM") ) >= GDAL_COMPUTE_VERSION( 3, 11, 0 ) )
-+    gdalVersionRunning += QStringLiteral( " \"%1\"" ).arg( GDALVersionInfo("RELEASE_NICKNAME") );
-+
-   versionString += QStringLiteral( "<td>%1</td><td>%2" ).arg( tr( "GDAL/OGR version" ), gdalVersionCompiled );
-   if ( gdalVersionCompiled != gdalVersionRunning )
-   {
 @@ -5569,7 +5565,7 @@ QString QgisApp::getVersionString()
    // postgres
    versionString += QStringLiteral( "<td>%1</td><td>" ).arg( tr( "PostgreSQL client version" ) );
@@ -119,21 +72,3 @@ index c50a1c681e3..2e58fb609f5 100644
  #else
    versionString += tr( "No support" );
  #endif
-diff --git a/src/providers/pdal/CMakeLists.txt b/src/providers/pdal/CMakeLists.txt
-index ff970745fd2..05c49ec6cfa 100644
---- a/src/providers/pdal/CMakeLists.txt
-+++ b/src/providers/pdal/CMakeLists.txt
-@@ -14,6 +14,13 @@ set(PDAL_SRCS
-   ${CMAKE_SOURCE_DIR}/external/untwine/api/QgisUntwine.cpp
- )
-
-+IF(MSVC)
-+  set_source_files_properties(
-+    ${CMAKE_SOURCE_DIR}/external/untwine/api/QgisUntwine.cpp
-+    PROPERTIES COMPILE_FLAGS "/DUNICODE"
-+  )
-+endif()
-+
- set(PDAL_HDRS
-   qgspdalprovider.h
-   qgspdalindexingtask.h