git: d4fc18190183 - main - editors/openoffice-devel: upgrade to new snapshot
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 01 Nov 2026 22:32:08 UTC
The branch main has been updated by truckman:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d4fc18190183fcc2c5d1df8e5176082804f3d59a
commit d4fc18190183fcc2c5d1df8e5176082804f3d59a
Author: Don Lewis <truckman@FreeBSD.org>
AuthorDate: 2026-11-01 10:04:38 +0000
Commit: Don Lewis <truckman@FreeBSD.org>
CommitDate: 2026-11-01 22:31:55 +0000
editors/openoffice-devel: upgrade to new snapshot
Upgrade to a newer snapshot of the upstream trunk branch.
Wiki Publisher no longer uses apache-commons-codec or the insecure
apache-commons-httpclient so unbreak and re-enable the WIKI_PUBLISHER_
option.
These patches have been upstreamed:
patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_call.s
patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_cpp2uno.cxx
patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx
patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_uno2cpp.cxx
patch-jvmfwk_plugins_sunmajor_pluginlib_vendorbase.hxx
patch-set_soenv.in
patch-source__soenv.sh
Use bundled lucene instead of the lucene port and remove DEPRECATED.
MFH: 2026Q4
---
editors/openoffice-devel/Makefile | 28 ++--
editors/openoffice-devel/distinfo | 10 +-
...source_cpp__uno_gcc3__freebsd__powerpc64_call.s | 85 ------------
...e_cpp__uno_gcc3__freebsd__powerpc64_cpp2uno.cxx | 65 ---------
...rce_cpp__uno_gcc3__freebsd__powerpc64_share.hxx | 9 --
...e_cpp__uno_gcc3__freebsd__powerpc64_uno2cpp.cxx | 149 ---------------------
...vmfwk_plugins_sunmajor_pluginlib_vendorbase.hxx | 14 --
editors/openoffice-devel/files/patch-set_soenv.in | 25 ----
.../openoffice-devel/files/patch-source__soenv.sh | 20 ---
9 files changed, 15 insertions(+), 390 deletions(-)
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 450d199f8e92..5606c82ab997 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP}
-PORTREVISION= 1
+PORTREVISION= 0
PORTEPOCH= 4
CATEGORIES= editors java
MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \
@@ -49,9 +49,6 @@ LICENSE_PERMS_ICU= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
LICENSE_PERMS_TWAIN= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
LICENSE_PERMS_W3C= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-DEPRECATED= Depends on expired java/apache-commons-lang and textproc/lucene
-EXPIRATION_DATE=2026-12-31
-
ONLY_FOR_ARCHS= amd64 i386 powerpc64 powerpc64le
BUILD_DEPENDS= \
@@ -131,8 +128,8 @@ AOOVERSION2= 1
AOOVERSION3= 0
# From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
AOOTAG= AOO510m1\(Build:99000\)
-GITREVISION= 430d1577c6
-TIMESTAMP= 1791053065
+GITREVISION= 0bdb2dee20
+TIMESTAMP= 1793513194
#AOORC=rc3
#EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
EXTSRC= ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz
@@ -164,7 +161,7 @@ CPE_VENDOR= apache
OPTIONS_DEFINE= CRASHDUMP CUPS DBGUTIL DEBUG GNOME MMEDIA \
MYSQL PDFIMPORT REPORT_BUILDER SDK WIKI_PUBLISHER
-OPTIONS_DEFAULT= CUPS GNOME MMEDIA
+OPTIONS_DEFAULT= CUPS GNOME MMEDIA WIKI_PUBLISHER
CRASHDUMP_DESC= Enable crashdumps, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN}
DBGUTIL_DESC= Enable assertions, object counting. (non-production)
DEBUG_DESC= Compile with -O0, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN}
@@ -210,17 +207,7 @@ REPORT_BUILDER_JAR_DEPENDS=
REPORT_BUILDER_BUILD_DEPENDS= ${REPORT_BUILDER_JAR_DEPENDS}
REPORT_BUILDER_RUN_DEPENDS= ${REPORT_BUILDER_JAR_DEPENDS}
-# commons-httpclient replacement by Apache HttpComponents requires new java
-WIKI_PUBLISHER_BROKEN= CVE-2012-6153 MITM
WIKI_PUBLISHER_CONFIGURE_ENABLE= wiki-publisher
-WIKI_PUBLISHER_CONFIGURE_WITH= \
- commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \
- commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar
-WIKI_PUBLISHER_JAR_DEPENDS= \
- ${JAVALIBDIR}/commons-codec.jar:java/apache-commons-codec \
- ${JAVALIBDIR}/commons-httpclient.jar:java/apache-commons-httpclient
-WIKI_PUBLISHER_BUILD_DEPENDS= ${WIKI_PUBLISHER_JAR_DEPENDS}
-WIKI_PUBLISHER_RUN_DEPENDS= ${WIKI_PUBLISHER_JAR_DEPENDS}
# Don't run gnome-post-icons until after post-install generates the plist
TARGET_ORDER_OVERRIDE= 710:gnome-post-icons
@@ -255,8 +242,10 @@ CONFIGURE_ARGS+= --without-commons-logging
.include <${FILESDIR}/Makefile.localized>
EXTRA_DISTFILES= 9dcd632441e4da04a461082ebbafd337-boost_1_84_0.tar.bz2 \
+ 8344c82677a7ba961b74ea193a178e1b-SampleICC-1.6.11.zip \
e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz \
128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz \
+ 17960f35b2239654ba608cf1f3e256b3-lucene-2.9.4-src.tar.gz \
d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
.if ${CHOSEN_COMPILER_TYPE} == clang
@@ -323,9 +312,8 @@ CONFIGURE_ARGS+= \
--disable-kde4 \
--with-system-libxml \
--with-system-libxslt \
- --with-system-lucene \
- --with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \
- --with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \
+ --with-lucene-core-jar=${JAVALIBDIR}/lucene-core-2.9.4.jar \
+ --with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-2.9.4.jar \
--with-system-mythes \
--with-external-thes-dir=${LOCALBASE}/share/mythes \
--with-system-nss \
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index 1e4f317e5c67..8f0e95acbd86 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -1,14 +1,18 @@
-TIMESTAMP = 1791157354
-SHA256 (openoffice/apache-openoffice-5.1.0-1791053065-430d1577c6-src.tar.xz) = e2836e5a384be44dadb853fb2a46f834c60631279f94f37ab725f49536956959
-SIZE (openoffice/apache-openoffice-5.1.0-1791053065-430d1577c6-src.tar.xz) = 249804148
+TIMESTAMP = 1793528895
+SHA256 (openoffice/apache-openoffice-5.1.0-1793513194-0bdb2dee20-src.tar.xz) = 103c91c464b03fde31c9c71338b0a454fc05c4fffcab1cd2d53421481285d926
+SIZE (openoffice/apache-openoffice-5.1.0-1793513194-0bdb2dee20-src.tar.xz) = 250784244
SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa
SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004
SHA256 (openoffice/9dcd632441e4da04a461082ebbafd337-boost_1_84_0.tar.bz2) = cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454
SIZE (openoffice/9dcd632441e4da04a461082ebbafd337-boost_1_84_0.tar.bz2) = 123110547
+SHA256 (openoffice/8344c82677a7ba961b74ea193a178e1b-SampleICC-1.6.11.zip) = cb6fd8f94d8712156b42f4e5595a4e048c0bc07da7f54e828830f80507d72243
+SIZE (openoffice/8344c82677a7ba961b74ea193a178e1b-SampleICC-1.6.11.zip) = 6411777
SHA256 (openoffice/e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz) = 814de31e1413df945cdd34939b424c4cf7a94d1c481f2d44c99c8ca52b288063
SIZE (openoffice/e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz) = 13161131
SHA256 (openoffice/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz) = 5677badffc48a8d332e345ea4fe225e3577f53fc95deeec8306000b256829655
SIZE (openoffice/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz) = 540999
+SHA256 (openoffice/17960f35b2239654ba608cf1f3e256b3-lucene-2.9.4-src.tar.gz) = 2a8bd7c6f0632bc406bcec0091d286b3efd4743c2d45fd88b0d0d564281780cd
+SIZE (openoffice/17960f35b2239654ba608cf1f3e256b3-lucene-2.9.4-src.tar.gz) = 12494586
SHA256 (openoffice/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz) = 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f
SIZE (openoffice/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz) = 16525605
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_call.s b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_call.s
deleted file mode 100644
index 1b8a327b2d6c..000000000000
--- a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_call.s
+++ /dev/null
@@ -1,85 +0,0 @@
---- bridges/source/cpp_uno/gcc3_freebsd_powerpc64/call.s.orig 2026-09-18 00:49:04 UTC
-+++ bridges/source/cpp_uno/gcc3_freebsd_powerpc64/call.s
-@@ -56,9 +56,6 @@ callVirtualMethod:
- stw 9,296(31)
- ld 9,304(31)
- std 9,96(31)
-- ld 9,-28688(13)
-- std 9,184(31)
-- li 9,0
- lwz 9,280(31)
- cmpwi 0,9,0
- beq 0,.L2
-@@ -190,22 +187,14 @@ callVirtualMethod:
- mr 9,3
- mr 10,4
- lfd 0,152(31)
-- ld 7,128(31)
-- ld 6,120(31)
-+ ld 6,128(31)
-+ ld 5,120(31)
- fmr 1,0
- mr 4,10
- mr 3,9
- bl MapReturn
- nop
- nop
-- ld 9,184(31)
-- ld 10,-28688(13)
-- xor. 9,9,10
-- li 10,0
-- beq 0,.L5
-- bl __stack_chk_fail
-- nop
--.L5:
- addi 1,31,208
- .cfi_def_cfa 1, 0
- ld 0,16(1)
-@@ -241,9 +230,6 @@ privateSnippetExecutor:
- .cfi_offset 31, -8
- mr 31,1
- .cfi_def_cfa_register 31
-- ld 0,-28688(13)
-- std 0,248(31)
-- li 0,0
- std 3,80(31)
- std 4,88(31)
- std 5,96(31)
-@@ -287,6 +273,8 @@ stfd 13, 96(9)
- mr 9,3
- stw 9,44(31)
- lwa 9,44(31)
-+ cmpwi 0,9,100
-+ beq 0,.Lfprs
- cmplwi 0,9,15
- bgt 0,.L7
- sldi 10,9,2
-@@ -388,18 +376,20 @@ stfd 13, 96(9)
- # 0 "" 2
- #NO_APP
- b .L17
-+.Lfprs:
-+ lfd 1,144(31)
-+ lfd 2,152(31)
-+ lfd 3,160(31)
-+ lfd 4,168(31)
-+ lfd 5,176(31)
-+ lfd 6,184(31)
-+ lfd 7,192(31)
-+ lfd 8,200(31)
-+ b .L17
- .L19:
- nop
- .L17:
- nop
-- ld 9,248(31)
-- ld 10,-28688(13)
-- xor. 9,9,10
-- li 10,0
-- beq 0,.L18
-- bl __stack_chk_fail
-- nop
--.L18:
- addi 1,31,272
- .cfi_def_cfa 1, 0
- ld 0,16(1)
diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_cpp2uno.cxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_cpp2uno.cxx
deleted file mode 100644
index d1aa76149eb9..000000000000
--- a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_cpp2uno.cxx
+++ /dev/null
@@ -1,65 +0,0 @@
---- bridges/source/cpp_uno/gcc3_freebsd_powerpc64/cpp2uno.cxx.orig 2026-09-18 00:49:04 UTC
-+++ bridges/source/cpp_uno/gcc3_freebsd_powerpc64/cpp2uno.cxx
-@@ -76,12 +76,18 @@ static typelib_TypeClass cpp2uno_call(
-
- void * pUnoReturn = 0;
- void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+ double * pFprReturn = reinterpret_cast< double * >( fpreg );
-+ typelib_TypeClass eFprBase = typelib_TypeClass_VOID;
-+ sal_Int32 nFprMembers = 0;
-
- if (pReturnTypeDescr)
- {
-- if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
-+ if (!ppc64::return_in_hidden_param( pReturnTypeRef ))
- {
-- pUnoReturn = pRegisterReturn; // direct way for simple types
-+ nFprMembers = ppc64::return_in_fprs( pReturnTypeRef, eFprBase );
-+ pUnoReturn = (nFprMembers != 0
-+ ? alloca( pReturnTypeDescr->nSize )
-+ : pRegisterReturn); // direct way for simple types
- }
- else // complex return via ptr (pCppReturn)
- {
-@@ -325,6 +331,23 @@ static typelib_TypeClass cpp2uno_call(
- if (pReturnTypeDescr)
- {
- typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+ if (nFprMembers != 0)
-+ {
-+ for (sal_Int32 i = 0; i < nFprMembers; ++i)
-+ pFprReturn[i] = (eFprBase == typelib_TypeClass_FLOAT
-+ ? static_cast< float * >( pUnoReturn )[i]
-+ : static_cast< double * >( pUnoReturn )[i]);
-+ eRet = ppc64::TYPECLASS_FPRS;
-+ }
-+#ifdef OSL_BIGENDIAN
-+ else if (eRet == typelib_TypeClass_STRUCT && !pCppReturn && pReturnTypeDescr->nSize < 8)
-+ {
-+ sal_uInt64 n = 0;
-+ memcpy( reinterpret_cast< char * >( &n ) + 8 - pReturnTypeDescr->nSize,
-+ pRegisterReturn, pReturnTypeDescr->nSize );
-+ *reinterpret_cast< sal_uInt64 * >( pRegisterReturn ) = n;
-+ }
-+#endif
- TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
- return eRet;
- }
-@@ -710,7 +733,7 @@ unsigned char * bridges::cpp_uno::shared
- (s++)->fn = code + writetoexecdiff;
- code = codeSnippet(
- code, functionOffset++, vtableOffset,
-- bridges::cpp_uno::shared::isSimpleType(
-+ !ppc64::return_in_hidden_param(
- reinterpret_cast<
- typelib_InterfaceAttributeTypeDescription * >(
- member)->pAttributeTypeRef));
-@@ -729,7 +752,7 @@ unsigned char * bridges::cpp_uno::shared
- (s++)->fn = code + writetoexecdiff;
- code = codeSnippet(
- code, functionOffset++, vtableOffset,
-- bridges::cpp_uno::shared::isSimpleType(
-+ !ppc64::return_in_hidden_param(
- reinterpret_cast<
- typelib_InterfaceMethodTypeDescription * >(
- member)->pReturnTypeRef));
diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx
deleted file mode 100644
index f4c3c1726b0f..000000000000
--- a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx
+++ /dev/null
@@ -1,9 +0,0 @@
---- bridges/source/cpp_uno/gcc3_freebsd_powerpc64/share.hxx.orig 2026-09-18 00:49:04 UTC
-+++ bridges/source/cpp_uno/gcc3_freebsd_powerpc64/share.hxx
-@@ -145,4 +145,6 @@ namespace ppc64
- {
- enum ppclimits { MAX_GPR_REGS = 8, MAX_SSE_REGS = 13 };
- bool return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef );
-+ sal_Int32 return_in_fprs( typelib_TypeDescriptionReference *pTypeRef, typelib_TypeClass & eBase );
-+ const typelib_TypeClass TYPECLASS_FPRS = (typelib_TypeClass) 100;
- }
diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_uno2cpp.cxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_uno2cpp.cxx
deleted file mode 100644
index f78ed690acba..000000000000
--- a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_uno2cpp.cxx
+++ /dev/null
@@ -1,149 +0,0 @@
---- bridges/source/cpp_uno/gcc3_freebsd_powerpc64/uno2cpp.cxx.orig 2026-09-18 00:49:04 UTC
-+++ bridges/source/cpp_uno/gcc3_freebsd_powerpc64/uno2cpp.cxx
-@@ -33,6 +33,7 @@
- #include <com/sun/star/uno/Exception.hpp>
- #include <com/sun/star/uno/RuntimeException.hpp>
- #include <com/sun/star/uno/genfunc.hxx>
-+#include <osl/endian.h>
- #include <uno/data.h>
-
- #include "bridges/cpp_uno/shared/bridge.hxx"
-@@ -84,7 +85,61 @@ namespace ppc64
- return is_complex_struct(&p->pBaseTypeDescription->aBase);
- return false;
- }
-+
-+ static bool collect_fpr_members(const typelib_TypeDescription * type,
-+ typelib_TypeClass & eBase, sal_Int32 & nMembers)
-+ {
-+ const typelib_CompoundTypeDescription * p
-+ = reinterpret_cast< const typelib_CompoundTypeDescription * >(type);
-+ if (p->pBaseTypeDescription != 0
-+ && !collect_fpr_members(&p->pBaseTypeDescription->aBase, eBase, nMembers))
-+ return false;
-+ for (sal_Int32 i = 0; i < p->nMembers; ++i)
-+ {
-+ typelib_TypeClass eClass = p->ppTypeRefs[i]->eTypeClass;
-+ if (eClass == typelib_TypeClass_STRUCT)
-+ {
-+ typelib_TypeDescription * t = 0;
-+ TYPELIB_DANGER_GET(&t, p->ppTypeRefs[i]);
-+ bool b = collect_fpr_members(t, eBase, nMembers);
-+ TYPELIB_DANGER_RELEASE(t);
-+ if (!b)
-+ return false;
-+ }
-+ else if (eClass == typelib_TypeClass_FLOAT || eClass == typelib_TypeClass_DOUBLE)
-+ {
-+ if (eBase == typelib_TypeClass_VOID)
-+ eBase = eClass;
-+ else if (eBase != eClass)
-+ return false;
-+ ++nMembers;
-+ }
-+ else
-+ return false;
-+ }
-+ return true;
-+ }
-+#endif
-+
-+ sal_Int32 return_in_fprs( typelib_TypeDescriptionReference *pTypeRef, typelib_TypeClass & eBase )
-+ {
-+ eBase = typelib_TypeClass_VOID;
-+#if defined(_CALL_ELF) && _CALL_ELF == 2
-+ if (pTypeRef->eTypeClass == typelib_TypeClass_STRUCT)
-+ {
-+ typelib_TypeDescription * pTypeDescr = 0;
-+ TYPELIB_DANGER_GET( &pTypeDescr, pTypeRef );
-+ sal_Int32 nMembers = 0;
-+ if (!collect_fpr_members(pTypeDescr, eBase, nMembers) || nMembers > 8)
-+ nMembers = 0;
-+ TYPELIB_DANGER_RELEASE( pTypeDescr );
-+ return nMembers;
-+ }
-+#else
-+ (void)pTypeRef;
- #endif
-+ return 0;
-+ }
-
- bool return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef )
- {
-@@ -93,6 +148,10 @@ namespace ppc64
- #if defined(_CALL_ELF) && _CALL_ELF == 2
- else if (pTypeRef->eTypeClass == typelib_TypeClass_STRUCT || pTypeRef->eTypeClass == typelib_TypeClass_EXCEPTION)
- {
-+ typelib_TypeClass eBase;
-+ if (return_in_fprs(pTypeRef, eBase) != 0)
-+ return false;
-+
- typelib_TypeDescription * pTypeDescr = 0;
- TYPELIB_DANGER_GET( &pTypeDescr, pTypeRef );
-
-@@ -107,7 +166,8 @@ namespace ppc64
- }
- }
-
--extern "C" void MapReturn(long r3, long r4, double dret, typelib_TypeDescriptionReference* pReturnType, void *pRegisterReturn)
-+extern "C" void MapReturn(long r3, long r4, typelib_TypeDescriptionReference* pReturnType, void *pRegisterReturn,
-+ double dret, double f2, double f3, double f4, double f5, double f6, double f7, double f8)
- {
- switch (pReturnType->eTypeClass)
- {
-@@ -138,15 +198,41 @@ extern "C" void MapReturn(long r3, long
- #if defined(_CALL_ELF) && _CALL_ELF == 2
- case typelib_TypeClass_STRUCT:
- case typelib_TypeClass_EXCEPTION:
-- if (!ppc64::return_in_hidden_param(pReturnType))
-+ {
-+ typelib_TypeClass eBase;
-+ sal_Int32 nMembers = ppc64::return_in_fprs(pReturnType, eBase);
-+ if (nMembers != 0)
- {
-- sal_uInt64 *pRegisters = reinterpret_cast<sal_uInt64*>(pRegisterReturn);
-- pRegisters[0] = r3;
-- if (pReturnType->pType->nSize > 8)
-- pRegisters[1] = r4;
-+ const double fpr[8] = { dret, f2, f3, f4, f5, f6, f7, f8 };
-+ for (sal_Int32 i = 0; i < nMembers; ++i)
-+ {
-+ if (eBase == typelib_TypeClass_FLOAT)
-+ reinterpret_cast<float *>( pRegisterReturn )[i] = fpr[i];
-+ else
-+ reinterpret_cast<double *>( pRegisterReturn )[i] = fpr[i];
-+ }
- }
-+ else if (!ppc64::return_in_hidden_param(pReturnType))
-+ {
-+ char *p = reinterpret_cast<char *>(pRegisterReturn);
-+ sal_Int32 nSize = pReturnType->pType->nSize;
-+ if (nSize > 8)
-+ {
-+ memcpy(p, &r3, 8);
-+ memcpy(p + 8, &r4, nSize - 8);
-+ }
-+ else
-+#ifdef OSL_BIGENDIAN
-+ memcpy(p, reinterpret_cast<char *>(&r3) + 8 - nSize, nSize);
-+#else
-+ memcpy(p, &r3, nSize);
-+#endif
-+ }
-+ }
-+ break;
- #else
- (void)r4;
-+ (void)f2; (void)f3; (void)f4; (void)f5; (void)f6; (void)f7; (void)f8;
- #endif
- default:
- break;
-@@ -369,7 +455,7 @@ static void cpp_call(
- #ifdef CMC_DEBUG
- fprintf(stderr, "return type is %d\n", pReturnTypeDescr->eTypeClass);
- #endif
-- if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
-+ if (!ppc64::return_in_hidden_param( pReturnTypeRef ))
- {
- pCppReturn = pUnoReturn; // direct way for simple types
- #ifdef CMC_DEBUG
diff --git a/editors/openoffice-devel/files/patch-jvmfwk_plugins_sunmajor_pluginlib_vendorbase.hxx b/editors/openoffice-devel/files/patch-jvmfwk_plugins_sunmajor_pluginlib_vendorbase.hxx
deleted file mode 100644
index 0b58b1fc0001..000000000000
--- a/editors/openoffice-devel/files/patch-jvmfwk_plugins_sunmajor_pluginlib_vendorbase.hxx
+++ /dev/null
@@ -1,14 +0,0 @@
---- jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx.orig 2026-10-21 00:00:00 UTC
-+++ jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
-@@ -44,7 +44,11 @@
- #elif defined INTEL
- #define JFW_PLUGIN_ARCH "i386"
- #elif defined POWERPC64
-+#ifdef OSL_BIGENDIAN
- #define JFW_PLUGIN_ARCH "ppc64"
-+#else
-+#define JFW_PLUGIN_ARCH "ppc64le"
-+#endif
- #elif defined POWERPC
- #define JFW_PLUGIN_ARCH "ppc"
- #elif defined MIPS
diff --git a/editors/openoffice-devel/files/patch-set_soenv.in b/editors/openoffice-devel/files/patch-set_soenv.in
deleted file mode 100644
index 2a5a6dd16ad8..000000000000
--- a/editors/openoffice-devel/files/patch-set_soenv.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- set_soenv.in.orig 2026-09-18 00:50:35 UTC
-+++ set_soenv.in
-@@ -383,7 +383,7 @@ elsif ( $platform =~ m/freebsd/ )
- $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
- }
- }
-- elsif ($platform =~ m/^i386/)
-+ elsif ($platform =~ m/^i[3456]86/)
- { print "Setting FreeBSD x86 specific values... ";
- $outfile = "FreeBSDX86Env.Set";
- $CPU = "I";
-@@ -410,9 +410,10 @@ elsif ( $platform =~ m/freebsd/ )
- $CPU = "P";
- $CPUNAME = "POWERPC64";
- $OUTPATH = "unxfbsdppc64";
-- $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64";
-- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."server";
-- $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
-+ my $jrearch = ($platform =~ m/^powerpc64le/) ? "ppc64le" : "ppc64";
-+ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$jrearch;
-+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$jrearch.$ds."server";
-+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$jrearch.$ds."native_threads";
- }
- elsif ($platform =~ m/powerpc/)
- { print "Setting FreeBSD PPC specific values... ";
diff --git a/editors/openoffice-devel/files/patch-source__soenv.sh b/editors/openoffice-devel/files/patch-source__soenv.sh
deleted file mode 100644
index 021932a4f714..000000000000
--- a/editors/openoffice-devel/files/patch-source__soenv.sh
+++ /dev/null
@@ -1,20 +0,0 @@
---- source_soenv.sh.orig 2026-09-18 00:50:45 UTC
-+++ source_soenv.sh
-@@ -89,7 +89,7 @@ else
- mips-*-linux*)
- . ./LinuxMIPSEnv.Set.sh
- ;;
-- i386-*-freebsd*)
-+ i[3456]86-*-freebsd*)
- . ./FreeBSDX86Env.Set.sh
- ;;
- amd64-*-freebsd*|x86_64-*-freebsd*)
-@@ -101,7 +101,7 @@ else
- powerpc-*-freebsd*)
- . ./FreeBSDPPCEnv.Set.sh
- ;;
-- powerpc64-*-freebsd*)
-+ powerpc64-*-freebsd*|powerpc64le-*-freebsd*)
- . ./FreeBSDPPC64Env.Set.sh
- ;;
- # the result here (whether you get x86_64) seems to depend on $CC...