<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c9047e6bf531bcb261f1b7ebd083811666880ca5">https://github.com/macports/macports-ports/commit/c9047e6bf531bcb261f1b7ebd083811666880ca5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c9047e6bf53 libreoffice: update to 7.2.0.1
</span>c9047e6bf53 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c9047e6bf531bcb261f1b7ebd083811666880ca5
</span>Author: Andrew Udvare <audvare@gmail.com>
AuthorDate: Sun Jul 18 03:26:14 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> libreoffice: update to 7.2.0.1
</span>---
office/libreoffice/Portfile | 29 +++++++----------
office/libreoffice/files/patch-avoid-bashism.diff | 33 +++++++++++++++++++
office/libreoffice/files/patch-configure.diff | 38 ----------------------
.../patch-ucb_ucp_webdav_webdavprovider_cxx.diff | 21 ------------
.../patch-unpack-sources-fix-for-bsd-find.diff | 13 --------
5 files changed, 45 insertions(+), 89 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 a4fad0c155f..0a00578b434 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.1.5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.2.0.1
</span> revision 0
categories office aqua
license {LGPL-3 MPL-1.1}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,17 +43,17 @@ distfiles ${main_distfile}:main \
</span> f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf:opens
checksums libreoffice-${version}.tar.xz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 3959a4707bc652d7edcc41d308087a49c9875dca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e5896f533852395f4758fe3fed824ae8f929b6e75b7eca602139a7a2dc94af90 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 244309736 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 28e3885248196947a0ef23729431b8eb2e6e3cc4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 218c22ac991ac2ac071ef26c2dc3b4a0153d49d2f8ca97cee836e5ffe92f7396 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 251660180 \
</span> libreoffice-dictionaries-${version}.tar.xz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 7fb292b16809f257c378b0dc28a6e103a4985e69 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e488d39e5b5b2d8a18d32dd1d43b7ca92cd940d22a4f1b3b3038edb2b2b2853e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 47964516 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 062c7af147455d546e7191ccf48d6696481b1074 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f50cd9ef0e2a534645eb9c214c509b1546e04e8918f939a3923250e25abba617 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 49552296 \
</span> libreoffice-translations-${version}.tar.xz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 0f1930c5c676499051f343c837d7d1b196f85dc5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0d2356fc78928d047381a78961369ed7ca548cb33a887d332c7fc77efeaac165 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 184947664 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e83a5863d32d7fc36d4423c7f1e6efd6d7dd0ec7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d8934769d42a69008702231e69a288d29546b39b60b7826ab1977989167f1998 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 192024608 \
</span> dtoa-20180411.tgz \
rmd160 8d1bba737d8b58c3fb09533f35af2a03e05d9849 \
sha256 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,10 +155,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 19} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ucb_ucp_webdav_webdavprovider_cxx.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-unpack-sources-fix-for-bsd-find.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-avoid-bashism.diff
</span>
set product_name LibreOffice
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,16 +188,14 @@ configure.args-append \
</span> --disable-ldap \
--disable-lotuswordpro \
--disable-lpsolve \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-neon \
</span> --disable-odk \
--disable-online-update \
--disable-openssl \
--disable-pdfimport \
--disable-pdfium \
--disable-postgresql-sdbc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-qrcodegen \
</span> --disable-report-builder \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-vlc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-zxing \
</span> --enable-bogus-pkg-config \
--enable-cups \
--enable-extension-integration \
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7133c50d5cd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/libreoffice/files/patch-avoid-bashism.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From cfab695d0e3bd5889cfa4b6e81300dd11d4eef72 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Stephan Bergmann <sbergman@redhat.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 19 Jul 2021 17:32:06 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Avoid bash'ism (comment in line continuation)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bash appears to remove comments only up to the next line-continuation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+backslash/newline pair, while SUS mandates that the "<backslash> and <newline>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+shall be removed before splitting the input into tokens", and at least zsh 5.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+follows that interpretation and thus complained about a `then` not followed by a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+`fi`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: Ifedb002f133a7bc4f79bb9bec3e8c97ccc704aaa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119227
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Tested-by: Jenkins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Makefile.in Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f9a2644..a2b34f8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,9 +58,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .DEFAULT_GOAL := build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# 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:#e0ffe0;'>++# in a container:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check-if-root:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @if test ! `uname` = 'Haiku' -a `id -u` = 0; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # 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:#e0ffe0;'>+ if test ! -x "$$(command -v systemd-detect-virt)" || ! systemd-detect-virt -c -q; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo 'Building LibreOffice as root is a very bad idea, use a regular user.'; \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/libreoffice/files/patch-configure.diff b/office/libreoffice/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c6520ddbe9d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/libreoffice/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From d1dc51f95f9e831aa6adbbeff549c2017d2dfd82 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Andrew Udvare <audvare@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 29 Dec 2020 15:18:06 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] configure.ac: allow --enable-python=system on macOS if PYTHON is non-empty
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This will work as long as a valid Python is in PATH, such as /usr/bin/python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-from Xcode or another version in some prefix like /opt/local.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: Ic967c3ce2f9949d94c11c3449363841a1565cfa9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108486
</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: Michael Stahl <michael.stahl@allotropia.de>
</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 configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e660733..78bb799 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9238,8 +9238,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Optionally user can pass an option to configure, i. e.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ./configure PYTHON=/usr/bin/python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # =====================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test $_os = Darwin -a "$enable_python" != no -a "$enable_python" != fully-internal -a "$enable_python" != internal; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test $_os = Darwin -a "$enable_python" != no -a "$enable_python" != fully-internal -a "$enable_python" != internal -a "$enable_python" != system; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Only allowed choices for macOS are 'no', 'internal' (default), and 'fully-internal'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # unless PYTHON is defined as above which allows 'system'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enable_python=internal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$build_os" != "cygwin" -a "$enable_python" != fully-internal; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9311,7 +9312,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_RESULT([system])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "$_os" = Darwin; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "$_os" = Darwin -a -z "$PYTHON"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([--enable-python=system doesn't work on macOS because the version provided is obsolete])
</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;color:#808080;'>diff --git a/office/libreoffice/files/patch-ucb_ucp_webdav_webdavprovider_cxx.diff b/office/libreoffice/files/patch-ucb_ucp_webdav_webdavprovider_cxx.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ed370e131c9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/libreoffice/files/patch-ucb_ucp_webdav_webdavprovider_cxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git ucb/source/ucp/webdav/webdavprovider.cxx ucb/source/ucp/webdav/webdavprovider.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 462e4e5a98f7..570b36e6180c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ucb/source/ucp/webdav/webdavprovider.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ucb/source/ucp/webdav/webdavprovider.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,6 +17,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
</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;'>-+#include <comphelper/processfactory.hxx>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ucbhelper/contentidentifier.hxx>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ucbhelper/macros.hxx>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "webdavprovider.hxx"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -106,7 +107,7 @@ static css::uno::Reference< css::uno::XInterface >
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- css::lang::XServiceInfo* pX =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static_cast<css::lang::XServiceInfo*>(new ContentProvider( ucbhelper::getComponentContext(rSMgr) ));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static_cast<css::lang::XServiceInfo*>(new ContentProvider( comphelper::getComponentContext(rSMgr) ));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return css::uno::Reference< css::uno::XInterface >::query( pX );
</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;color:#808080;'>diff --git a/office/libreoffice/files/patch-unpack-sources-fix-for-bsd-find.diff b/office/libreoffice/files/patch-unpack-sources-fix-for-bsd-find.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 984c8f07e41..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/libreoffice/files/patch-unpack-sources-fix-for-bsd-find.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bin/unpack-sources.old 2020-11-11 04:47:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bin/unpack-sources 2020-11-11 04:53:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -85,7 +85,7 @@
</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;'>- # create symlinks for module directories; ignore git-hooks directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for dir in `find "$lo_src_dir/$tarname" -mindepth 1 -maxdepth 1 -type d -path $lo_src_dir/$tarname/git-hooks -o -printf "$tarname/%f\n"` ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ln -sf "src/$dir" "$start_dir"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while read -r dir; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ln -sf "src/${tarname}/$(basename "$dir")" "$start_dir"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ done < <(find "$lo_src_dir/$tarname" -mindepth 1 -maxdepth 1 -type d -path $lo_src_dir/$tarname/git-hooks)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span></pre><pre style='margin:0'>
</pre>