summaryrefslogtreecommitdiff
path: root/editors/openoffice-4
diff options
context:
space:
mode:
Diffstat (limited to 'editors/openoffice-4')
-rw-r--r--editors/openoffice-4/Makefile23
-rw-r--r--editors/openoffice-4/distinfo8
-rw-r--r--editors/openoffice-4/files/extra-patch-nm228
-rw-r--r--editors/openoffice-4/files/patch-configure.ac11
-rw-r--r--editors/openoffice-4/files/patch-set_soenv.in67
-rw-r--r--editors/openoffice-4/files/patch-unoxml_source_xpath_xpathapi.cxx28
-rw-r--r--editors/openoffice-4/files/patch-vcl_unx_generic_fontmanager_fontconfig.cxx10
-rw-r--r--editors/openoffice-4/files/patch-writerfilter_source_ooxml_RefAndPointer.hxx24
8 files changed, 249 insertions, 150 deletions
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index 6241cfb961e5..09b260c5bb10 100644
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@@ -1,9 +1,11 @@
PORTNAME= apache-openoffice
-PORTVERSION= ${AOOVERSION}
-PORTREVISION= 5
+PORTVERSION= ${AOOVERSION}${AOORCN:?.p${AOORCN}:}
+PORTREVISION= 0
CATEGORIES= editors java
-MASTER_SITES= https://dlcdn.apache.org/openoffice/${PORTVERSION}/source/ \
- https://archive.apache.org/dist/openoffice/${PORTVERSION}/source/ \
+MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}${AOORCN:?-RC${AOORCN}:}/source/
+#MASTER_SITES= https://dlcdn.apache.org/openoffice/${PORTVERSION}/source/ \
+# https://archive.apache.org/dist/openoffice/${PORTVERSION}/source
+MASTER_SITES+= https://dlcdn.apache.org/openoffice/${PORTVERSION}/source/ \
http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
LOCAL/truckman/openoffice:extsrc \
SF/oooextras.mirror/:sf
@@ -123,10 +125,11 @@ CONFLICTS_INSTALL= apache-openoffice-devel
AOOVERSION1= 4
AOOVERSION2= 1
-AOOVERSION3= 15
+AOOVERSION3= 16
+AOORCN= 2
# From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
-AOOTAG= AOO4115m2\(Build:9813\)
-GITREVISION= 5f13fa0070
+AOOTAG= AOO4116m2\(Build:9815\)
+GITREVISION= 5b1f035b0f
EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
@@ -196,6 +199,11 @@ WITH= SDK
.include <bsd.port.pre.mk>
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500000
+# nm: '../unxfbsdi.pro/slo/b2dcubicbezier.o': Invalid argument
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nm
+.endif
+
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --enable-symbols
.else
@@ -206,6 +214,7 @@ CONFIGURE_ARGS+= --enable-strip-solver
PYTHON_DISTFILE= 38c84292658ed4456157195f1c9bcbe1-Python-2.7.18.tgz
GCC_EXTRA_DISTFILES= d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \
+ e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz \
d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
.if ${CHOSEN_COMPILER_TYPE} == clang
diff --git a/editors/openoffice-4/distinfo b/editors/openoffice-4/distinfo
index 6d6a3a0ad777..50cd42514f12 100644
--- a/editors/openoffice-4/distinfo
+++ b/editors/openoffice-4/distinfo
@@ -1,12 +1,14 @@
-TIMESTAMP = 1707944647
-SHA256 (openoffice/apache-openoffice-4.1.15-5f13fa0070-src.tar.bz2) = 820b5a9e845d9f2476c89424648e68be66d3d54322ded93c60ebd40c930ac707
-SIZE (openoffice/apache-openoffice-4.1.15-5f13fa0070-src.tar.bz2) = 244099652
+TIMESTAMP = 1758871407
+SHA256 (openoffice/apache-openoffice-4.1.16-5b1f035b0f-src.tar.bz2) = aaed9f2d63480c3af726b8908fefa426ea6a5259c3ac9af31e9031d0dba8f015
+SIZE (openoffice/apache-openoffice-4.1.16-5b1f035b0f-src.tar.bz2) = 244018073
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/38c84292658ed4456157195f1c9bcbe1-Python-2.7.18.tgz) = da3080e3b488f648a3d7a4560ddee895284c3380b11d6de75edb986526b9a814
SIZE (openoffice/38c84292658ed4456157195f1c9bcbe1-Python-2.7.18.tgz) = 17539408
SHA256 (openoffice/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2) = fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52
SIZE (openoffice/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2) = 58146647
+SHA256 (openoffice/e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz) = 814de31e1413df945cdd34939b424c4cf7a94d1c481f2d44c99c8ca52b288063
+SIZE (openoffice/e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz) = 13161131
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-4/files/extra-patch-nm b/editors/openoffice-4/files/extra-patch-nm
new file mode 100644
index 000000000000..95db83ded7a8
--- /dev/null
+++ b/editors/openoffice-4/files/extra-patch-nm
@@ -0,0 +1,228 @@
+--- solenv/inc/_tg_lib.mk.bak 2020-10-06 07:16:31.000000000 -0700
++++ solenv/inc/_tg_lib.mk 2025-08-16 22:07:15.548302000 -0700
+@@ -84,7 +84,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ELSE
+- @nm `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
++ @llvm-nm `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ENDIF
+
+ .ELIF "$(GUI)"=="OS2"
+@@ -191,7 +191,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ELSE
+- @nm `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
++ @llvm-nm `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ENDIF
+
+ .ELIF "$(GUI)"=="OS2"
+@@ -298,7 +298,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ELSE
+- @nm `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
++ @llvm-nm `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ENDIF
+
+ .ELIF "$(GUI)"=="OS2"
+@@ -405,7 +405,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ELSE
+- @nm `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
++ @llvm-nm `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ENDIF
+
+ .ELIF "$(GUI)"=="OS2"
+@@ -512,7 +512,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ELSE
+- @nm `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
++ @llvm-nm `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ENDIF
+
+ .ELIF "$(GUI)"=="OS2"
+@@ -619,7 +619,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ELSE
+- @nm `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
++ @llvm-nm `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ENDIF
+
+ .ELIF "$(GUI)"=="OS2"
+@@ -726,7 +726,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ELSE
+- @nm `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
++ @llvm-nm `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ENDIF
+
+ .ELIF "$(GUI)"=="OS2"
+@@ -833,7 +833,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ELSE
+- @nm `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
++ @llvm-nm `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ENDIF
+
+ .ELIF "$(GUI)"=="OS2"
+@@ -940,7 +940,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ELSE
+- @nm `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
++ @llvm-nm `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ENDIF
+
+ .ELIF "$(GUI)"=="OS2"
+@@ -1047,7 +1047,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ELSE
+- @nm `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
++ @llvm-nm `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ENDIF
+
+ .ELIF "$(GUI)"=="OS2"
+--- solenv/inc/_tg_shl.mk.bak 2021-04-02 05:57:59.000000000 -0700
++++ solenv/inc/_tg_shl.mk 2025-08-16 22:07:15.553521000 -0700
+@@ -132,7 +132,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm $(SHL1OBJS:s/.obj/.o/) > $@.dump
+ .ELSE
+- @nm $(SHL1OBJS:s/.obj/.o/) > $@.dump
++ @llvm-nm $(SHL1OBJS:s/.obj/.o/) > $@.dump
+ .ENDIF
+ .ENDIF # "$(SHL1OBJS)!"=""
+ @$(TYPE) /dev/null $(SHL1LIBS:s/.lib/.dump/) >> $@.dump
+@@ -672,7 +672,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm $(SHL2OBJS:s/.obj/.o/) > $@.dump
+ .ELSE
+- @nm $(SHL2OBJS:s/.obj/.o/) > $@.dump
++ @llvm-nm $(SHL2OBJS:s/.obj/.o/) > $@.dump
+ .ENDIF
+ .ENDIF # "$(SHL2OBJS)!"=""
+ @$(TYPE) /dev/null $(SHL2LIBS:s/.lib/.dump/) >> $@.dump
+@@ -1212,7 +1212,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm $(SHL3OBJS:s/.obj/.o/) > $@.dump
+ .ELSE
+- @nm $(SHL3OBJS:s/.obj/.o/) > $@.dump
++ @llvm-nm $(SHL3OBJS:s/.obj/.o/) > $@.dump
+ .ENDIF
+ .ENDIF # "$(SHL3OBJS)!"=""
+ @$(TYPE) /dev/null $(SHL3LIBS:s/.lib/.dump/) >> $@.dump
+@@ -1752,7 +1752,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm $(SHL4OBJS:s/.obj/.o/) > $@.dump
+ .ELSE
+- @nm $(SHL4OBJS:s/.obj/.o/) > $@.dump
++ @llvm-nm $(SHL4OBJS:s/.obj/.o/) > $@.dump
+ .ENDIF
+ .ENDIF # "$(SHL4OBJS)!"=""
+ @$(TYPE) /dev/null $(SHL4LIBS:s/.lib/.dump/) >> $@.dump
+@@ -2292,7 +2292,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm $(SHL5OBJS:s/.obj/.o/) > $@.dump
+ .ELSE
+- @nm $(SHL5OBJS:s/.obj/.o/) > $@.dump
++ @llvm-nm $(SHL5OBJS:s/.obj/.o/) > $@.dump
+ .ENDIF
+ .ENDIF # "$(SHL5OBJS)!"=""
+ @$(TYPE) /dev/null $(SHL5LIBS:s/.lib/.dump/) >> $@.dump
+@@ -2832,7 +2832,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm $(SHL6OBJS:s/.obj/.o/) > $@.dump
+ .ELSE
+- @nm $(SHL6OBJS:s/.obj/.o/) > $@.dump
++ @llvm-nm $(SHL6OBJS:s/.obj/.o/) > $@.dump
+ .ENDIF
+ .ENDIF # "$(SHL6OBJS)!"=""
+ @$(TYPE) /dev/null $(SHL6LIBS:s/.lib/.dump/) >> $@.dump
+@@ -3372,7 +3372,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm $(SHL7OBJS:s/.obj/.o/) > $@.dump
+ .ELSE
+- @nm $(SHL7OBJS:s/.obj/.o/) > $@.dump
++ @llvm-nm $(SHL7OBJS:s/.obj/.o/) > $@.dump
+ .ENDIF
+ .ENDIF # "$(SHL7OBJS)!"=""
+ @$(TYPE) /dev/null $(SHL7LIBS:s/.lib/.dump/) >> $@.dump
+@@ -3912,7 +3912,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm $(SHL8OBJS:s/.obj/.o/) > $@.dump
+ .ELSE
+- @nm $(SHL8OBJS:s/.obj/.o/) > $@.dump
++ @llvm-nm $(SHL8OBJS:s/.obj/.o/) > $@.dump
+ .ENDIF
+ .ENDIF # "$(SHL8OBJS)!"=""
+ @$(TYPE) /dev/null $(SHL8LIBS:s/.lib/.dump/) >> $@.dump
+@@ -4452,7 +4452,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm $(SHL9OBJS:s/.obj/.o/) > $@.dump
+ .ELSE
+- @nm $(SHL9OBJS:s/.obj/.o/) > $@.dump
++ @llvm-nm $(SHL9OBJS:s/.obj/.o/) > $@.dump
+ .ENDIF
+ .ENDIF # "$(SHL9OBJS)!"=""
+ @$(TYPE) /dev/null $(SHL9LIBS:s/.lib/.dump/) >> $@.dump
+@@ -4992,7 +4992,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm $(SHL10OBJS:s/.obj/.o/) > $@.dump
+ .ELSE
+- @nm $(SHL10OBJS:s/.obj/.o/) > $@.dump
++ @llvm-nm $(SHL10OBJS:s/.obj/.o/) > $@.dump
+ .ENDIF
+ .ENDIF # "$(SHL10OBJS)!"=""
+ @$(TYPE) /dev/null $(SHL10LIBS:s/.lib/.dump/) >> $@.dump
+--- solenv/inc/tg_lib.mk.bak 2020-10-06 07:16:31.000000000 -0700
++++ solenv/inc/tg_lib.mk 2025-08-16 22:07:15.557770000 -0700
+@@ -89,7 +89,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ELSE
+- @nm `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
++ @llvm-nm `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ENDIF
+
+ .ELIF "$(GUI)"=="OS2"
+--- solenv/inc/tg_obj.mk.bak 2020-10-06 07:16:31.000000000 -0700
++++ solenv/inc/tg_obj.mk 2025-08-16 22:07:15.561499000 -0700
+@@ -48,7 +48,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm `cat $(OBJTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ELSE
+- @nm `cat $(OBJTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
++ @llvm-nm `cat $(OBJTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ENDIF
+ .ENDIF # "$(GUI)"=="UNX"
+ .ENDIF # "$(OBJTARGET)"!=""
+--- solenv/inc/tg_shl.mk.bak 2021-04-02 05:57:59.000000000 -0700
++++ solenv/inc/tg_shl.mk 2025-08-16 22:07:15.565476000 -0700
+@@ -137,7 +137,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm $(SHL$(TNR)OBJS:s/.obj/.o/) > $@.dump
+ .ELSE
+- @nm $(SHL$(TNR)OBJS:s/.obj/.o/) > $@.dump
++ @llvm-nm $(SHL$(TNR)OBJS:s/.obj/.o/) > $@.dump
+ .ENDIF
+ .ENDIF # "$(SHL$(TNR)OBJS)!"=""
+ @$(TYPE) /dev/null $(SHL$(TNR)LIBS:s/.lib/.dump/) >> $@.dump
+--- solenv/inc/tg_slo.mk.bak 2020-10-06 07:16:32.000000000 -0700
++++ solenv/inc/tg_slo.mk 2025-08-16 22:07:15.569405000 -0700
+@@ -55,7 +55,7 @@
+ .IF "$(OS)"=="MACOSX"
+ @-nm `cat $(SLOTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ELSE
+- @nm `cat $(SLOTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
++ @llvm-nm `cat $(SLOTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
+ .ENDIF
+ .ENDIF # "$(GUI)"=="UNX"
+ .ENDIF # "$(SLOTARGET)"!=""
diff --git a/editors/openoffice-4/files/patch-configure.ac b/editors/openoffice-4/files/patch-configure.ac
deleted file mode 100644
index e7b392f1aea2..000000000000
--- a/editors/openoffice-4/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig 2025-04-12 20:16:51 UTC
-+++ configure.ac
-@@ -3377,7 +3377,7 @@ if test "$enable_epm" = "yes"; then
- dnl ===================================================================
- dnl Check for epm - not needed for windows
- dnl ===================================================================
-- if test "$_os" != "WINNT"; then
-+ if test "$_os" != "WINNT" -a "$with_package_format" != "archive"; then
- if test -n "$with_epm"; then
- EPM=$with_epm
- else
diff --git a/editors/openoffice-4/files/patch-set_soenv.in b/editors/openoffice-4/files/patch-set_soenv.in
deleted file mode 100644
index a5072d9bcb71..000000000000
--- a/editors/openoffice-4/files/patch-set_soenv.in
+++ /dev/null
@@ -1,67 +0,0 @@
---- set_soenv.in 2021-04-02 08:58:22.000000000 -0400
-+++ set_soenv.in 2021-04-17 14:43:53.000000000 -0400
-@@ -408,46 +403,26 @@
- $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
- $EPM_FLAGS = "-a arm";
- }
-- elsif ($platform =~ m/^powerpc/)
-- {
-- if (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8')) {
-- print "Setting FreeBSD PPC64 specific values... ";
-- $outfile = "FreeBSDPPC64Env.Set";
-- $OUTPATH = "unxfbsdppc64";
-- $CPUNAME = "POWERPC64";
--
-- if ( $JDK eq "gcj" ) {
-- $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64";
-- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."client";
-- $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
-- }
-- }
-- else {
-- print "Setting FreeBSD PPC specific values... ";
-- $outfile = "FreeBSDPPCEnv.Set";
-- $OUTPATH = "unxlngppc";
-- $CPUNAME = "POWERPC";
--
-- if ( $JDK eq "gcj" ) {
-- $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
-- $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; }
-- elsif ($JDK =~ m/^[Ii][Bb][Mm]/)
-- { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
-- $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-- }
-- # OpenJDK
-- elsif ($JDK =~ m/sun/) {
-- $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."server";
-- $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
-- }
-- }
--
-+ elsif (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8'))
-+ { print "Setting FreeBSD PPC64 specific values... ";
-+ $outfile = "FreeBSDPPC64Env.Set";
- $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";
- }
-+ elsif ($platform =~ m/powerpc/)
-+ { print "Setting FreeBSD PPC specific values... ";
-+ $outfile = "FreeBSDPPCEnv.Set";
-+ $CPU = "P";
-+ $CPUNAME = "POWERPC";
-+ $OUTPATH = "unxfbsdppc";
-+ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
-+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
-+ }
- else
- { print "Unsupported FreeBSD architecture: $platform \n";
- exit 1;
diff --git a/editors/openoffice-4/files/patch-unoxml_source_xpath_xpathapi.cxx b/editors/openoffice-4/files/patch-unoxml_source_xpath_xpathapi.cxx
deleted file mode 100644
index e81aaf1c06f8..000000000000
--- a/editors/openoffice-4/files/patch-unoxml_source_xpath_xpathapi.cxx
+++ /dev/null
@@ -1,28 +0,0 @@
---- unoxml/source/xpath/xpathapi.cxx.orig 2020-10-06 14:16:35 UTC
-+++ unoxml/source/xpath/xpathapi.cxx
-@@ -267,7 +267,11 @@ namespace XPath
- return selectSingleNode(contextNode, expr);
- }
-
-- static OUString make_error_message(xmlErrorPtr pError)
-+#if LIBXML_VERSION >= 21200
-+ static OUString make_error_message(const xmlError *pError)
-+#else
-+ static OUString make_error_message(xmlError *pError)
-+#endif
- {
- ::rtl::OUStringBuffer buf;
- if (pError->message) {
-@@ -312,7 +316,11 @@ namespace XPath
- OSL_ENSURE(sal_False, msg.getStr());
- }
-
-- static void structured_error_func(void * userData, xmlErrorPtr error)
-+#if LIBXML_VERSION >= 21200
-+ static void structured_error_func(void * userData, const xmlError *error)
-+#else
-+ static void structured_error_func(void * userData, xmlError *error)
-+#endif
- {
- (void) userData;
- ::rtl::OUStringBuffer buf(
diff --git a/editors/openoffice-4/files/patch-vcl_unx_generic_fontmanager_fontconfig.cxx b/editors/openoffice-4/files/patch-vcl_unx_generic_fontmanager_fontconfig.cxx
deleted file mode 100644
index 8806abdb1e3b..000000000000
--- a/editors/openoffice-4/files/patch-vcl_unx_generic_fontmanager_fontconfig.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- vcl/unx/generic/fontmanager/fontconfig.cxx.orig 2020-10-06 14:16:35 UTC
-+++ vcl/unx/generic/fontmanager/fontconfig.cxx
-@@ -456,6 +456,7 @@ void FontCfgWrapper::addFontSet( FcSetName eSetName )
- if( m_nFcVersion > 20400 ) // #i115204# avoid trouble with old FC versions
- {
- FcPattern* pTestPattern = FcPatternDuplicate( pOrigPattern );
-+ FcDefaultSubstitute( pTestPattern );
- FcPatternAddBool( pTestPattern, FC_OUTLINE, FcTrue );
- // TODO: ignore all attributes that are not interesting for finding dupes
- // e.g. by using pattern->ImplFontAttr->pattern conversion
diff --git a/editors/openoffice-4/files/patch-writerfilter_source_ooxml_RefAndPointer.hxx b/editors/openoffice-4/files/patch-writerfilter_source_ooxml_RefAndPointer.hxx
deleted file mode 100644
index ca7a35f3d1e8..000000000000
--- a/editors/openoffice-4/files/patch-writerfilter_source_ooxml_RefAndPointer.hxx
+++ /dev/null
@@ -1,24 +0,0 @@
---- writerfilter/source/ooxml/RefAndPointer.hxx.orig 2021-04-02 12:58:23 UTC
-+++ writerfilter/source/ooxml/RefAndPointer.hxx
-@@ -98,13 +98,14 @@ class RefAndPointer (public)
- ChildClass * getPointer() const { return mpHandler; }
- const uno::Reference<Interface> getRef() const { return mRef; }
-
-- RefAndPointer & operator=
-- (const RefAndPointer & rSrc)
-- {
-- set(rSrc.getHandler());
--
-- return *this;
-- }
-+// ...RefAndPointer.hxx:104:18: error: no member named 'getHandler' in 'RefAndPointer<Interface, ChildClass>'; did you mean 'mpHandler'?
-+// RefAndPointer & operator=
-+// (const RefAndPointer & rSrc)
-+// {
-+// set(rSrc.getHandler());
-+//
-+// return *this;
-+// }
-
- bool is() { return getRef().is(); }
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-02 12:39:46 +0000