summaryrefslogtreecommitdiff
path: root/user/libreoffice/disable-mysqlc.patch
diff options
context:
space:
mode:
Diffstat (limited to 'user/libreoffice/disable-mysqlc.patch')
-rw-r--r--user/libreoffice/disable-mysqlc.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/user/libreoffice/disable-mysqlc.patch b/user/libreoffice/disable-mysqlc.patch
new file mode 100644
index 000000000..adcdd4275
--- /dev/null
+++ b/user/libreoffice/disable-mysqlc.patch
@@ -0,0 +1,26 @@
+From edf9184e33e58e8d0064354016ac56a2f0d9054b Mon Sep 17 00:00:00 2001
+From: Tor Lillqvist <tml@collabora.com>
+Date: Tue, 05 Mar 2019 17:28:55 +0200
+Subject: [PATCH] Make mysqlc conditional on MARIADBC, too
+
+Change-Id: I7e8541b8918ea5011fe9669d11b51c941544f794
+Reviewed-on: https://gerrit.libreoffice.org/68764
+Tested-by: Jenkins
+Reviewed-by: Tor Lillqvist <tml@collabora.com>
+Reviewed-on: https://gerrit.libreoffice.org/68783
+Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
+---
+
+diff --git a/Repository.mk b/Repository.mk
+index 36b35b7..f4899a1 100644
+--- a/Repository.mk
++++ b/Repository.mk
+@@ -404,7 +404,7 @@
+ $(call gb_Helper_optional,SCRIPTING,msforms) \
+ mtfrenderer \
+ $(if $(ENABLE_JAVA),mysql_jdbc) \
+- $(call gb_Helper_optional,DBCONNECTIVITY,mysqlc) \
++ $(call gb_Helper_optional,MARIADBC,$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \
+ numbertext \
+ odbc \
+ odfflatxml \