<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c3f41c2eb448dc456f64ca13dc3eabd74ce27a2a">https://github.com/macports/macports-ports/commit/c3f41c2eb448dc456f64ca13dc3eabd74ce27a2a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c3f41c2eb448dc456f64ca13dc3eabd74ce27a2a
</span>Author: Andrew Udvare <audvare@gmail.com>
AuthorDate: Thu Dec 23 01:35:18 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> libreoffice: update to 7.3.0.1
</span>---
office/libreoffice/Portfile | 48 ++++++++++++-----------
office/libreoffice/files/patch-avoid-bashism.diff | 33 ----------------
2 files changed, 26 insertions(+), 55 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/libreoffice/Portfile b/office/libreoffice/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 888e3ce7546..ff82dda16d6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/libreoffice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/libreoffice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup boost 1.0
name libreoffice
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.2.5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.3.0.1
</span> revision 0
categories office aqua
license {LGPL-3 MPL-1.1}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,26 +36,28 @@ master_sites ${main_uri}:main \
</span> ${addons_uri}:dtoa \
${main_uri}:dicts \
${main_uri}:translations \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${addons_uri}:libcmis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${addons_uri}:libcmis \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${addons_uri}:skia
</span> distfiles ${main_distfile}:main \
${name}-dictionaries-${version}.tar.xz:dicts \
${name}-translations-${version}.tar.xz:translations \
dtoa-20180411.tgz:dtoa \
f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf:opens \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- libcmis-0.5.2.tar.xz:libcmis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcmis-0.5.2.tar.xz:libcmis \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz:skia
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums libreoffice-${version}.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1264b94779bc0621745a51a922f24acef71e30a3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 20fd51ecce5906b32a1a33817c7f6c7917558e67a93072826c41bfef0115493c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 252956132 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libreoffice-dictionaries-${version}.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 15a0cf3e39242cbe489447b0c40a5c1c5945e71a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9a58f35e59c88abe63b8ce7e04d65f419f09f8d6e97081f122965ce09345968a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 49521720 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libreoffice-translations-${version}.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 3b924f36095ddbf90643927366545d221976fce1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 989ee335ebc8d30a2bfc302aa4e9e47fd2cff83acfaf3f0d3caf8fc931923908 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 192789608 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${name}-${version}.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a590a933043e98936b92f07daba4dfc9102b727e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e07a7e30e545bc659874ced9e8cde5abd60f79bfbcfb7590d05edf1a6daf6eba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 254705732 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${name}-dictionaries-${version}.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6c2acda98d70fe45c8077f6901ad91224372e643 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 21b6f2357370a24debacc7054dab274c261d5be1a18a523cfc6ae382f2ebaa78 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 51296012 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${name}-translations-${version}.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6caef44f7f9b271fe3619cf60b71b0214f34594f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 163016d4720e6bd11d5be84b75f9f382076081cdddfd1377fb1cb36781a1e405 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 195519200 \
</span> dtoa-20180411.tgz \
rmd160 8d1bba737d8b58c3fb09533f35af2a03e05d9849 \
sha256 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +69,11 @@ checksums libreoffice-${version}.tar.xz \
</span> libcmis-0.5.2.tar.xz \
rmd160 cb17ab0d699ab56faae46ebaaabca618f3cf8b28 \
sha256 d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- size 484404
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 484404 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 847ba68705192d483ab812c0f18c27be743b8b01 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 97e859e8467eca9d2441cd23079b61c2c3863b5687620f18cc31a9f966740177 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11826600
</span>
depends_build-append \
port:autoconf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,8 +88,6 @@ depends_build-append \
</span> port:ucpp \
port:unixODBC
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:apr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:apr-util \
</span> port:box2d \
port:bzip2 \
port:clucene \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,6 +105,7 @@ depends_lib-append \
</span> port:lcms2 \
port:libabw \
port:libcdr-0.1 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libcuckoo \
</span> port:libe-book \
port:libepoxy \
port:libepubgen \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,7 +141,6 @@ depends_lib-append \
</span> port:raptor2 \
port:readline \
port:redland \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:serf1 \
</span> port:sqlite3 \
port:xmlsec \
port:xz \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -160,8 +164,6 @@ if {${os.platform} eq "darwin" && ${os.major} < 19} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-avoid-bashism.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set product_name LibreOffice
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,6 +174,7 @@ use_xcode yes
</span> compiler.cxx_standard 2017
# CMS_NO_REGISTER_KEYWORD required for C++17 or newer compiler.
# PYTHON_CFLAGS and PYTHON_LIBS have to be non-empty
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append -std=gnu++17
</span> configure.env-append \
"LCMS2_CFLAGS=-I${prefix}/include -DCMS_NO_REGISTER_KEYWORD=1" \
PYTHON=${prefix}/bin/python${pyver} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -216,6 +219,7 @@ configure.args-append \
</span> --with-parallelism=${build.jobs} \
--with-product-name=${product_name} \
--with-system-clucene \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-system-cuckoo \
</span> --with-system-epoxy \
--with-system-gpgmepp \
--with-system-headers \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -239,7 +243,6 @@ configure.args-append \
</span> --with-theme=colibre \
--with-tls=nss \
--with-vendor=MacPorts \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-webdav=serf \
</span> --without-doxygen \
--without-fonts \
--without-java \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -247,6 +250,7 @@ configure.args-append \
</span> --without-system-dicts \
--without-system-libcmis \
--without-system-sane \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-webdav \
</span> \"--with-lang=bg br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl hr hu id is it ja km lt lv nb nl nn pl pt pt-BR ro ru sk sl sv ta tr uk zh-CN zh-TW\"
build.target build-nocheck
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/libreoffice/files/patch-avoid-bashism.diff b/office/libreoffice/files/patch-avoid-bashism.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7133c50d5cd..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/libreoffice/files/patch-avoid-bashism.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,33 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From cfab695d0e3bd5889cfa4b6e81300dd11d4eef72 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Stephan Bergmann <sbergman@redhat.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 19 Jul 2021 17:32:06 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Avoid bash'ism (comment in line continuation)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bash appears to remove comments only up to the next line-continuation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-backslash/newline pair, while SUS mandates that the "<backslash> and <newline>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-shall be removed before splitting the input into tokens", and at least zsh 5.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-follows that interpretation and thus complained about a `then` not followed by a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-`fi`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: Ifedb002f133a7bc4f79bb9bec3e8c97ccc704aaa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119227
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Tested-by: Jenkins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Makefile.in Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f9a2644..a2b34f8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,9 +58,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .DEFAULT_GOAL := build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Nested test is to check if the systemd-detect-virt command doesn't exist or it reports we're not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# in a container:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check-if-root:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @if test ! `uname` = 'Haiku' -a `id -u` = 0; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # if the systemd-detect-virt command doesn't exist or it reports we're not in a container \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test ! -x "$$(command -v systemd-detect-virt)" || ! systemd-detect-virt -c -q; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo 'Building LibreOffice as root is a very bad idea, use a regular user.'; \
</span></pre><pre style='margin:0'>
</pre>