diff options
author | Matteo Bernardini | 2019-07-20 14:17:55 +0200 |
---|---|---|
committer | Matteo Bernardini | 2019-07-20 14:17:55 +0200 |
commit | 1df1fe40b1b2b3271b05c6fef7a4ab57d58665d4 (patch) | |
tree | e2939b3e679d8656c1fc7a85e17fc5e63cd18575 /office/LibreOffice/LibreOffice.SlackBuild | |
parent | 558a2bcdcff72fc39350cf4a3455e11b0f034d02 (diff) | |
download | slackbuilds-1df1fe40b1b2b3271b05c6fef7a4ab57d58665d4.tar.gz |
20190720.1 global branch merge.current-20190720.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'office/LibreOffice/LibreOffice.SlackBuild')
-rw-r--r-- | office/LibreOffice/LibreOffice.SlackBuild | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild index f283a7bbf6..bcd911e506 100644 --- a/office/LibreOffice/LibreOffice.SlackBuild +++ b/office/LibreOffice/LibreOffice.SlackBuild @@ -159,6 +159,10 @@ extwikipub="--enable-ext-wiki-publisher"; [ "${EXTWIKIPUB:-no}" != "yes" ] & extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] && extnlpsolver="" +# 'namespace' is a builtin in gawk5, so change it to 'libgpg_error_namespace': +sed -i "s|MAKE=|patch -p1 < $CWD/libgpg-error.gawk5.diff \&\& &|" \ + external/libgpg-error/ExternalProject_libgpg-error.mk || exit 1 + ./autogen.sh \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -218,7 +222,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] & --with-system-nss \ --with-system-openldap \ --with-system-openssl \ - --with-system-poppler \ --with-system-redland \ --with-system-sane \ --with-system-zlib \ |