Merge branch 'master' into point-clouds-3d-gui

qgis · Nov 13, 2020 · 06f4d44 · 06f4d44
2 parents c220bb4 + b327b67
commit 06f4d44
Show file tree

Hide file tree

Showing 342 changed files with 8,410 additions and 4,617 deletions.
diff --git a/.ci/azure-pipelines/azure-pipelines.yml b/.ci/azure-pipelines/azure-pipelines.yml
@@ -71,9 +71,9 @@ jobs:
       esac
 
       target=Experimental
-      major=$(sed -ne 's/^SET(CPACK_PACKAGE_VERSION_MAJOR "\([0-9]*\)")\s*$/\1/p' CMakeLists.txt)
-      minor=$(sed -ne 's/^SET(CPACK_PACKAGE_VERSION_MINOR "\([0-9]*\)")\s*$/\1/p' CMakeLists.txt)
-      patch=$(sed -ne 's/^SET(CPACK_PACKAGE_VERSION_PATCH "\([0-9]*\)")\s*$/\1/p' CMakeLists.txt)
+      major=$(sed -ne 's/^SET(CPACK_PACKAGE_VERSION_MAJOR "\([0-9]*\)")\s*$/\1/ip' CMakeLists.txt)
+      minor=$(sed -ne 's/^SET(CPACK_PACKAGE_VERSION_MINOR "\([0-9]*\)")\s*$/\1/ip' CMakeLists.txt)
+      patch=$(sed -ne 's/^SET(CPACK_PACKAGE_VERSION_PATCH "\([0-9]*\)")\s*$/\1/ip' CMakeLists.txt)
       binary=$(curl --location-trusted http://ftp.osuosl.org/pub/osgeo/download/osgeo4w/$OSGEO4W_ARCH/release/qgis/$OSGEO4W_PKG/LATEST.sha | sed -e "s/:.*$//")
       (( binary++ )) || true
 

diff --git a/.ci/qt5_14/Dockerfile b/.ci/qt5_14/Dockerfile
@@ -14,6 +14,7 @@ RUN dnf -y install \
     libpq-devel \
     libspatialite-devel \
     libzip-devel \
+    libzstd-devel \
     ninja-build \
     proj-devel \
     protobuf-devel \

diff --git a/.ci/travis/linux/docker-compose.travis.yml b/.ci/travis/linux/docker-compose.travis.yml
@@ -12,7 +12,7 @@ services:
       - SSL_CA_FILE=/etc/ssl/certs/issuer_ca_cert.pem
 
   oracle:
-    image: oslandia/oracle-for-qgis-tests:18.4.0-xe
+    image: oslandia/oracle-for-qgis-tests-configured:18.4.0-xe
     environment:
       - ORACLE_SID=XE
       - ORACLE_PWD=adminpass

diff --git a/.docker/qgis3-build-deps-focal.dockerfile b/.docker/qgis3-build-deps-focal.dockerfile
@@ -57,6 +57,7 @@ RUN  apt-get update \
     libsqlite3-dev \
     libsqlite3-mod-spatialite \
     libzip-dev \
+    libzstd-dev \
     lighttpd \
     locales \
     ninja-build \
@@ -73,6 +74,7 @@ RUN  apt-get update \
     python3-gdal \
     python3-mock \
     python3-nose2 \
+    python3-owslib \
     python3-pip \
     python3-psycopg2 \
     python3-pyqt5 \
@@ -113,7 +115,6 @@ RUN  apt-get update \
     mock \
     future \
     termcolor \
-    owslib \
     oauthlib \
     pyopenssl \
   && apt-get clean

diff --git a/.docker/qgis3-build-deps.dockerfile b/.docker/qgis3-build-deps.dockerfile
@@ -58,6 +58,7 @@ RUN  apt-get update \
     libsqlite3-dev \
     libsqlite3-mod-spatialite \
     libzip-dev \
+    libzstd-dev \
     lighttpd \
     locales \
     ninja-build \
@@ -74,6 +75,7 @@ RUN  apt-get update \
     python3-gdal \
     python3-mock \
     python3-nose2 \
+    python3-owslib \
     python3-pip \
     python3-psycopg2 \
     python3-pyproj \
@@ -121,7 +123,6 @@ RUN  apt-get update \
     mock \
     future \
     termcolor \
-    owslib \
     oauthlib \
     pyopenssl \
     pep8 \

diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
@@ -47,12 +47,13 @@ jobs:
           mkdir -p ../build-QGIS
           cd ../build-QGIS
 
+          # FIXME: PDAL disable because of #39971
           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 \
-               -DWITH_PDAL=TRUE \
+               -DWITH_PDAL=FALSE \
                -DWITH_EPT=TRUE \
                $QGIS_DIR