diff options
| author | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
|---|---|---|
| committer | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
| commit | 9297468fa579836e3a6a381b798feb6b78217c2d (patch) | |
| tree | 53168212f427afbcf0693b534530a4af803152e9 /user/libreoffice/disable-mariadbc.patch | |
| parent | a63cc05c53a6f4c22422dc8c69808b14d87a6f6e (diff) | |
| parent | da5a69b65a8791fffa6e93366ee585f87eff136d (diff) | |
| download | packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.gz packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.bz2 packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.xz packages-9297468fa579836e3a6a381b798feb6b78217c2d.zip | |
Merge branch 'master' into zfs
Diffstat (limited to 'user/libreoffice/disable-mariadbc.patch')
| -rw-r--r-- | user/libreoffice/disable-mariadbc.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/user/libreoffice/disable-mariadbc.patch b/user/libreoffice/disable-mariadbc.patch index ada1d1e7a..f63692775 100644 --- a/user/libreoffice/disable-mariadbc.patch +++ b/user/libreoffice/disable-mariadbc.patch @@ -1,13 +1,13 @@ We don't have MariaDB yet and there is no ./configure option for it ---- libreoffice-6.2.1.2/configure.ac -+++ libreoffice-6.2.1.2/configure.ac -@@ -8471,7 +8471,7 @@ AC_SUBST(PYTHON_VERSION) +--- libreoffice-6.2.3.2/configure.ac ++++ libreoffice-6.2.3.2/configure.ac +@@ -8471,7 +8471,7 @@ AC_SUBST(PYTHON_VERSION_MAJOR) AC_SUBST(PYTHON_VERSION_MINOR) -ENABLE_MARIADBC=TRUE +ENABLE_MARIADBC= - if test "$_os" = "Android" -o "$_os" = "iOS"; then + if test "$_os" = "Android" -o "$_os" = "iOS" -o "$enable_mpl_subset" = "yes"; then ENABLE_MARIADBC= fi |