<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e38f41f26731096b1a49f41609b22fca7ac34446">https://github.com/macports/macports-ports/commit/e38f41f26731096b1a49f41609b22fca7ac34446</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 e38f41f2673 libreoffice: update to 7.6.2.1
</span>e38f41f2673 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e38f41f26731096b1a49f41609b22fca7ac34446
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Thu Oct 5 16:30:53 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> libreoffice: update to 7.6.2.1
</span>---
office/libreoffice/Portfile | 24 +++++++++------------
office/libreoffice/files/patch-no-java.diff | 33 -----------------------------
2 files changed, 10 insertions(+), 47 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 a84b30fedc6..b21c082ba38 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.6.1.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.6.2.1
</span> revision 0
categories office aqua
license {LGPL-3 MPL-1.1}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,17 +49,17 @@ distfiles ${main_distfile}:main \
</span> nss-3.90-with-nspr-4.35.tar.gz:nss
checksums ${name}-${version}.tar.xz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 8673df173d75ae51f34c4c7cbfe432608e99349e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 763a799ff15afee0b0b02bf222000a90e9101d3047b5bfc14f6fc94759833d1d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 280220916 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 33740b48b9ec7837d59e6815b232de2681019542 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e5d2733bd02ce24c30207795b77b9f5e2b5aba3a14773375fb5cc228ed2b9ca2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 280623380 \
</span> ${name}-dictionaries-${version}.tar.xz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 dd17fc34980b600de76354df9df13191d011b3ba \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 49759922c9560193e49f6c9fb90df760a4756df0b1fb33a41d7c99f98b58079a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 53323084 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 08bb21aece4d725242239367f2a59dc5d2a134de \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ef127e3535d88928e670804279551d81570e570a203b7f295941def4573bc314 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 52992556 \
</span> ${name}-translations-${version}.tar.xz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2bf946e6f1801405930ac460fe49d84af9d4d787 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4d942b709869fb504f62e4dec4e213dfe15775a0eb0e12608f6e578632933e46 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 216793420 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b55256f38eba68647666f2a92b666901cdd9cf85 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5b239fa6127e87b00b7990a5edef96b1fa522f80c1d96e3f8749d95190f6d60a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 216806496 \
</span> dtoa-20180411.tgz \
rmd160 8d1bba737d8b58c3fb09533f35af2a03e05d9849 \
sha256 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -195,10 +195,6 @@ configure.env-append \
</span> PYTHON_CFLAGS=-I${frameworks_dir}/Python.framework/Versions/${pyver}/include/python${pyver} \
"PYTHON_LIBS=-L${frameworks_dir}/Python.framework/Versions/${pyver}/lib -lpython${pyver} -ldl -framework CoreFoundation"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix --without-java build, remove after 7.6.2 release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-no-java.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Most arguments are from
# https://wiki.documentfoundation.org/LibreOffice_Vanilla_for_Mac#LibreOffice_Vanilla
configure.args-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/libreoffice/files/patch-no-java.diff b/office/libreoffice/files/patch-no-java.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ed4a0da7856..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/libreoffice/files/patch-no-java.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;'>-diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 17f128ce9b3b..64ba41c3fe0b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cui/source/options/optjava.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cui/source/options/optjava.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -935,6 +935,7 @@ OUString SvxJavaClassPathDlg::GetClassPath() const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return sPath.makeStringAndClear();
</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;'>-+#if HAVE_FEATURE_JAVA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( m_sOldPath.isEmpty() )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -963,5 +964,6 @@ void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SelectHdl_Impl(*m_xPathList);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 097b7ffb5336..929dfe71738a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cui/source/options/optjava.hxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cui/source/options/optjava.hxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -200,7 +200,9 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void SetFocus() { m_xPathList->grab_focus(); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OUString GetClassPath() const;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if HAVE_FEATURE_JAVA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void SetClassPath( const OUString& _rPath );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
</span></pre><pre style='margin:0'>
</pre>