<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/fb3e85f2d4356255f8e3ca7c0fd0bb889921872e">https://github.com/macports/macports-ports/commit/fb3e85f2d4356255f8e3ca7c0fd0bb889921872e</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 fb3e85f2d43 libreoffice: update to 7.6.1.2
</span>fb3e85f2d43 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit fb3e85f2d4356255f8e3ca7c0fd0bb889921872e
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Sun Sep 17 21:39:52 2023 -0400

<span style='display:block; white-space:pre;color:#404040;'>    libreoffice: update to 7.6.1.2
</span>---
 office/libreoffice/Portfile                 | 40 +++++++++++++++++------------
 office/libreoffice/files/patch-no-java.diff | 33 ++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 17 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 73527ff7e24..a84b30fedc6 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.5.5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             7.6.1.2
</span> revision            0
 categories          office aqua
 license             {LGPL-3 MPL-1.1}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,21 +45,21 @@ distfiles           ${main_distfile}:main \
</span>                     dtoa-20180411.tgz:dtoa \
                     f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf:opens \
                     libcmis-0.5.2.tar.xz:libcmis \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz:skia \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz:skia \
</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  e8c8ba4fe261af472253002cb964558eafc710cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  d9829d735a17a52df4ab127d5b07a0c70444ec308180ad62452a9b1c68138eb2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    270507204 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  8673df173d75ae51f34c4c7cbfe432608e99349e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  763a799ff15afee0b0b02bf222000a90e9101d3047b5bfc14f6fc94759833d1d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    280220916 \
</span>                     ${name}-dictionaries-${version}.tar.xz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  e52076bd2a44008882195510c3c64293c20437d1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  5552f8fc81a9bc38f97e8ed01f54ef8681ab54ba5aedcde3d405492333adcf19 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    51800756 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  dd17fc34980b600de76354df9df13191d011b3ba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  49759922c9560193e49f6c9fb90df760a4756df0b1fb33a41d7c99f98b58079a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    53323084 \
</span>                     ${name}-translations-${version}.tar.xz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  045af2b830df7c235dff610658fba66b36385d87 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  380085bd1420cc9fba491cbd88b243fd7566e5a09b93fd0d3e1bfc2cc0a0e807 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    204724292 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  2bf946e6f1801405930ac460fe49d84af9d4d787 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  4d942b709869fb504f62e4dec4e213dfe15775a0eb0e12608f6e578632933e46 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    216793420 \
</span>                     dtoa-20180411.tgz \
                     rmd160  8d1bba737d8b58c3fb09533f35af2a03e05d9849 \
                     sha256  0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,10 +72,10 @@ checksums           ${name}-${version}.tar.xz \
</span>                     rmd160  cb17ab0d699ab56faae46ebaaabca618f3cf8b28 \
                     sha256  d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2 \
                     size    484404 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  e5824bf1e06333573b919b26431e97a16b20a29f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    11079112 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  b730395b16ba71dfba25ba0af221beb9e4f70fc5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    10693272 \
</span>                     nss-3.90-with-nspr-4.35.tar.gz \
                     rmd160  dc93cab2c41c7c8bd7f284689b173e7724085886 \
                     sha256  f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,6 +88,7 @@ depends_build-append \
</span>     port:cppunit \
     port:dragonbox \
     port:flex \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    port:frozen \
</span>     port:gettext \
     port:gmake \
     port:gpatch \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,13 +140,13 @@ depends_lib-append  \
</span>     port:libxml2 \
     port:libxslt \
     port:libzmf \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    port:mdds-2.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    port:mdds-2.1 \
</span>     port:mythes \
     port:ncurses \
     port:neon \
     port:nspr \
     port:nss \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    port:orcus-0.17 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    port:orcus-0.18 \
</span>     port:ossp-uuid \
     port:raptor2 \
     port:readline \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -194,6 +195,10 @@ 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:#e0ffe0;'>+# Fix --without-java build, remove after 7.6.2 release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append       patch-no-java.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.args              -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;background:#e0e0e0;'>@@ -236,6 +241,7 @@ configure.args-append  \
</span>     --with-system-dragonbox \
     --with-system-epoxy \
     --with-system-gpgmepp \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    --with-system-frozen \
</span>     --with-system-headers \
     --with-system-hunspell \
     --with-system-jars \
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ed4a0da7856
</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-no-java.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;'>+diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 17f128ce9b3b..64ba41c3fe0b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cui/source/options/optjava.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cui/source/options/optjava.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -935,6 +935,7 @@ OUString SvxJavaClassPathDlg::GetClassPath() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     return sPath.makeStringAndClear();
</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;'>++#if HAVE_FEATURE_JAVA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if ( m_sOldPath.isEmpty() )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -963,5 +964,6 @@ void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     SelectHdl_Impl(*m_xPathList);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 097b7ffb5336..929dfe71738a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cui/source/options/optjava.hxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cui/source/options/optjava.hxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -200,7 +200,9 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     void             SetFocus() { m_xPathList->grab_focus(); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     OUString                GetClassPath() const;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_FEATURE_JAVA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     void                    SetClassPath( const OUString& _rPath );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
</span></pre><pre style='margin:0'>

</pre>