merge from qgis

.ci/azure-pipelines/azure-pipelines.yml

@@ -1,7 +1,7 @@
 variables:
-  LR: release-3_10
-  LTR: release-3_4
-  CTEST_CUSTOM_TESTS_IGNORE: "ProcessingGdalAlgorithmsRasterTest;ProcessingGdalAlgorithmsVectorTest;ProcessingGrass7AlgorithmsImageryTest;ProcessingGrass7AlgorithmsRasterTest;ProcessingGrass7AlgorithmsVectorTest;ProcessingGuiTest;ProcessingOtbAlgorithmsTest;ProcessingQgisAlgorithmsTestPt1;ProcessingQgisAlgorithmsTestPt2;ProcessingQgisAlgorithmsTestPt3;ProcessingQgisAlgorithmsTestPt4;ProcessingScriptUtilsTest;PyQgsAnnotation;PyQgsAppStartup;PyQgsAuthManagerOAuth2OWSTest;PyQgsAuthManagerPasswordOWSTest;PyQgsAuthManagerPKIOWSTest;PyQgsAuthManagerProxy;PyQgsAuthSettingsWidget;PyQgsAuxiliaryStorage;PyQgsBlockingNetworkRequest;PyQgsExifTools;PyQgsFileDownloader;PyQgsFileUtils;PyQgsGeometryTest;PyQgsImageCache;PyQgsImportIntoPostGIS;PyQgsLayoutAtlas;PyQgsLayoutLegend;PyQgsLayoutMap;PyQgsLayoutMapGrid;PyQgsMapLayer;PyQgsOfflineEditingWFS;PyQgsOGRProvider;PyQgsOGRProviderGpkg;PyQgsOGRProviderSqlite;PyQgsPalLabelingCanvas;PyQgsPalLabelingLayout;PyQgsPalLabelingPlacement;PyQgsPointDisplacementRenderer;PyQgsProject;PyQgsProviderConnectionGpkg;PyQgsProviderConnectionPostgres;PyQgsPythonProvider;PyQgsRasterFileWriter;PyQgsRasterLayer;PyQgsSelectiveMasking;PyQgsServerAccessControlWMSGetlegendgraphic;PyQgsServerApi;PyQgsServerCacheManager;PyQgsServerLocaleOverride;PyQgsServerSecurity;PyQgsServerSettings;PyQgsServerWMS;PyQgsServerWMSDimension;PyQgsServerWMSGetFeatureInfo;PyQgsServerWMSGetLegendGraphic;PyQgsServerWMSGetMap;PyQgsServerWMSGetPrint;PyQgsServerWMTS;PyQgsSettings;PyQgsShapefileProvider;PyQgsSpatialiteProvider;PyQgsSvgCache;PyQgsSymbolLayer;PyQgsTaskManager;PyQgsTextRenderer;PyQgsVectorFileWriter;PyQgsVectorLayer;PyQgsVectorLayerUtils;PyQgsVirtualLayerProvider;PyQgsWFSProviderGUI;PyQgsZipUtils;qgis_3drenderingtest;qgis_alignrastertest;qgis_arcgisrestutilstest;qgis_banned_keywords;qgis_browsermodeltest;qgis_callouttest;qgis_compositionconvertertest;qgis_coordinatereferencesystemtest;qgis_datadefinedsizelegendtest;qgis_datumtransformdialog;qgis_diagramtest;qgis_doxygen_order;qgis_dxfexporttest;qgis_expressiontest;qgis_filedownloader;qgis_geometrycheckstest;qgis_geometrytest;qgis_geonodeconnectiontest;qgis_grassprovidertest7;qgis_imagecachetest;qgis_invertedpolygonrenderertest;qgis_labelingenginetest;qgis_layerdefinitiontest;qgis_layout3dmaptest;qgis_layouthtmltest;qgis_layoutlabeltest;qgis_layoutmapgridtest;qgis_layoutmaptest;qgis_layoutpicturetest;qgis_layoutscalebartest;qgis_layouttabletest;qgis_legendrenderertest;qgis_licenses;qgis_maprendererjobtest;qgis_maprotationtest;qgis_mapsettingsutilstest;qgis_maptooladdfeatureline;qgis_mimedatautilstest;qgis_networkaccessmanagertest;qgis_openclutilstest;qgis_painteffecttest;qgis_pallabelingtest;qgis_processingtest;qgis_projecttest;qgis_qgisappclipboard;qgis_rasterlayersaveasdialog;qgis_shellcheck;qgis_sipify;qgis_sip_include;qgis_sip_uptodate;qgis_spelling;qgis_styletest;qgis_svgcachetest;qgis_taskmanagertest;qgis_transformdialog;qgis_vectorfilewritertest;qgis_wcsprovidertest;qgis_ziplayertest;qgis_meshcalculator;qgis_pointlocatortest;PyQgsExpressionBuilderWidget;PyQgsDatumTransform"
+  LR: release-3_12
+  LTR: release-3_10
+  CTEST_CUSTOM_TESTS_IGNORE: "ProcessingGdalAlgorithmsRasterTest;ProcessingGdalAlgorithmsVectorTest;ProcessingGrass7AlgorithmsImageryTest;ProcessingGrass7AlgorithmsRasterTest;ProcessingGrass7AlgorithmsVectorTest;ProcessingGuiTest;ProcessingOtbAlgorithmsTest;ProcessingQgisAlgorithmsTestPt1;ProcessingQgisAlgorithmsTestPt2;ProcessingQgisAlgorithmsTestPt3;ProcessingQgisAlgorithmsTestPt4;ProcessingScriptUtilsTest;PyQgsAnnotation;PyQgsAppStartup;PyQgsAuthManagerOAuth2OWSTest;PyQgsAuthManagerPasswordOWSTest;PyQgsAuthManagerPKIOWSTest;PyQgsAuthManagerProxy;PyQgsAuthSettingsWidget;PyQgsAuxiliaryStorage;PyQgsBlockingNetworkRequest;PyQgsExifTools;PyQgsFileDownloader;PyQgsFileUtils;PyQgsGeometryTest;PyQgsImageCache;PyQgsImportIntoPostGIS;PyQgsLayoutAtlas;PyQgsLayoutLegend;PyQgsLayoutMap;PyQgsLayoutMapGrid;PyQgsMapLayer;PyQgsOfflineEditingWFS;PyQgsOGRProvider;PyQgsOGRProviderGpkg;PyQgsOGRProviderSqlite;PyQgsPalLabelingCanvas;PyQgsPalLabelingLayout;PyQgsPalLabelingPlacement;PyQgsPointDisplacementRenderer;PyQgsProject;PyQgsProviderConnectionGpkg;PyQgsProviderConnectionPostgres;PyQgsPythonProvider;PyQgsRasterFileWriter;PyQgsRasterLayer;PyQgsSelectiveMasking;PyQgsServerAccessControlWMSGetlegendgraphic;PyQgsServerApi;PyQgsServerCacheManager;PyQgsServerLocaleOverride;PyQgsServerSecurity;PyQgsServerSettings;PyQgsServerWMS;PyQgsServerWMSDimension;PyQgsServerWMSGetFeatureInfo;PyQgsServerWMSGetLegendGraphic;PyQgsServerWMSGetMap;PyQgsServerWMSGetPrint;PyQgsServerWMTS;PyQgsSettings;PyQgsShapefileProvider;PyQgsSpatialiteProvider;PyQgsSvgCache;PyQgsSymbolLayer;PyQgsTaskManager;PyQgsTextRenderer;PyQgsVectorFileWriter;PyQgsVectorLayer;PyQgsVectorLayerUtils;PyQgsVirtualLayerProvider;PyQgsWFSProviderGUI;PyQgsZipUtils;qgis_3drenderingtest;qgis_alignrastertest;qgis_arcgisrestutilstest;qgis_banned_keywords;qgis_browsermodeltest;qgis_callouttest;qgis_compositionconvertertest;qgis_coordinatereferencesystemtest;qgis_datadefinedsizelegendtest;qgis_datumtransformdialog;qgis_diagramtest;qgis_doxygen_order;qgis_dxfexporttest;qgis_expressiontest;qgis_filedownloader;qgis_geometrycheckstest;qgis_geometrytest;qgis_geonodeconnectiontest;qgis_grassprovidertest7;qgis_imagecachetest;qgis_invertedpolygonrenderertest;qgis_labelingenginetest;qgis_layerdefinitiontest;qgis_layout3dmaptest;qgis_layouthtmltest;qgis_layoutlabeltest;qgis_layoutmapgridtest;qgis_layoutmaptest;qgis_layoutpicturetest;qgis_layoutscalebartest;qgis_layouttabletest;qgis_legendrenderertest;qgis_licenses;qgis_maprendererjobtest;qgis_maprotationtest;qgis_mapsettingsutilstest;qgis_maptooladdfeatureline;qgis_mimedatautilstest;qgis_networkaccessmanagertest;qgis_openclutilstest;qgis_painteffecttest;qgis_pallabelingtest;qgis_processingtest;qgis_projecttest;qgis_qgisappclipboard;qgis_rasterlayersaveasdialog;qgis_shellcheck;qgis_sipify;qgis_sip_include;qgis_sip_uptodate;qgis_spelling;qgis_styletest;qgis_svgcachetest;qgis_taskmanagertest;qgis_transformdialog;qgis_vectorfilewritertest;qgis_wcsprovidertest;qgis_ziplayertest;qgis_meshcalculator;qgis_pointlocatortest;PyQgsExpressionBuilderWidget;PyQgsDatumTransform;qgis_vertextool;PyQgsCoordinateOperationWidget;PyQgsProviderConnectionSpatialite;qgis_maptoolsplitpartstest;qgis_vectortilelayertest"
   Agent.Source.Git.ShallowFetchDepth: 120
 
 trigger:
@@ -90,7 +90,7 @@ jobs:
       url=${url//(/%28}
       url=${url//)/%29}
       url=${url// /+}
-      url="https://cdash.orfeo-toolbox.org/index.php?project=QGIS&filtercombine=and&filtercombine=and&filtercombine=and&filtercombine=and&filtercombine=and&filtercombine=and&filtercombine=and&filtercombine=and&filtercombine=and&filtercount=2&showfilters=1&filtercombine=and&field1=buildname&compare1=61&value1=$url&field2=site&compare2=61&value2=azure-pipelines"
+      url="https://cdash.orfeo-toolbox.org/index.php?project=QGIS&filtercombine=and&filtercombine=and&filtercombine=and&filtercombine=and&filtercombine=and&filtercombine=and&filtercombine=and&filtercombine=and&filtercombine=and&filtercombine=and&filtercombine=and&filtercombine=and&filtercombine=and&filtercombine=and&filtercombine=and&filtercombine=and&filtercount=4&showfilters=0&filtercombine=and&field1=buildname&compare1=61&value1=$url&field2=site&compare2=65&value2=azure-pipelines&field3=buildstarttime&compare3=83&value3=$(date +%Y-%m-%d --date=yesterday)&field4=buildstarttime&compare4=84&value4=$(date +%Y-%m-%d --date=tomorrow)"
 
       echo "##vso[task.setvariable variable=TARGET]$target"
       echo "##vso[task.setvariable variable=OSGEO4W_PKG]$OSGEO4W_PKG"
@@ -101,7 +101,7 @@ jobs:
       echo "##vso[task.setvariable variable=BINARY]$binary"
       echo "##vso[task.setvariable variable=VERSION]$version"
       echo "##vso[task.setvariable variable=BUILDNAME]$buildname"
-      echo "##vso[task.setvariable variable=DASHURL]$url"
+      echo "##vso[task.setvariable variable=DASHURL]${url//&/^&}"
 
     displayName: 'Setup build variables'
 
@@ -183,7 +183,7 @@ jobs:
       cd ms-windows\osgeo4w
       touch skippackage
       set OSGEO4W_CXXFLAGS=/MD /MP /Od /D NDEBUG
-      @echo "##[section] %OSGEO4W_ARCH% results available at %DASHURL%"
+      @echo ##[section]%OSGEO4W_ARCH% results available at %DASHURL%
       package-nightly.cmd %VERSION% %BINARY% %OSGEO4W_PKG% %OSGEO4W_ARCH% %BUILD_SOURCEVERSION:~0,10% azure-pipelines
     displayName: 'Building QGIS'
 

.ci/travis/linux/scripts/test_blacklist.txt

@@ -21,3 +21,5 @@ qgis_openclutilstest
 # Relies on a broken/unreliable 3rd party service
 qgis_layerdefinition
 
+# MSSQL requires the MSSQL docker
+PyQgsProviderConnectionMssql

.ci/travis/linux/scripts/test_flaky.txt

@@ -4,9 +4,6 @@ qgis_wcsprovidertest
 PyQgsWFSProviderGUI
 qgis_ziplayertest
 
-# Flaky, see https://dash.orfeo-toolbox.org/testDetails.php?test=63061783&build=297405
-PyQgsSpatialiteProvider
-
 # Flaky, the ms odbc driver crashes a lot on the ubuntu docker image. Retest when
 # the docker base image is upgraded
 PyQgsMssqlProvider

.docker/qgis.dockerfile

@@ -54,6 +54,9 @@ RUN cmake \
  && SUCCESS=OK \
  && timeout ${BUILD_TIMEOUT}s ninja install || SUCCESS=TIMEOUT \
  && echo "$SUCCESS" > /QGIS/build_exit_value
+
+# Additional run-time dependencies
+RUN pip3 install jinja2 pygments
 
 ################################################################################
 ARG DELETE_CACHE=FALSE
@@ -77,7 +80,6 @@ COPY .docker/qgis_resources/supervisor/ /etc/supervisor
 # needed to find PyQt wrapper provided by QGIS
 ENV PYTHONPATH=/usr/share/qgis/python/:/usr/share/qgis/python/plugins:/usr/lib/python3/dist-packages/qgis:/usr/share/qgis/python/qgis
 
-
 WORKDIR /
 
 # Run supervisor

.docker/qgis3-build-deps.dockerfile

@@ -35,6 +35,7 @@ RUN  apt-get update \
     libgsl-dev \
     libpq-dev \
     libproj-dev \
+    libprotobuf-dev \
     libqca-qt5-2-dev \
     libqca-qt5-2-plugins \
     libqt53drender5 \
@@ -63,6 +64,7 @@ RUN  apt-get update \
     pkg-config \
     poppler-utils \
     postgresql-client \
+    protobuf-compiler \
     pyqt5-dev \
     pyqt5-dev-tools \
     pyqt5.qsci-dev \
@@ -157,7 +159,7 @@ RUN locale-gen
 RUN echo "alias python=python3" >> ~/.bash_aliases
 
 # OTB: download and install otb packages for QGIS tests
-RUN curl -k https://www.orfeo-toolbox.org/packages/OTB-7.0.0-Linux64.run -o /tmp/OTB-Linux64.run && sh /tmp/OTB-Linux64.run --target /opt/otb
+RUN curl -k https://www.orfeo-toolbox.org/packages/OTB-7.1.0-Linux64.run -o /tmp/OTB-Linux64.run && sh /tmp/OTB-Linux64.run --target /opt/otb
 ENV OTB_INSTALL_DIR=/opt/otb
 
 # Clazy

.docker/qgis_resources/test_runner/qgis_setup.sh

@@ -44,7 +44,12 @@ if [[ -n "$PLUGIN_NAME" ]]; then
     printf "%s=true\n\n" "$PLUGIN_NAME" >> $CONF_MASTER_FILE
     # Install the plugin
     if [ ! -d "${PLUGIN_MASTER_FOLDER}/${PLUGIN_NAME}" ]; then
-        ln -s "/tests_directory/${PLUGIN_NAME}" "${PLUGIN_MASTER_FOLDER}"
+        plugin_dir="/tests_directory/${PLUGIN_NAME}"
+        if [ ! -d "${plugin_dir}" ]; then
+          echo "ERROR: ${plugin_dir} does not exist" >&2
+          exit 1
+        fi
+        ln -s "${plugin_dir}" "${PLUGIN_MASTER_FOLDER}"
         echo "Plugin master folder linked in ${PLUGIN_MASTER_FOLDER}/${PLUGIN_NAME}"
     fi
 fi

.github/ISSUE_TEMPLATE/00_question.md

@@ -0,0 +1,15 @@
+---
+name: ❓ Question about QGIS
+about: ❗️ You should raise your question on another channel.
+labels: "Won't fix"
+
+---
+
+IMPORTANT:
+
+Do NOT use GitHub to post any questions or support requests!
+They will be closed immediately and ignored.
+Questions should go to the qgis-user mailing list at https://lists.osgeo.org/mailman/listinfo/qgis-user
+or other support forums such as https://gis.stackexchange.com/.
+
+GitHub issues are for bug reports and suggestions for new features.

.github/ISSUE_TEMPLATE/05_plugin.md

@@ -0,0 +1,12 @@
+---
+name: 🐞 Bug using a plugin
+about: ❗️ Report to the plugin author instead
+labels: "Won't fix"
+---
+
+IMPORTANT:
+
+If the issue concerns a third party plugin (downloaded with the plugin manager) then it can't be fixed by the QGIS team.
+Please raise your issue in the dedicated bug tracker for that specific plugin (as listed in the plugin's description)
+
+Tickets created here will be closed.

.github/ISSUE_TEMPLATE/bug_report.md → .github/ISSUE_TEMPLATE/10_bug_report.md

@@ -15,8 +15,7 @@ Checklist before submitting
 - [ ] Search through existing issue reports and gis.stackexchange.com to check whether the issue already exists
 - [ ] Test with a [clean new user profile](https://docs.qgis.org/testing/en/docs/user_manual/introduction/qgis_configuration.html?highlight=profile#working-with-user-profiles).
 - [ ] Create a light and self-contained sample dataset and project file which demonstrates the issue
-
-If the issue concerns a **third party plugin**, then it **cannot** be fixed by the QGIS team. Please raise your issue in the dedicated bug tracker for that specific plugin (as listed in the plugin's description). -->
+-->
 
 **Describe the bug**
 <!-- A clear and concise description of what the bug is. -->
@@ -32,7 +31,7 @@ If the issue concerns a **third party plugin**, then it **cannot** be fixed by t
 
 **QGIS and OS versions**
 
-<!-- In the QGIS menu help/about, click in the dialog, Ctrl+A and then Ctrl+C. Finally paste here -->
+<!-- In the QGIS Help menu -> About, click in the table, Ctrl+A and then Ctrl+C. Finally paste here -->
 
 **Additional context**
 

.github/workflows/backport.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Backport Bot
         if: github.event.pull_request.merged && ( ( github.event.action == 'closed' && contains( join( github.event.pull_request.labels.*.name ), 'backport') ) || contains( github.event.label.name, 'backport' ) )
-        uses: Gaurav0/backport@v1.0.24
+        uses: Gaurav0/backport@v1.0.26
         with:
           bot_username: qgis-bot
           bot_token: ddbdec32940df79f1adf2369b4b10f10b5a66f65

.github/workflows/macos-build.yml

@@ -0,0 +1,41 @@
+name: Mac OS build
+on: [push, pull_request]
+env:
+  QT_VERSION: 5.14.1
+  QGIS_DEPS_VERSION: 0.2.2
+
+jobs:
+  mac_os_build:
+    if: github.repository == 'qgis/QGIS'
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: download qgis-deps
+        run: |
+          wget https://qgis.org/downloads/macos/deps/qt-${QT_VERSION}.tar.gz
+          wget https://qgis.org/downloads/macos/deps/qgis-deps-${QGIS_DEPS_VERSION}.tar.gz
+          wget https://qgis.org/downloads/macos/deps/install_qgis_deps-${QGIS_DEPS_VERSION}.bash
+
+      - name: install qgis-deps
+        run: |
+          chmod +x ./install_qgis_deps-${QGIS_DEPS_VERSION}.bash
+          sudo ./install_qgis_deps-${QGIS_DEPS_VERSION}.bash
+
+      - name: create build system
+        run: |
+          QGIS_DIR=`pwd`
+          mkdir -p ../build-QGIS
+          cd ../build-QGIS
+
+          PATH=/opt/QGIS/qgis-deps-${QGIS_DEPS_VERSION}/stage/bin:$PATH \
+          cmake -DQGIS_MAC_DEPS_DIR=/opt/QGIS/qgis-deps-${QGIS_DEPS_VERSION}/stage \
+               -DCMAKE_PREFIX_PATH=/opt/Qt/${QT_VERSION}/clang_64 \
+               -DWITH_BINDINGS=TRUE \
+               -DWITH_3D=TRUE \
+               $QGIS_DIR
+
+      - name: build QGIS
+        run: |
+          cd ../build-QGIS
+          make -j $(sysctl -n hw.ncpu)

.github/workflows/pr-auto-milestone.yml

@@ -76,7 +76,7 @@ jobs:
           echo "RE_RUN_JOB: ${RE_RUN_JOB}"
 
           # Get the base branch
-          BASE_BRANCH=$(echo "${JSON_DATA}" | jq ".repository.pullRequests.edges[] | select( .node.number == ${PR_NUMBER} ) | .node.baseRef.name")
+          BASE_BRANCH=$(echo "${JSON_DATA}" | jq -r ".repository.pullRequests.edges[] | select( .node.number == ${PR_NUMBER} ) | .node.baseRef.name")
           echo "BASE_BRANCH: ${BASE_BRANCH}"
 
           # master => NOTHING, release_3-10 => _10
@@ -124,7 +124,7 @@ jobs:
           MILESTONE_NUMBER_EXISTING: ${{ steps.extract_data.outputs.milestone_number }}
           MILESTONE_NUMBER_CREATED_JSON: ${{ steps.create_milestone.outputs.data }}
         run: |
-          FINAL_MILESTONE_NUMBER=$([[ -n ${MILESTONE_NUMBER_EXISTING} ]] && echo "${MILESTONE_NUMBER_EXISTING}" || $(echo "${MILESTONE_NUMBER_CREATED_JSON}" | jq '.number' ))
+          FINAL_MILESTONE_NUMBER=$([[ -n ${MILESTONE_NUMBER_EXISTING} ]] && echo "${MILESTONE_NUMBER_EXISTING}" || echo $(echo "${MILESTONE_NUMBER_CREATED_JSON}" | jq .number ))
           echo "FINAL_MILESTONE_NUMBER: ${FINAL_MILESTONE_NUMBER}"
           echo "::set-output name=milestone_number::${FINAL_MILESTONE_NUMBER}"
 

.github/workflows/pr_to_doc_issue.yml

@@ -84,7 +84,7 @@ jobs:
           token: ${{ steps.token.outputs.token }}
           owner: qgis
           repo: QGIS-Documentation
-          title: ${{ format('Request in QGIS ({0})', github.event.pull_request.title) }}
+          title: ${{ format('{0} (Request in QGIS)', github.event.pull_request.title) }}
           # do not modify the QGIS version, an action automatically creates a label in the doc repo
           # this is not possible to set labels directly due to security reasons
           # the token is in clear, so no rights are given to qgis-bot

.gitignore

@@ -11,6 +11,7 @@
 *.sortinc
 *.tex
 *.toc
+*.tmp
 *~
 *-stamp
 .*.swp

CMakeLists.txt

@@ -31,6 +31,20 @@ ENDIF (APPLE)
 MATH(EXPR QGIS_VERSION_INT "${CPACK_PACKAGE_VERSION_MAJOR}*10000+${CPACK_PACKAGE_VERSION_MINOR}*100+${CPACK_PACKAGE_VERSION_PATCH}")
 MESSAGE(STATUS "QGIS version: ${COMPLETE_VERSION} ${RELEASE_NAME} (${QGIS_VERSION_INT})")
 
+#############################################################
+IF (APPLE)
+  # QGIS custom dependencies package from qgis/QGIS-Mac-Packager
+  # they can be downloaded from https://qgis.org/downloads/macos/qgis-deps
+  # and extracted to /opt/QGIS/qgis-deps-<deps-version>/stage
+  SET (QGIS_MAC_DEPS_DIR "" CACHE PATH "Path to QGIS Mac custom dependencies directory")
+
+  # Setup LIB_DIR and CMAKE_PREFIX_PATH to help CMake's
+  # find_packages to look for these libraries instead of system libraries
+  IF ( QGIS_MAC_DEPS_DIR )
+    SET(ENV{LIB_DIR} ${QGIS_MAC_DEPS_DIR})
+    LIST(APPEND CMAKE_PREFIX_PATH ${QGIS_MAC_DEPS_DIR})
+  ENDIF ( QGIS_MAC_DEPS_DIR )
+ENDIF (APPLE)
 
 #############################################################
 # Configure OpenCL if available
@@ -331,6 +345,14 @@ IF(WITH_CORE)
     MESSAGE (SEND_ERROR "sqlite3 dependency was not found!")
   ENDIF (NOT SQLITE3_FOUND)
 
+  FIND_PACKAGE(Protobuf REQUIRED)   # for decoding of vector tiles in MVT format
+  MESSAGE(STATUS "Found Protobuf: ${Protobuf_LIBRARIES}")
+  IF (NOT Protobuf_PROTOC_EXECUTABLE)
+    MESSAGE (SEND_ERROR "Protobuf library's 'protoc' tool was not found!")
+  ENDIF ()
+  FIND_PACKAGE(ZLIB REQUIRED)       # for decompression of vector tiles in MBTiles file
+  MESSAGE(STATUS "Found zlib: ${ZLIB_LIBRARIES}")
+
   # optional
   IF (WITH_POSTGRESQL)
     FIND_PACKAGE(Postgres) # PostgreSQL provider
@@ -675,8 +697,9 @@ IF (WITH_CORE)
       SET (QGIS_MACAPP_PREFIX ${CMAKE_INSTALL_PREFIX}/${QGIS_APP_NAME}.app/Contents)
       # common prefix for components, let cmake handle it
       SET (CMAKE_INSTALL_PREFIX ${QGIS_MACAPP_PREFIX}/MacOS)
-      # 4 bundling levels, each includes previous
-      #   0  nothing
+      # 5 bundling levels, each includes previous
+      #  -1  nothing
+      #   0  fixup the library paths for all QGIS libraries with @loader_path
       #   1  Qt frameworks
       #   2  non-system libraries, "standard"
       #   3  non-system frameworks, "standalone"
@@ -838,7 +861,7 @@ ENDIF (DISABLE_DEPRECATED)
 #############################################################
 # Python build dependency
 
-FIND_PACKAGE(PythonInterp 3 REQUIRED)
+FIND_PACKAGE(PythonLibrary REQUIRED)
 
 #############################################################
 # Python bindings