diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-02-06 12:00:47 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-02-06 12:00:47 +0000 |
| commit | 41daf47e201a1088efd6cb9071465aed0fff6907 (patch) | |
| tree | 371421dbc3c11e203a80fb1ebaa5bb7fbab7906f /user/libreoffice/disable-mysqlc.patch | |
| parent | 204843f672d41ab08c1ede03eaa5f032691bfdb3 (diff) | |
| parent | 00075f842380bff25a1b88a27056973d0341fb31 (diff) | |
| download | packages-41daf47e201a1088efd6cb9071465aed0fff6907.tar.gz packages-41daf47e201a1088efd6cb9071465aed0fff6907.tar.bz2 packages-41daf47e201a1088efd6cb9071465aed0fff6907.tar.xz packages-41daf47e201a1088efd6cb9071465aed0fff6907.zip | |
Merge branch 'libreoffice' into 'master'
Bump LibreOffice to 6.4.0.3
See merge request adelie/packages!334
Diffstat (limited to 'user/libreoffice/disable-mysqlc.patch')
| -rw-r--r-- | user/libreoffice/disable-mysqlc.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/user/libreoffice/disable-mysqlc.patch b/user/libreoffice/disable-mysqlc.patch deleted file mode 100644 index adcdd4275..000000000 --- a/user/libreoffice/disable-mysqlc.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 \ |