git: 66f37c687ffb - main - editors/openoffice-devel: Upgrade to new snapshot
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 02 Jun 2025 08:38:32 UTC
The branch main has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=66f37c687ffbab63c34eafbb2f2fcb1b43bca5ed commit 66f37c687ffbab63c34eafbb2f2fcb1b43bca5ed Author: Don Lewis <truckman@FreeBSD.org> AuthorDate: 2025-06-02 06:58:15 +0000 Commit: Don Lewis <truckman@FreeBSD.org> CommitDate: 2025-06-02 08:38:17 +0000 editors/openoffice-devel: Upgrade to new snapshot Upgrade to a newer snapshot from the AOO42X branch. Several of our local patch sets have been upstreamed: * epm is not needed for building * re-order compiler include path to avoid picking up unwanted headers. * prepare for new textproc/libxml2. --- editors/openoffice-devel/Makefile | 6 ++--- editors/openoffice-devel/distinfo | 6 ++--- editors/openoffice-devel/files/patch-configure.ac | 11 --------- ...-connectivity_source_drivers_evoab2_makefile.mk | 11 --------- ...atch-forms_source_xforms_submission_makefile.mk | 12 ---------- .../patch-forms_source_xforms_xpathlib_makefile.mk | 12 ---------- .../files/patch-l10ntools_source_help_makefile.mk | 11 --------- .../files/patch-pyuno_source_loader_makefile.mk | 11 --------- .../files/patch-pyuno_source_module_makefile.mk | 11 --------- .../patch-shell_source_backends_kde4be_makefile.mk | 11 --------- .../patch-shell_source_backends_kdebe_makefile.mk | 11 --------- .../files/patch-solenv_inc_target.mk | 14 ----------- .../files/patch-unoxml_source_xpath_xpathapi.cxx | 28 ---------------------- .../patch-xmlsecurity_source_xmlsec_makefile.mk | 12 ---------- ...patch-xmlsecurity_source_xmlsec_nss_makefile.mk | 12 ---------- 15 files changed, 6 insertions(+), 173 deletions(-) diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 573d7754ae6c..4ac58338fea9 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP} -PORTREVISION= 4 +PORTREVISION= 0 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \ @@ -127,8 +127,8 @@ AOOVERSION2= 2 AOOVERSION3= 0 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD AOOTAG= AOO420m4\(Build:9823\) -GITREVISION= 98a91fccb4 -TIMESTAMP= 1731847285 +GITREVISION= 2782f48835 +TIMESTAMP= 1748825067 #AOORC=rc3 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo index d869bdbfc8b7..0ec5fb168574 100644 --- a/editors/openoffice-devel/distinfo +++ b/editors/openoffice-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1731871087 -SHA256 (openoffice/apache-openoffice-1731847285-98a91fccb4-src.tar.xz) = 45b14fc91997dfa4bbcbc8d1734b6f19c5fef535ddfb4317152b99de51abd2a0 -SIZE (openoffice/apache-openoffice-1731847285-98a91fccb4-src.tar.xz) = 246797080 +TIMESTAMP = 1748839941 +SHA256 (openoffice/apache-openoffice-1748825067-2782f48835-src.tar.xz) = fdcefb4c0fcc69911e7a7c66bb9b9ecae317c51d2905ca207fa59954a6de8ac7 +SIZE (openoffice/apache-openoffice-1748825067-2782f48835-src.tar.xz) = 250147008 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/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2) = fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52 diff --git a/editors/openoffice-devel/files/patch-configure.ac b/editors/openoffice-devel/files/patch-configure.ac deleted file mode 100644 index d7178782fa9d..000000000000 --- a/editors/openoffice-devel/files/patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2021-04-17 18:43:53 UTC -+++ configure.ac -@@ -3407,7 +3407,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-devel/files/patch-connectivity_source_drivers_evoab2_makefile.mk b/editors/openoffice-devel/files/patch-connectivity_source_drivers_evoab2_makefile.mk deleted file mode 100644 index bf10327c14b1..000000000000 --- a/editors/openoffice-devel/files/patch-connectivity_source_drivers_evoab2_makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- connectivity/source/drivers/evoab2/makefile.mk.orig 2019-09-17 22:55:11 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-devel/files/patch-forms_source_xforms_submission_makefile.mk b/editors/openoffice-devel/files/patch-forms_source_xforms_submission_makefile.mk deleted file mode 100644 index e54331272a11..000000000000 --- a/editors/openoffice-devel/files/patch-forms_source_xforms_submission_makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- forms/source/xforms/submission/makefile.mk.orig 2019-09-17 22:55:15 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-devel/files/patch-forms_source_xforms_xpathlib_makefile.mk b/editors/openoffice-devel/files/patch-forms_source_xforms_xpathlib_makefile.mk deleted file mode 100644 index 993c6c35d4c9..000000000000 --- a/editors/openoffice-devel/files/patch-forms_source_xforms_xpathlib_makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- forms/source/xforms/xpathlib/makefile.mk.orig 2019-09-17 22:55:15 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-devel/files/patch-l10ntools_source_help_makefile.mk b/editors/openoffice-devel/files/patch-l10ntools_source_help_makefile.mk deleted file mode 100644 index ac561aac276f..000000000000 --- a/editors/openoffice-devel/files/patch-l10ntools_source_help_makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- l10ntools/source/help/makefile.mk.orig 2019-09-17 22:55:16 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-devel/files/patch-pyuno_source_loader_makefile.mk b/editors/openoffice-devel/files/patch-pyuno_source_loader_makefile.mk deleted file mode 100644 index b85f1ee77696..000000000000 --- a/editors/openoffice-devel/files/patch-pyuno_source_loader_makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- pyuno/source/loader/makefile.mk.orig 2019-09-17 22:55:18 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-devel/files/patch-pyuno_source_module_makefile.mk b/editors/openoffice-devel/files/patch-pyuno_source_module_makefile.mk deleted file mode 100644 index f77301eab7f2..000000000000 --- a/editors/openoffice-devel/files/patch-pyuno_source_module_makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- pyuno/source/module/makefile.mk.orig 2019-09-17 22:55:18 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-devel/files/patch-shell_source_backends_kde4be_makefile.mk b/editors/openoffice-devel/files/patch-shell_source_backends_kde4be_makefile.mk deleted file mode 100644 index fc09363afe6d..000000000000 --- a/editors/openoffice-devel/files/patch-shell_source_backends_kde4be_makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- shell/source/backends/kde4be/makefile.mk.orig 2019-09-17 22:55:21 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-devel/files/patch-shell_source_backends_kdebe_makefile.mk b/editors/openoffice-devel/files/patch-shell_source_backends_kdebe_makefile.mk deleted file mode 100644 index 32ad77f1fd52..000000000000 --- a/editors/openoffice-devel/files/patch-shell_source_backends_kdebe_makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- shell/source/backends/kdebe/makefile.mk.orig 2019-09-17 22:55:21 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-devel/files/patch-solenv_inc_target.mk b/editors/openoffice-devel/files/patch-solenv_inc_target.mk deleted file mode 100644 index 71d2e59fe834..000000000000 --- a/editors/openoffice-devel/files/patch-solenv_inc_target.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- solenv/inc/target.mk.orig 2021-04-17 18:43:53 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-devel/files/patch-unoxml_source_xpath_xpathapi.cxx b/editors/openoffice-devel/files/patch-unoxml_source_xpath_xpathapi.cxx deleted file mode 100644 index 9caab82e4df3..000000000000 --- a/editors/openoffice-devel/files/patch-unoxml_source_xpath_xpathapi.cxx +++ /dev/null @@ -1,28 +0,0 @@ ---- unoxml/source/xpath/xpathapi.cxx.orig 2019-09-17 22:55:24 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-devel/files/patch-xmlsecurity_source_xmlsec_makefile.mk b/editors/openoffice-devel/files/patch-xmlsecurity_source_xmlsec_makefile.mk deleted file mode 100644 index 8af1f874ab0f..000000000000 --- a/editors/openoffice-devel/files/patch-xmlsecurity_source_xmlsec_makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- xmlsecurity/source/xmlsec/makefile.mk.orig 2019-09-17 22:55:25 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-devel/files/patch-xmlsecurity_source_xmlsec_nss_makefile.mk b/editors/openoffice-devel/files/patch-xmlsecurity_source_xmlsec_nss_makefile.mk deleted file mode 100644 index caa928d2eaa9..000000000000 --- a/editors/openoffice-devel/files/patch-xmlsecurity_source_xmlsec_nss_makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- xmlsecurity/source/xmlsec/nss/makefile.mk.orig 2019-09-17 22:55:25 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"