diff options
Diffstat (limited to 'editors/openoffice-4')
28 files changed, 245 insertions, 423 deletions
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index 4988d996dfa8..09b260c5bb10 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -1,9 +1,11 @@ PORTNAME= apache-openoffice -PORTVERSION= ${AOOVERSION} -PORTREVISION= 6 +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} @@ -198,7 +201,7 @@ WITH= SDK .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500000 # nm: '../unxfbsdi.pro/slo/b2dcubicbezier.o': Invalid argument -MAKE_JOBS_UNSAFE= yes +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nm .endif .if defined(WITH_DEBUG) @@ -211,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-canvas_source_cairo_makefile.mk b/editors/openoffice-4/files/patch-canvas_source_cairo_makefile.mk deleted file mode 100644 index aa9bf8b03708..000000000000 --- a/editors/openoffice-4/files/patch-canvas_source_cairo_makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- canvas/source/cairo/makefile.mk.orig 2021-04-02 12:58:20 UTC -+++ canvas/source/cairo/makefile.mk -@@ -49,7 +49,7 @@ DLLPRE = - - - .IF "$(SYSTEM_CAIRO)" == "YES" --CFLAGS+=$(CAIRO_CFLAGS) -+INCSYSTEM+=$(CAIRO_CFLAGS) - .ELSE - CFLAGS+=-I$(SOLARINCDIR)/cairo - .ENDIF 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-connectivity_source_drivers_evoab2_makefile.mk b/editors/openoffice-4/files/patch-connectivity_source_drivers_evoab2_makefile.mk deleted file mode 100644 index c82be1905eaa..000000000000 --- a/editors/openoffice-4/files/patch-connectivity_source_drivers_evoab2_makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- connectivity/source/drivers/evoab2/makefile.mk.orig 2020-10-06 14:16:17 UTC -+++ connectivity/source/drivers/evoab2/makefile.mk -@@ -41,7 +41,7 @@ PKGCONFIG_MODULES=gtk+-2.0 - PKGCONFIG_MODULES=gtk+-2.0 - .INCLUDE : pkg_config.mk - --CFLAGS+=$(GOBJECT_CFLAGS) -+INCSYSTEM+=$(GOBJECT_CFLAGS) - - # --- Files ------------------------------------- - diff --git a/editors/openoffice-4/files/patch-connectivity_source_drivers_kab_makefile.mk b/editors/openoffice-4/files/patch-connectivity_source_drivers_kab_makefile.mk deleted file mode 100644 index e53a78202a13..000000000000 --- a/editors/openoffice-4/files/patch-connectivity_source_drivers_kab_makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- connectivity/source/drivers/kab/makefile.mk.orig 2021-04-02 12:58:20 UTC -+++ connectivity/source/drivers/kab/makefile.mk -@@ -38,7 +38,7 @@ VISIBILITY_HIDDEN=TRUE - .IF "$(GUI)" == "UNX" - .IF "$(ENABLE_KAB)" == "TRUE" - --CFLAGS+=$(KDE_CFLAGS) -+INCSYSTEM+=$(KDE_CFLAGS) - - .IF "$(KDE_ROOT)"!="" - EXTRALIBPATHS+=-L$(KDE_ROOT)$/lib diff --git a/editors/openoffice-4/files/patch-forms_source_xforms_submission_makefile.mk b/editors/openoffice-4/files/patch-forms_source_xforms_submission_makefile.mk deleted file mode 100644 index 29d5e45ec891..000000000000 --- a/editors/openoffice-4/files/patch-forms_source_xforms_submission_makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- forms/source/xforms/submission/makefile.mk.orig 2020-10-06 14:16:22 UTC -+++ forms/source/xforms/submission/makefile.mk -@@ -34,7 +34,8 @@ ENABLE_EXCEPTIONS=TRUE - .INCLUDE: $(PRJ)$/makefile.pmk - - .IF "$(SYSTEM_LIBXML)" == "YES" --CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) -+INCSYSTEM+=$(LIBXML_CFLAGS) -+CFLAGS+=-DSYSTEM_LIBXML - .ENDIF - - # --- Files -------------------------------------------------------- diff --git a/editors/openoffice-4/files/patch-forms_source_xforms_xpathlib_makefile.mk b/editors/openoffice-4/files/patch-forms_source_xforms_xpathlib_makefile.mk deleted file mode 100644 index 89c9ff106212..000000000000 --- a/editors/openoffice-4/files/patch-forms_source_xforms_xpathlib_makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- forms/source/xforms/xpathlib/makefile.mk.orig 2020-10-06 14:16:22 UTC -+++ forms/source/xforms/xpathlib/makefile.mk -@@ -36,7 +36,8 @@ INCPRE+=$(PRJ)$/source$/inc - INCPRE+=$(PRJ)$/source$/inc - - .IF "$(SYSTEM_LIBXML)" == "YES" --CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) -+INCSYSTEM+=$(LIBXML_CFLAGS) -+CFLAGS+=-DSYSTEM_LIBXML - .ENDIF - - # --- Files -------------------------------------------------------- diff --git a/editors/openoffice-4/files/patch-fpicker_source_unx_gnome_makefile.mk b/editors/openoffice-4/files/patch-fpicker_source_unx_gnome_makefile.mk deleted file mode 100644 index 6f79e6eb7be9..000000000000 --- a/editors/openoffice-4/files/patch-fpicker_source_unx_gnome_makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- fpicker/source/unx/gnome/makefile.mk.orig 2021-04-02 12:58:21 UTC -+++ fpicker/source/unx/gnome/makefile.mk -@@ -56,7 +56,7 @@ CFLAGS+= $(WIDGETSET_CFLAGS) - .ELSE - - CFLAGS+= $(WIDGETSET_CFLAGS) --CFLAGS+= $(PKGCONFIG_CFLAGS) -+INCSYSTEM+= $(PKGCONFIG_CFLAGS) - - # --- Files -------------------------------------------------------- - diff --git a/editors/openoffice-4/files/patch-fpicker_source_unx_kde4_makefile.mk b/editors/openoffice-4/files/patch-fpicker_source_unx_kde4_makefile.mk deleted file mode 100644 index 669e096bb2a3..000000000000 --- a/editors/openoffice-4/files/patch-fpicker_source_unx_kde4_makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- fpicker/source/unx/kde4/makefile.mk.orig 2021-04-02 12:58:21 UTC -+++ fpicker/source/unx/kde4/makefile.mk -@@ -43,7 +43,7 @@ dummy: - - .ELSE # we build for KDE - --CFLAGS+= $(KDE4_CFLAGS) -+INCSYSTEM+= $(KDE4_CFLAGS) - - # --- Files -------------------------------------------------------- - diff --git a/editors/openoffice-4/files/patch-jvmfwk_source_makefile.mk b/editors/openoffice-4/files/patch-jvmfwk_source_makefile.mk deleted file mode 100644 index 8a06fc9f2166..000000000000 --- a/editors/openoffice-4/files/patch-jvmfwk_source_makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- jvmfwk/source/makefile.mk.orig 2021-04-02 12:58:21 UTC -+++ jvmfwk/source/makefile.mk -@@ -34,7 +34,8 @@ UNIXVERSIONNAMES = UDK - .INCLUDE: settings.mk - - .IF "$(SYSTEM_LIBXML)" == "YES" --CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) -+INCSYSTEM+=$(LIBXML_CFLAGS) -+CFLAGS+=-DSYSTEM_LIBXML - .ENDIF - - UNOUCROUT = $(OUT)$/inc diff --git a/editors/openoffice-4/files/patch-l10ntools_source_help_makefile.mk b/editors/openoffice-4/files/patch-l10ntools_source_help_makefile.mk deleted file mode 100644 index b56a1e8dc100..000000000000 --- a/editors/openoffice-4/files/patch-l10ntools_source_help_makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- l10ntools/source/help/makefile.mk.orig 2020-10-06 14:16:24 UTC -+++ l10ntools/source/help/makefile.mk -@@ -34,7 +34,7 @@ TARGETTYPE=CUI - .INCLUDE : helplinker.pmk - - .IF "$(SYSTEM_LIBXSLT)" == "YES" --CFLAGS+= $(LIBXSLT_CFLAGS) -+INCSYSTEM+= $(LIBXSLT_CFLAGS) - .ELSE - LIBXSLTINCDIR=external$/libxslt - CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR) diff --git a/editors/openoffice-4/files/patch-oox_source_core_makefile.mk b/editors/openoffice-4/files/patch-oox_source_core_makefile.mk deleted file mode 100644 index 732f8945a87d..000000000000 --- a/editors/openoffice-4/files/patch-oox_source_core_makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- oox/source/core/makefile.mk.orig 2021-04-02 12:58:21 UTC -+++ oox/source/core/makefile.mk -@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS=TRUE - .INCLUDE: $(PRJ)$/util$/makefile.pmk - - .IF "$(SYSTEM_OPENSSL)" == "YES" --CFLAGS+= $(OPENSSL_CFLAGS) -+INCSYSTEM+= $(OPENSSL_CFLAGS) - .ENDIF - - # --- Files -------------------------------------------------------- diff --git a/editors/openoffice-4/files/patch-pyuno_source_loader_makefile.mk b/editors/openoffice-4/files/patch-pyuno_source_loader_makefile.mk deleted file mode 100644 index ac2cfb0180c7..000000000000 --- a/editors/openoffice-4/files/patch-pyuno_source_loader_makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- pyuno/source/loader/makefile.mk.orig 2020-10-06 14:16:27 UTC -+++ pyuno/source/loader/makefile.mk -@@ -41,7 +41,7 @@ PYTHONLIB=$(PYTHON_LIBS) - - .IF "$(SYSTEM_PYTHON)" == "YES" - PYTHONLIB=$(PYTHON_LIBS) --CFLAGS+=$(PYTHON_CFLAGS) -+INCSYSTEM+=$(PYTHON_CFLAGS) - .IF "$(EXTRA_CFLAGS)"!="" - PYTHONLIB+=-framework Python - .ENDIF # "$(EXTRA_CFLAGS)"!="" diff --git a/editors/openoffice-4/files/patch-pyuno_source_module_makefile.mk b/editors/openoffice-4/files/patch-pyuno_source_module_makefile.mk deleted file mode 100644 index a2ffb4a5af1b..000000000000 --- a/editors/openoffice-4/files/patch-pyuno_source_module_makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- pyuno/source/module/makefile.mk.orig 2020-10-06 14:16:27 UTC -+++ pyuno/source/module/makefile.mk -@@ -60,7 +60,7 @@ PYTHONLIB=$(PYTHON_LIBS) - - .IF "$(SYSTEM_PYTHON)" == "YES" - PYTHONLIB=$(PYTHON_LIBS) --CFLAGS+=$(PYTHON_CFLAGS) -+INCSYSTEM+=$(PYTHON_CFLAGS) - .ELSE # "$(SYSTEM_PYTHON)" == "YES" - .INCLUDE : pyversion.mk - CFLAGS+=-I$(SOLARINCDIR)$/python diff --git a/editors/openoffice-4/files/patch-sccomp_source_solver_makefile.mk b/editors/openoffice-4/files/patch-sccomp_source_solver_makefile.mk deleted file mode 100644 index 5160a24da180..000000000000 --- a/editors/openoffice-4/files/patch-sccomp_source_solver_makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- sccomp/source/solver/makefile.mk.orig 2021-04-02 12:58:22 UTC -+++ sccomp/source/solver/makefile.mk -@@ -66,7 +66,8 @@ DEF1NAME= $(SHL1TARGET) - DEF1NAME= $(SHL1TARGET) - - .IF "$(SYSTEM_COINMP)" == "YES" --CFLAGS+= $(COINMP_CFLAGS) -DSYSTEM_COINMP -+INCSYSTEM+= $(COINMP_CFLAGS) -+CFLAGS+= -DSYSTEM_COINMP - # Use the library flags from configure - SHL1STDLIBS+=$(COINMP_LIBS) - .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-shell_source_backends_kde4be_makefile.mk b/editors/openoffice-4/files/patch-shell_source_backends_kde4be_makefile.mk deleted file mode 100644 index 4ddcef72e029..000000000000 --- a/editors/openoffice-4/files/patch-shell_source_backends_kde4be_makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- shell/source/backends/kde4be/makefile.mk.orig 2020-10-06 14:16:31 UTC -+++ shell/source/backends/kde4be/makefile.mk -@@ -45,7 +45,7 @@ DLLPRE = - - .IF "$(ENABLE_KDE4)" == "TRUE" - --CFLAGS+=$(KDE4_CFLAGS) -+INCSYSTEM+=$(KDE4_CFLAGS) - - # --- Files --- - diff --git a/editors/openoffice-4/files/patch-shell_source_backends_kdebe_makefile.mk b/editors/openoffice-4/files/patch-shell_source_backends_kdebe_makefile.mk deleted file mode 100644 index 057fc4e09b35..000000000000 --- a/editors/openoffice-4/files/patch-shell_source_backends_kdebe_makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- shell/source/backends/kdebe/makefile.mk.orig 2020-10-06 14:16:31 UTC -+++ shell/source/backends/kdebe/makefile.mk -@@ -45,7 +45,7 @@ DLLPRE = - - .IF "$(ENABLE_KDE)" == "TRUE" - --CFLAGS+=$(KDE_CFLAGS) -+INCSYSTEM+=$(KDE_CFLAGS) - - # --- Files --- - diff --git a/editors/openoffice-4/files/patch-solenv_inc_target.mk b/editors/openoffice-4/files/patch-solenv_inc_target.mk deleted file mode 100644 index 959c7d0c0950..000000000000 --- a/editors/openoffice-4/files/patch-solenv_inc_target.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- solenv/inc/target.mk.orig 2021-04-02 12:58:22 UTC -+++ solenv/inc/target.mk -@@ -57,9 +57,9 @@ INCLUDE:= - INCLUDE:= - .EXPORT : INCLUDE - .IF "$(PRJINC)"!="" --INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) -+INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) $(INCSYSTEM) - .ELSE # "$(PRJINC)"!="" --INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) -+INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) $(INCSYSTEM) - .ENDIF # "$(PRJINC)"!="" - INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE)) - .EXPORT : LIB diff --git a/editors/openoffice-4/files/patch-ucb_source_ucp_webdav_makefile.mk b/editors/openoffice-4/files/patch-ucb_source_ucp_webdav_makefile.mk deleted file mode 100644 index 5c5310cd36e1..000000000000 --- a/editors/openoffice-4/files/patch-ucb_source_ucp_webdav_makefile.mk +++ /dev/null @@ -1,46 +0,0 @@ ---- ucb/source/ucp/webdav/makefile.mk.orig 2021-04-02 12:58:23 UTC -+++ ucb/source/ucp/webdav/makefile.mk -@@ -56,7 +56,7 @@ SERFINCDIR=serf - # - - .IF "$(SYSTEM_APR)" == "YES" --CFLAGS+= $(APR_CFLAGS) -+INCSYSTEM+= $(APR_CFLAGS) - SHL1STDLIBS+=$(APR_LIBS) - .ELSE - CFLAGS+= -I$(SOLARINCDIR)$/$(APRINCDIR) -@@ -67,7 +67,7 @@ CFLAGS+=\ - .ENDIF - - .IF "$(SYSTEM_APR_UTIL)" == "YES" --CFLAGS+= $(APR_UTIL_CFLAGS) -+INCSYSTEM+= $(APR_UTIL_CFLAGS) - SHL1STDLIBS+=$(APR_UTIL_LIBS) - .ELSE - CFLAGS+= -I$(SOLARINCDIR)$/$(APRUTILINCDIR) -@@ -78,7 +78,7 @@ CFLAGS+=\ - .ENDIF - - .IF "$(SYSTEM_SERF)" == "YES" --CFLAGS+= $(SERF_CFLAGS) -+INCSYSTEM+= $(SERF_CFLAGS) - SHL1STDLIBS+=$(SERF_LIBS) - .ELSE - CFLAGS+= -I$(SOLARINCDIR)$/$(SERFINCDIR) -@@ -89,14 +89,14 @@ CFLAGS+=\ - .ENDIF - - .IF "$(SYSTEM_LIBXML)" == "YES" --CFLAGS+= $(LIBXML_CFLAGS) -+INCSYSTEM+= $(LIBXML_CFLAGS) - .ELSE - LIBXMLINCDIR=external$/libxml - CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR) - .ENDIF - - .IF "$(SYSTEM_OPENSSL)" == "YES" --CFLAGS+= -I$(OPENSSL_CFLAGS) -+INCSYSTEM+= -I$(OPENSSL_CFLAGS) - SHL1STDLIBS+= $(OPENSSLLIB) - .ELSE - SHL1STDLIBS+= $(OPENSSLLIBST) 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(); } - diff --git a/editors/openoffice-4/files/patch-xmlhelp_source_cxxhelp_provider_makefile.mk b/editors/openoffice-4/files/patch-xmlhelp_source_cxxhelp_provider_makefile.mk deleted file mode 100644 index 946e39cd7cae..000000000000 --- a/editors/openoffice-4/files/patch-xmlhelp_source_cxxhelp_provider_makefile.mk +++ /dev/null @@ -1,19 +0,0 @@ ---- xmlhelp/source/cxxhelp/provider/makefile.mk.orig 2021-04-02 12:58:23 UTC -+++ xmlhelp/source/cxxhelp/provider/makefile.mk -@@ -49,14 +49,14 @@ CFLAGS += -DHAVE_EXPAT_H - CFLAGS += -DHAVE_EXPAT_H - - .IF "$(SYSTEM_LIBXML)" == "YES" --CFLAGS+= $(LIBXML_CFLAGS) -+INCSYSTEM+= $(LIBXML_CFLAGS) - .ELSE - LIBXMLINCDIR=external$/libxml - CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR) - .ENDIF - - .IF "$(SYSTEM_LIBXSLT)" == "YES" --CFLAGS+= $(LIBXSLT_CFLAGS) -+INCSYSTEM+= $(LIBXSLT_CFLAGS) - .ELSE - LIBXSLTINCDIR=external$/libxslt - CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR) diff --git a/editors/openoffice-4/files/patch-xmlsecurity_source_xmlsec_makefile.mk b/editors/openoffice-4/files/patch-xmlsecurity_source_xmlsec_makefile.mk deleted file mode 100644 index bb8fb3f26f79..000000000000 --- a/editors/openoffice-4/files/patch-xmlsecurity_source_xmlsec_makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- xmlsecurity/source/xmlsec/makefile.mk.orig 2020-10-06 14:16:36 UTC -+++ xmlsecurity/source/xmlsec/makefile.mk -@@ -34,7 +34,8 @@ ENABLE_EXCEPTIONS = TRUE - .INCLUDE : $(PRJ)$/util$/target.pmk - - .IF "$(SYSTEM_LIBXML)" == "YES" --CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) -+INCSYSTEM+=$(LIBXML_CFLAGS) -+CFLAGS+=-DSYSTEM_LIBXML - .ENDIF - - .IF "$(ENABLE_NSS_MODULE)"!="YES" diff --git a/editors/openoffice-4/files/patch-xmlsecurity_source_xmlsec_nss_makefile.mk b/editors/openoffice-4/files/patch-xmlsecurity_source_xmlsec_nss_makefile.mk deleted file mode 100644 index b366deb73a49..000000000000 --- a/editors/openoffice-4/files/patch-xmlsecurity_source_xmlsec_nss_makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- xmlsecurity/source/xmlsec/nss/makefile.mk.orig 2021-04-02 12:58:23 UTC -+++ xmlsecurity/source/xmlsec/nss/makefile.mk -@@ -34,7 +34,8 @@ ENABLE_EXCEPTIONS = TRUE - .INCLUDE : $(PRJ)$/util$/target.pmk - - .IF "$(SYSTEM_LIBXML)" == "YES" --CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) -+INCSYSTEM+=$(LIBXML_CFLAGS) -+CFLAGS+=-DSYSTEM_LIBXML - .ENDIF - - .IF "$(ENABLE_NSS_MODULE)"!="YES" |