Up to QGIS 3.22.2 with Python binding

.gitignore

@@ -28,6 +28,7 @@ Makefile*
 # QtCreator
 
 *.autosave
+.idea/
 
 # QtCtreator Qml
 *.qmlproject.user
@@ -38,6 +39,7 @@ CMakeLists.txt.user
 
 # Installer
 build/
+build_release/
 inst/
 debian/
 obj-*-linux-gnu/

cmake/PyQtMacros.cmake

@@ -37,7 +37,8 @@ MACRO(PYQT_WRAP_UI outfiles )
         file(COPY ${CMAKE_SOURCE_DIR}/scripts/pyuic_wrapper.sh
                   ${CMAKE_SOURCE_DIR}/scripts/pyuic_wrapper.py
             DESTINATION ${CMAKE_BINARY_DIR}/scripts/
-            FILE_PERMISSIONS OWNER_EXECUTE
+            FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
+                             GROUP_EXECUTE GROUP_READ
         )
     endif()
     SET(PYUIC_WRAPPER "${CMAKE_BINARY_DIR}/scripts/pyuic_wrapper.sh")

cmake/modules/linker.cmake

@@ -0,0 +1,42 @@
+macro(set_alternate_linker linker)
+  if( NOT "${USE_ALTERNATE_LINKER}" STREQUAL "${USE_ALTERNATE_LINKER_OLD_CACHED}" )
+    unset(LINKER_EXECUTABLE CACHE)
+  endif()
+  find_program(LINKER_EXECUTABLE ld.${USE_ALTERNATE_LINKER} ${USE_ALTERNATE_LINKER})
+  if(LINKER_EXECUTABLE)
+    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+      if( "${CMAKE_CXX_COMPILER_VERSION}" VERSION_GREATER_EQUAL 12.0.0)
+        add_link_options("--ld-path=${LINKER_EXECUTABLE}")
+      else()
+        add_link_options("-fuse-ld=${LINKER_EXECUTABLE}")
+      endif()
+    elseif( "${linker}" STREQUAL "mold" AND
+            "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND
+            "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 12.1.0)
+      # GCC before 12.1.0: -fuse-ld does not accept mold as a valid argument,
+      # so you need to use -B option instead.
+      get_filename_component(_dir ${LINKER_EXECUTABLE} DIRECTORY)
+      get_filename_component(_dir ${_dir} DIRECTORY)
+      if( EXISTS "${_dir}/libexec/mold/ld" )
+          add_link_options(-B "${_dir}/libexec/mold")
+      else()
+          message(FATAL_ERROR "Cannot find ${_dir}/libexec/mold/ld")
+      endif()
+    else()
+      add_link_options("-fuse-ld=${USE_ALTERNATE_LINKER}")
+    endif()
+    message(STATUS "Using alternative linker: ${LINKER_EXECUTABLE}")
+  else()
+    message(FATAL_ERROR "Cannot find alternative linker ${USE_ALTERNATE_LINKER}")
+  endif()
+endmacro()
+
+if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" )
+  set(USE_ALTERNATE_LINKER "" CACHE STRING "Use alternate linker. Leave empty for system default; potential alternatives are 'gold', 'lld', 'bfd', 'mold'")
+  if(NOT "${USE_ALTERNATE_LINKER}" STREQUAL "")
+    set_alternate_linker(${USE_ALTERNATE_LINKER})
+  endif()
+  set(USE_ALTERNATE_LINKER_OLD_CACHED
+      ${USE_ALTERNATE_LINKER}
+      CACHE INTERNAL "Previous value of USE_ALTERNATE_LINKER")
+endif()

cmake/util.cmake

@@ -32,9 +32,9 @@ function(check_version major minor patch qgis_major qgis_minor qgis_patch qgis_n
     # QGIS_PORT is the version of QGIS this release is bound to
 
     set(QGIS_MAJOR 3)
-    set(QGIS_MINOR 24)
-    set(QGIS_PATCH 0)
-    set(QGIS_NAME "Tisler")
+    set(QGIS_MINOR 32)
+    set(QGIS_PATCH 2)
+    set(QGIS_NAME "Lima")
 
     set(${major} ${VERSION_MAJOR} PARENT_SCOPE)
     set(${minor} ${VERSION_MINOR} PARENT_SCOPE)

cmake_templates/qgsconfig.h.in

@@ -95,14 +95,18 @@
 
 #cmakedefine QGISDEBUG
 
+#cmakedefine AGGRESSIVE_SAFE_MODE
+
 #cmakedefine HAVE_QUICK
 
-#cmakedefine HAVE_QT5SERIALPORT
+#cmakedefine HAVE_QTSERIALPORT
 
 #cmakedefine HAVE_STATIC_PROVIDERS
 
 #cmakedefine HAVE_EPT
 
+#cmakedefine HAVE_COPC
+
 #cmakedefine HAVE_PDAL_QGIS
 #define PDAL_VERSION "${PDAL_VERSION}"
 #define PDAL_VERSION_MAJOR_INT ${PDAL_VERSION_MAJOR}

doc/CONTRIBUTORS

@@ -6,14 +6,17 @@
 #
 Alessandro Pasotti
 Alexandre Neto
+Andrea Giudiceandrea
 Andreas Neumann
 Andres Manz
 Anita Graser
+Arnaud Morvan
 Arthur Nanni
 Arunmozhi
 Baba Yoshihiko
 Belgacem Nedjima
 Bernhard Ströbl
+Björn Hinkeldey
 Brent Wood
 Brook Milligan
 Carl Anderson
@@ -73,6 +76,7 @@ Mayeul Kauffmann
 Michael Douchin
 Milena Nowotarska
 Minoru Akagi
+Nicolas Godet
 Nikos Alexandris
 Paolo Cavallini
 Patrice Pineault
@@ -95,6 +99,7 @@ Steven Mizuno
 Tamas Szekeres
 Tim Tisler
 Tom Russo
+Tomas Johansson
 Tyler Mitchell
 Vincent Cloarec
 Vita Cizek