debian packaging: update to latest oracle client

jef-n · jef-n · commit 982fea528779 · 2023-10-02T12:02:08.000+02:00
diff --git a/INSTALL.md b/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
diff --git a/debian/control.in b/debian/control.in
@@ -40,8 +40,8 @@ Build-Depends:
  ninja-build,
  ocl-icd-opencl-dev,
  opencl-headers,
-#oracle# oracle-instantclient12.1-basiclite,
-#oracle# oracle-instantclient12.1-devel,
+#oracle# oracle-instantclient-basiclite,
+#oracle# oracle-instantclient-devel,
  pkg-config,
  pyqt5-dev-tools,
  pyqt5-dev,
diff --git a/debian/rules b/debian/rules
@@ -136,12 +136,12 @@ endif
 
 ifneq (,$(WITH_ORACLE))
 ifeq ($(DEB_BUILD_ARCH),amd64)
-	ORACLE_INCLUDEDIR=/usr/include/oracle/18.5/client64/
-	ORACLE_LIBDIR=/usr/lib/oracle/18.5/client64/lib/
+	ORACLE_INCLUDEDIR=/usr/include/oracle/21/client64/
+	ORACLE_LIBDIR=/usr/lib/oracle/21/client64/lib/
 endif
 ifeq ($(DEB_BUILD_ARCH),i386)
-	ORACLE_INCLUDEDIR=/usr/include/oracle/18.5/client/
-	ORACLE_LIBDIR=/usr/lib/oracle/18.5/client/lib/
+	ORACLE_INCLUDEDIR=/usr/include/oracle/21/client/
+	ORACLE_LIBDIR=/usr/lib/oracle/21/client/lib/
 endif
 	CMAKE_OPTS += \
 		-DWITH_ORACLE=TRUE \
