From 86f1e7915364b8a932be5b3961fb77515af0830c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 9 Jun 2021 13:42:21 +0100
Subject: [PATCH] try to allow building against firebird 4

---
 0001-allow-system-firebird-4.patch | 31 ++++++++++++++++++++++++++++++
 libreoffice.spec                   |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 0001-allow-system-firebird-4.patch

diff --git a/0001-allow-system-firebird-4.patch b/0001-allow-system-firebird-4.patch
new file mode 100644
index 0000000..d3092d0
--- /dev/null
+++ b/0001-allow-system-firebird-4.patch
@@ -0,0 +1,31 @@
+From 66ea8a7caf3edc9bcdb2bfea58cb0fcf0b40b898 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Wed, 9 Jun 2021 13:41:30 +0100
+Subject: [PATCH] allow system firebird 4
+
+Change-Id: I330065f61d2d0fdfeeaeba4ee2e739e222d1c665
+---
+ configure.ac | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 077684be36b4..e860d4a5f199 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -10103,11 +10103,10 @@ if test "$enable_firebird_sdbc" = "yes" ; then
+         AC_MSG_CHECKING([Firebird version])
+         if test -n "${FIREBIRD_VERSION}"; then
+             FIREBIRD_MAJOR=`echo $FIREBIRD_VERSION | cut -d"." -f1`
+-            FIREBIRD_MINOR=`echo $FIREBIRD_VERSION | cut -d"." -f2`
+-            if test "$FIREBIRD_MAJOR" -eq "3" -a "$FIREBIRD_MINOR" -eq "0"; then
++            if test "$FIREBIRD_MAJOR" -ge "3"; then
+                 AC_MSG_RESULT([OK])
+             else
+-                AC_MSG_ERROR([Ensure firebird 3.0.x is installed])
++                AC_MSG_ERROR([Ensure firebird >= 3 is installed])
+             fi
+         else
+             save_CFLAGS="${CFLAGS}"
+-- 
+2.31.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 6d2ac21..39cfce8 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -256,6 +256,7 @@ Patch8: 0001-gtk3-workaround-missing-gdk_threads_enter-calls-in-e.patch
 Patch9: 0001-Replace-inet_ntoa-with-inet_ntop.patch
 Patch10: 0001-dtd-files-are-not-xml-files-and-shouldn-t-have-xml-h.patch
 Patch11: 0002-xmllint-Namespace-prefix-menu-on-menuseparator-is-no.patch
+Patch12: 0001-allow-system-firebird-4.patch
 
 # not upstreamed
 Patch500: 0001-disable-libe-book-support.patch