Merge branch 'qgis:master' into master

.github/workflows/mingw64.yml

@@ -37,10 +37,10 @@ jobs:
         run: printf '[main]\ngpgcheck=True\ninstallonly_limit=3\nclean_requirements_on_remove=True\nbest=False\nskip_if_unavailable=True\ntsflags=nodocs' > /etc/dnf/dnf.conf
 
       - name: Update system
-        run: dnf5 -y update
+        run: dnf -y update
 
       - name: Install core dependencies
-        run: dnf5 -y install zip
+        run: dnf -y install zip
 
       - name: Install build dependencies
         run: ./ms-windows/mingw/mingwdeps.sh

CMakeLists.txt

@@ -358,10 +358,10 @@ if(WITH_CORE)
   endif()
 
   # required
-  find_package(Proj)
-  find_package(GEOS)
-  find_package(GDAL)
-  find_package(Expat REQUIRED)
+  find_package(Proj REQUIRED)
+  find_package(GEOS REQUIRED)
+  find_package(GDAL REQUIRED)
+  find_package(EXPAT REQUIRED)
   find_package(Spatialindex REQUIRED)
   find_package(LibZip REQUIRED)
 
@@ -403,10 +403,6 @@ if(WITH_CORE)
     set (HAVE_SPATIALITE TRUE)
   endif()
 
-  if (NOT PROJ_FOUND OR NOT GEOS_FOUND OR NOT GDAL_FOUND)
-    message (SEND_ERROR "Some dependencies were not found! Proj: ${PROJ_FOUND}, Geos: ${GEOS_FOUND}, GDAL: ${GDAL_FOUND}")
-  endif()
-
   if (POSTGRES_FOUND)
     # following variable is used in qgsconfig.h
     set (HAVE_POSTGRESQL TRUE)

INSTALL.md

@@ -19,6 +19,7 @@ Building QGIS from source - step by step
        * [3.8.1. Compiling with 3D on old Debian based distributions](#381-compiling-with-3d-on-old-debian-based-distributions)
    * [3.9. Building different branches](#39-building-different-branches)
    * [3.10. Building Debian packages](#310-building-debian-packages)
+       * [3.10.1. Building packages with oracle support](#3101-building-packages-with-oracle-support)
    * [3.11. On Fedora Linux](#311-on-fedora-linux)
        * [3.11.1. Install build dependencies](#3111-install-build-dependencies)
        * [3.11.2. Suggested system tweaks](#3112-suggested-system-tweaks)
@@ -405,20 +406,27 @@ Instead of creating a personal installation as in the previous step you can
 also create debian package. This is done from the QGIS root directory, where
 you'll find a debian directory.
 
-First you need to install the [build dependencies](#33-install-build-dependencies)
-and setup a changelog entry for your distribution. For example for Debian Bookworm:
+First setup a changelog entry for your distribution. For example for Debian Bookworm:
 
 ```bash
 dch -l ~bookworm --force-distribution --distribution bookworm "bookworm build"
 ```
 
+You also need to install the [build dependencies](#33-install-build-dependencies).
+Alternatively use:
+
+```bash
+debian/rules templates
+sudo mk-build-deps -i
+```
+
 The QGIS packages will be created with:
 
 ```bash
 dpkg-buildpackage -us -uc -b
 ```
 
-**Note:** Install `devscripts` to get `dch`.
+**Note:** Install `devscripts` to get `dch` and `mk-build-deps`.
 
 **Note:** If you have `libqgis1-dev` installed, you need to remove it first
 using `dpkg -r libqgis1-dev`.  Otherwise `dpkg-buildpackage` will complain about a
@@ -436,6 +444,28 @@ Install them using `dpkg`.  E.g.:
 sudo debi
 ```
 
+### 3.10.1. Building packages with Oracle support
+
+To build packages with Oracle support you need the Oracle libraries (currently
+21.11) as additional build dependencies:
+
+```bash
+curl -JLO https://download.oracle.com/otn_software/linux/instantclient/2111000/oracle-instantclient-devel-21.11.0.0.0-1.el8.x86_64.rpm
+curl -JLO https://download.oracle.com/otn_software/linux/instantclient/2111000/oracle-instantclient-basiclite-21.11.0.0.0-1.el8.x86_64.rpm
+sudo apt install alien
+fakeroot alien oracle-instantclient-devel-21.11.0.0.0-1.el8.x86_64.rpm oracle-instantclient-basiclite-21.11.0.0.0-1.el8.x86_64.rpm
+sudo dpkg -i oracle-instantclient-devel_21.11.0.0.0-2_amd64.deb oracle-instantclient-basiclite_21.11.0.0.0-2_amd64.deb
+```
+
+(if the client version changes it's necessary to adapt `ORACLE_INCLUDEDIR` and `ORACLE_LIBDIR` accordingly)
+
+The packaging files enable Oracle support if the distribution contains "-oracle":
+
+```bash
+dch -l ~sid~oracle --force-distribution --distribution sid-oracle "sid build with oracle"                                                                                                                      │
+dpkg-buildpackage -us -uc -b
+```
+
 ## 3.11. On Fedora Linux
 
 We assume that you have the source code of QGIS ready and created a
@@ -754,10 +784,10 @@ git clone git://github.com/qgis/QGIS.git
 ## 5.5. Configure the build
 
 CMake supports out of source build so we will create a 'build' dir for the
-build process. OS X uses ${HOME}/Applications as a standard user app folder (it
+build process. OS X uses `${HOME}/Applications` as a standard user app folder (it
 gives it the system app folder icon).  If you have the correct permissions you
-may want to build straight into your /Applications folder. The instructions
-below assume you are building into a ${HOME}/Applications directory.
+may want to build straight into your `/Applications` folder. The instructions
+below assume you are building into a `${HOME}/Applications` directory.
 
 In a Terminal cd to the qgis source folder previously downloaded, then: