diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-03-15 20:00:39 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-03-15 20:00:39 +0000 |
| commit | 88d39bd86ba879437ef28ea2c936dc13617b8774 (patch) | |
| tree | e082629558e2f17be1d8d8e5489c0dab3c449e7a /user/libreoffice/disable-mariadbc.patch | |
| parent | 6e61738144a4ddd8743afe561c789ccbc6634467 (diff) | |
| parent | e5e7f2a7e60e60c88d9f53b16b6bda81a2e4b6f9 (diff) | |
| download | packages-88d39bd86ba879437ef28ea2c936dc13617b8774.tar.gz packages-88d39bd86ba879437ef28ea2c936dc13617b8774.tar.bz2 packages-88d39bd86ba879437ef28ea2c936dc13617b8774.tar.xz packages-88d39bd86ba879437ef28ea2c936dc13617b8774.zip | |
Merge branch 'libreoffice-6.2' into 'master'
Upgrade LibreOffice to 6.2 and upgrade some of its dependencies
See merge request !197
Diffstat (limited to 'user/libreoffice/disable-mariadbc.patch')
| -rw-r--r-- | user/libreoffice/disable-mariadbc.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/user/libreoffice/disable-mariadbc.patch b/user/libreoffice/disable-mariadbc.patch new file mode 100644 index 000000000..ada1d1e7a --- /dev/null +++ b/user/libreoffice/disable-mariadbc.patch @@ -0,0 +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) + AC_SUBST(PYTHON_VERSION_MAJOR) + AC_SUBST(PYTHON_VERSION_MINOR) + +-ENABLE_MARIADBC=TRUE ++ENABLE_MARIADBC= + if test "$_os" = "Android" -o "$_os" = "iOS"; then + ENABLE_MARIADBC= + fi |