Merge branch 'master' into pr-test

.github/workflows/osgeo4w.yml

@@ -33,8 +33,14 @@ jobs:
       PATH: C:\WINDOWS\system32;C:\Windows
 
     steps:
-      - name: keep original line endings
+      - name: dump environment
         run: |
+          echo ::group::environment
+          set
+          echo ::endgroup::
+
+      - name: keep original line endings
+        run:
           git config --global core.autocrlf false
         env:
           PATH: C:\Program Files\Git\bin;C:\WINDOWS\system32;C:\Windows
@@ -48,53 +54,54 @@ jobs:
       - name: 'setup environment'
         shell: cmd
         run: |
-          echo on
           call bootstrap.cmd none
-          path
-          echo CD:%CD%
-          cygwin\bin\cygpath -aw /bin
           cygwin\bin\cygpath -aw /bin >>%GITHUB_PATH%
 
       - name: 'determine package name'
         shell: bash {0}
         env:
           SHELLOPTS: igncr
         run: |
-          set -xeo pipefail
-          cygpath -aw /
           export PATH=/bin:/usr/bin
+          export HOME=$(cygpath -au "$USERPROFILE")
+
+          set -xeo pipefail
 
-          RELBRANCH=$(git ls-remote --heads $GITHUB_SERVER_URL/$GITHUB_REPOSITORY "refs/heads/release-*_*" | sed -e '/\^{}$/d' -ne 's#^.*refs/heads/release-#release-#p' | sort -V | tail -1)
-          RELBRANCH=${RELBRANCH#*/}
-          LTRTAG=$(git ls-remote --tags $GITHUB_SERVER_URL/$GITHUB_REPOSITORY | sed -e '/\^{}$/d' -ne 's#^.*refs/tags/ltr-#ltr-#p' | sort -V | tail -1)
-          LTRBRANCH=release-${LTRTAG#ltr-}
-          if [ "$RELBRANCH" = "$LTRBRANCH" ]; then
-            LTRTAG=$(git ls-remote --tags $GITHUB_SERVER_URL/$GITHUB_REPOSITORY | sed -e '/\^{}$/d' -ne 's#^.*refs/tags/ltr-#ltr-#p' | sort -V | tail -2 | head -1)
-            LTRBRANCH=release-${LTRTAG#ltr-}
+          REPO=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY
+
+          read RELBRANCH            < <(git ls-remote --heads $REPO "refs/heads/release-*_*" | sed -e '/\^{}$/d' -ne 's#^.*refs/heads/release-#release-#p' | sort -V | tail -1)
+          read OLTRBRANCH LTRBRANCH < <(git ls-remote --tags $REPO | sed -e '/\^{}$/d' -ne 's#^.*refs/tags/ltr-#release-#p' | sort -V | tail -2 | paste -s)
+          [ "$RELBRANCH" != "$LTRBRANCH" ] || LTRBRANCH=$OLTRBRANCH
+
+          if [ -n "$GITHUB_BASE_REF" ]; then
+            branch=$GITHUB_BASE_REF
+            BUILDNAMEPREFIX="PR${GITHUB_EVENT_NUMBER}-"
+          else
+            branch=${GITHUB_REF##*/}
           fi
 
-          case $GITHUB_BASE_REF in
+          case "$branch" in
           $LTRBRANCH|queued_ltr_backports)
             p=qgis-ltr-dev
             ;;
           $RELBRANCH)
             p=qgis-rel-dev
             ;;
           master)
-            # TODO: qgis-qt6-dev
-            p=qgis-dev
+            p="qgis-dev qgis-qt6-dev"
             ;;
           *)
-            echo "Could not determine package name from target branch $GITHUB_BASE_REF"
+            echo "Could not determine package name"
             exit 1
             ;;
           esac
 
+          echo SITE=osgeo4w >>$GITHUB_ENV
           echo PKGS=$p >>$GITHUB_ENV
-
-      - uses: actions/checkout@v4
-        with:
-           path: 'src/${{ env.PKG }}/qgis'
+          echo REPO=$REPO >>$GITHUB_ENV
+          echo REF=$GITHUB_REF >>$GITHUB_ENV
+          echo PKGDESC="QGIS build of $REF" >>$GITHUB_ENV
+          echo BUILDNAMEPREFIX=$BUILDNAMEPREFIX >>$GITHUB_ENV
 
       - name: Restore build cache
         uses: actions/cache/restore@v4
@@ -105,7 +112,8 @@ jobs:
             build-ccache-osgeo4w-master
 
       - name: Build QGIS
-        run: bootstrap.cmd %PKG%
+        shell: cmd
+        run: bootstrap.cmd %PKGS%
 
       - name: Save build cache for push only
         uses: actions/cache/save@v4

CMakeLists.txt

@@ -544,7 +544,7 @@ if(WITH_CORE)
   # get the Qt plugins directory
   get_target_property(QMAKE_EXECUTABLE ${QT_VERSION_BASE}::qmake LOCATION)
 
-  EXEC_PROGRAM(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_PLUGINS" RETURN_VALUE return_code OUTPUT_VARIABLE DEFAULT_QT_PLUGINS_DIR )
+  execute_process(COMMAND ${QMAKE_EXECUTABLE} -query QT_INSTALL_PLUGINS RESULT_VARIABLE return_code OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE DEFAULT_QT_PLUGINS_DIR )
   set (QT_PLUGINS_DIR ${DEFAULT_QT_PLUGINS_DIR} CACHE STRING "Path to installation directory for Qt Plugins. Defaults to Qt native plugin directory")
 
   if (BUILD_WITH_QT6)
@@ -1102,7 +1102,7 @@ if (WITH_CORE AND WITH_BINDINGS)
   include(SIPMacros)
 
   set(SIP_INCLUDES ${PYQT_SIP_DIR} ${CMAKE_SOURCE_DIR}/python)
-  set(SIP_CONCAT_PARTS 25)
+  set(SIP_CONCAT_PARTS 26)
 
   if (NOT BINDINGS_GLOBAL_INSTALL)
     set(Python_SITEARCH ${QGIS_DATA_DIR}/python)

cmake/FindGDAL.cmake

@@ -98,9 +98,8 @@ if(NOT GDAL_FOUND)
         IF (GDAL_CONFIG) 
 
           ## extract gdal version 
-          EXEC_PROGRAM(${GDAL_CONFIG}
-              ARGS --version
-              OUTPUT_VARIABLE GDAL_VERSION )
+          execute_process(COMMAND ${GDAL_CONFIG} --version
+              OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GDAL_VERSION )
           STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1" GDAL_VERSION_MAJOR "${GDAL_VERSION}")
           STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2" GDAL_VERSION_MINOR "${GDAL_VERSION}")
           STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3" GDAL_VERSION_MICRO "${GDAL_VERSION}")
@@ -123,9 +122,8 @@ if(NOT GDAL_FOUND)
           ENDIF( (GDAL_VERSION_MAJOR EQUAL 3) AND (GDAL_VERSION_MINOR EQUAL 0) AND (GDAL_VERSION_MICRO LESS 3) )
 
           # set INCLUDE_DIR to prefix+include
-          EXEC_PROGRAM(${GDAL_CONFIG}
-              ARGS --prefix
-              OUTPUT_VARIABLE GDAL_PREFIX)
+          execute_process(COMMAND ${GDAL_CONFIG} --prefix
+              OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GDAL_PREFIX)
           #SET(GDAL_INCLUDE_DIR ${GDAL_PREFIX}/include CACHE STRING INTERNAL)
           FIND_PATH(GDAL_INCLUDE_DIR 
               gdal.h 
@@ -136,9 +134,8 @@ if(NOT GDAL_FOUND)
               )
 
           ## extract link dirs for rpath  
-          EXEC_PROGRAM(${GDAL_CONFIG}
-              ARGS --libs
-              OUTPUT_VARIABLE GDAL_CONFIG_LIBS )
+          execute_process(COMMAND ${GDAL_CONFIG} --libs
+              OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GDAL_CONFIG_LIBS )
 
           ## split off the link dirs (for rpath)
           ## use regular expression to match wildcard equivalent "-L*<endchar>"

cmake/FindGEOS.cmake

@@ -86,9 +86,8 @@ if(NOT GEOS_FOUND)
 
         IF (GEOS_CONFIG)
 
-          EXEC_PROGRAM(${GEOS_CONFIG}
-              ARGS --version
-              OUTPUT_VARIABLE GEOS_VERSION)
+          execute_process(COMMAND ${GEOS_CONFIG} --version
+              OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GEOS_VERSION)
           STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1" GEOS_VERSION_MAJOR "${GEOS_VERSION}")
           STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2" GEOS_VERSION_MINOR "${GEOS_VERSION}")
 
@@ -97,9 +96,8 @@ if(NOT GEOS_FOUND)
           ENDIF (GEOS_VERSION_MAJOR LESS 3 OR (GEOS_VERSION_MAJOR EQUAL 3 AND GEOS_VERSION_MINOR LESS 9) )
 
           # set INCLUDE_DIR to prefix+include
-          EXEC_PROGRAM(${GEOS_CONFIG}
-              ARGS --prefix
-              OUTPUT_VARIABLE GEOS_PREFIX)
+          execute_process(COMMAND ${GEOS_CONFIG} --prefix
+              OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GEOS_PREFIX)
 
           FIND_PATH(GEOS_INCLUDE_DIR
               geos_c.h
@@ -109,9 +107,8 @@ if(NOT GEOS_FOUND)
               )
 
           ## extract link dirs for rpath
-          EXEC_PROGRAM(${GEOS_CONFIG}
-              ARGS --libs
-              OUTPUT_VARIABLE GEOS_CONFIG_LIBS )
+          execute_process(COMMAND ${GEOS_CONFIG} --libs
+              OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GEOS_CONFIG_LIBS )
 
           ## split off the link dirs (for rpath)
           ## use regular expression to match wildcard equivalent "-L*<endchar>"

cmake/FindPDAL.cmake

@@ -76,9 +76,8 @@ ENDIF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTIL_LIBRARY AND PDAL_BIN)
 
 IF (PDAL_FOUND)
     # extract PDAL version
-    EXEC_PROGRAM(${PDAL_BIN}
-	ARGS --version
-	OUTPUT_VARIABLE PDAL_VERSION_OUT )
+    execute_process(COMMAND ${PDAL_BIN} --version
+        OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE PDAL_VERSION_OUT )
     STRING(REGEX REPLACE "^.*([0-9]+)\\.([0-9]+)\\.([0-9]+).*$" "\\1" PDAL_VERSION_MAJOR "${PDAL_VERSION_OUT}")
     STRING(REGEX REPLACE "^.*([0-9]+)\\.([0-9]+)\\.([0-9]+).*$" "\\2" PDAL_VERSION_MINOR "${PDAL_VERSION_OUT}")
     STRING(REGEX REPLACE "^.*([0-9]+)\\.([0-9]+)\\.([0-9]+).*$" "\\3" PDAL_VERSION_PATCH "${PDAL_VERSION_OUT}")

cmake/FindPostgres.cmake

@@ -68,21 +68,18 @@ ELSE(WIN32)
 
     IF (POSTGRES_CONFIG) 
       # set INCLUDE_DIR
-      EXEC_PROGRAM(${POSTGRES_CONFIG}
-        ARGS --includedir
-        OUTPUT_VARIABLE PG_TMP)
+      execute_process(COMMAND ${POSTGRES_CONFIG} --includedir
+        OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE PG_TMP)
       SET(POSTGRES_INCLUDE_DIR ${PG_TMP} CACHE STRING INTERNAL)
 
       # set LIBRARY_DIR
-      EXEC_PROGRAM(${POSTGRES_CONFIG}
-        ARGS --libdir
-        OUTPUT_VARIABLE PG_TMP)
+      execute_process(COMMAND ${POSTGRES_CONFIG} --libdir
+        OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE PG_TMP)
       IF (APPLE)
         SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.dylib CACHE STRING INTERNAL)
       ELSEIF (CYGWIN)
-        EXEC_PROGRAM(${POSTGRES_CONFIG}
-        ARGS --libs
-        OUTPUT_VARIABLE PG_TMP)
+        execute_process(COMMAND ${POSTGRES_CONFIG} --libs
+            OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE PG_TMP)
 
         STRING(REGEX MATCHALL "[-][L]([^ ;])+" _LDIRS "${PG_TMP}")
         STRING(REGEX MATCHALL "[-][l]([^ ;])+" _LLIBS "${PG_TMP}")

cmake_templates/cmake_uninstall.cmake.in

@@ -7,10 +7,10 @@ STRING(REGEX REPLACE "\n" ";" files "${files}")
 FOREACH(file ${files})
   MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
   IF(EXISTS "$ENV{DESTDIR}${file}")
-    EXEC_PROGRAM(
-      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
-      OUTPUT_VARIABLE rm_out
-      RETURN_VALUE rm_retval
+    execute_process(
+      COMMAND "@CMAKE_COMMAND@" -E remove "$ENV{DESTDIR}${file}"
+      OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE rm_out
+      RESULT_VARIABLE rm_retval
       )
     IF("${rm_retval}" STREQUAL 0)
     ELSE("${rm_retval}" STREQUAL 0)

python/PyQt6/core/auto_additions/qgis.py

@@ -3165,6 +3165,13 @@
 Qgis.ProcessingModelChildParameterSource.__doc__ = "Processing model child parameter sources.\n\n.. versionadded:: 3.34\n\n" + '* ``ModelParameter``: ' + Qgis.ProcessingModelChildParameterSource.ModelParameter.__doc__ + '\n' + '* ``ChildOutput``: ' + Qgis.ProcessingModelChildParameterSource.ChildOutput.__doc__ + '\n' + '* ``StaticValue``: ' + Qgis.ProcessingModelChildParameterSource.StaticValue.__doc__ + '\n' + '* ``Expression``: ' + Qgis.ProcessingModelChildParameterSource.Expression.__doc__ + '\n' + '* ``ExpressionText``: ' + Qgis.ProcessingModelChildParameterSource.ExpressionText.__doc__ + '\n' + '* ``ModelOutput``: ' + Qgis.ProcessingModelChildParameterSource.ModelOutput.__doc__
 # --
 Qgis.ProcessingModelChildParameterSource.baseClass = Qgis
+# monkey patching scoped based enum
+Qgis.ProcessingModelChildAlgorithmExecutionStatus.NotExecuted.__doc__ = "Child has not been executed"
+Qgis.ProcessingModelChildAlgorithmExecutionStatus.Success.__doc__ = "Child was successfully executed"
+Qgis.ProcessingModelChildAlgorithmExecutionStatus.Failed.__doc__ = "Child encountered an error while executing"
+Qgis.ProcessingModelChildAlgorithmExecutionStatus.__doc__ = "Reflects the status of a child algorithm in a Processing model.\n\n.. versionadded:: 3.38\n\n" + '* ``NotExecuted``: ' + Qgis.ProcessingModelChildAlgorithmExecutionStatus.NotExecuted.__doc__ + '\n' + '* ``Success``: ' + Qgis.ProcessingModelChildAlgorithmExecutionStatus.Success.__doc__ + '\n' + '* ``Failed``: ' + Qgis.ProcessingModelChildAlgorithmExecutionStatus.Failed.__doc__
+# --
+Qgis.ProcessingModelChildAlgorithmExecutionStatus.baseClass = Qgis
 QgsProcessingParameterTinInputLayers.Type = Qgis.ProcessingTinInputLayerType
 # monkey patching scoped based enum
 QgsProcessingParameterTinInputLayers.Vertices = Qgis.ProcessingTinInputLayerType.Vertices

python/PyQt6/core/auto_generated/dxf/qgsdxfexport.sip.in

@@ -27,7 +27,7 @@ Exports QGIS layers to the DXF format.
 
     struct DxfLayer
     {
-        DxfLayer( QgsVectorLayer *vl, int layerOutputAttributeIndex = -1, bool buildDDBlocks = true, int ddBlocksMaxNumberOfClasses = -1 );
+        DxfLayer( QgsVectorLayer *vl, int layerOutputAttributeIndex = -1, bool buildDDBlocks = true, int ddBlocksMaxNumberOfClasses = -1, QString overriddenName = QString() );
 
         QgsVectorLayer *layer() const;
 %Docstring
@@ -66,6 +66,13 @@ Returns the maximum number of data defined symbol classes for which blocks are c
 
 :return:
 
+.. versionadded:: 3.38
+%End
+
+        QString overriddenName() const;
+%Docstring
+Returns the overridden layer name to be used in the exported DXF.
+
 .. versionadded:: 3.38
 %End