This is an automated email from the ASF dual-hosted git repository. jimjag pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 1e361ffd27367b00a8000f78e918297c41e8379c Author: Jim Jagielski <[email protected]> AuthorDate: Fri Aug 7 06:07:58 2026 -0400 Step Two of AOO42X macOS build backports. Backport macOS build and packaging fixes from trunk From 4195d08bb6: drop --with-www=xml from raptor, rasqal and redland, as libxml2 2.12 removed xmlNanoHTTP*; add the mso_lineNone sentinel so the ww8 filter no longer switches on a value outside MSO_LineStyle. From 6ebbb19991: resolve $TMPDIR through Cwd::realpath before packaging, since Archive::Zip refuses to extract through the /var symlink. Only that hunk applies here; the macab1 path change is trunk-specific, as AOO42X still delivers macab1.component flat. --- main/filter/source/msfilter/msdffimp.cxx | 2 +- main/redland/raptor/makefile.mk | 13 ++++++++++--- main/redland/rasqal/makefile.mk | 2 +- main/redland/redland/makefile.mk | 6 +++--- main/solenv/bin/modules/installer/parameter.pm | 9 +++++++++ main/svx/inc/svx/msdffdef.hxx | 3 ++- main/sw/source/filter/ww8/ww8graf.cxx | 2 +- main/sw/source/filter/ww8/ww8par.cxx | 2 +- 8 files changed, 28 insertions(+), 11 deletions(-) diff --git a/main/filter/source/msfilter/msdffimp.cxx b/main/filter/source/msfilter/msdffimp.cxx index fa4fcaf4fd..4873ebb897 100644 --- a/main/filter/source/msfilter/msdffimp.cxx +++ b/main/filter/source/msfilter/msdffimp.cxx @@ -5554,7 +5554,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, ? (MSO_LineStyle)GetPropertyValue( DFF_Prop_lineStyle, mso_lineSimple ) - : (MSO_LineStyle)USHRT_MAX; + : mso_lineNone; pTextImpRec->eLineStyle = pImpRec->eLineStyle; if( pImpRec->nShapeId ) diff --git a/main/redland/raptor/makefile.mk b/main/redland/raptor/makefile.mk index 2d42f7c4e0..86193bdd69 100644 --- a/main/redland/raptor/makefile.mk +++ b/main/redland/raptor/makefile.mk @@ -59,7 +59,8 @@ OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2 CONFIGURE_DIR= CONFIGURE_ACTION=libtoolize && aclocal && autoconf && .$/configure # do not enable grddl parser (#i93768#) -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(PWD)/$(OUT) --includedir=(PWD)$/$(INCCOM) --libdir=$(PWD)$/$(LB) +# www=none: see the unix/macOS stanza near the bottom of this file for why +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=none --prefix=$(PWD)/$(OUT) --includedir=(PWD)$/$(INCCOM) --libdir=$(PWD)$/$(LB) BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -78,7 +79,8 @@ raptor_LIBS+=$(MINGW_SHARED_LIBSTDCPP) CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure # do not enable grddl parser (#i93768#) -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" --prefix=$(PWD)/$(OUT) --includedir=(PWD)$/$(INCCOM) --libdir=$(PWD)$/$(LB) --CC="$(raptor_CC)" CPPFLAGS="-nostdinc $( [...] +# www=none: see the unix/macOS stanza near the bottom of this file for why +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=none --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" --prefix=$(PWD)/$(OUT) --includedir=(PWD)$/$(INCCOM) --libdir=$(PWD)$/$(LB) --CC="$(raptor_CC)" CPPFLAGS="-nostdinc $ [...] BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -137,7 +139,12 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure # do not enable grddl parser (#i93768#) -CONFIGURE_FLAGS=--with-threads --with-curl-config=no --with-icu-config=no --disable-static --disable-gtk-doc --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(PDW)/$(OUT) --includedir=$(PWD)/$(INCCOM) --libdir=$(PWD)/$(LB) +# www=none: raptor's URI-fetch backend is both unused and unbuildable here. +# Unused: grddl, the only parser that dereferences remote URIs, is excluded +# above, and AOO's own RDF consumer (unoxml/source/rdf/librdf_repository.cxx) +# only ever parses local streams; curl is off too (--with-curl-config=no below). +# Unbuildable: the libxml backend calls xmlNanoHTTP*, removed in libxml2 2.12. +CONFIGURE_FLAGS=--with-threads --with-curl-config=no --with-icu-config=no --disable-static --disable-gtk-doc --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=none --prefix=$(PDW)/$(OUT) --includedir=$(PWD)/$(INCCOM) --libdir=$(PWD)/$(LB) .IF "$(SYSTEM_LIBXML)" == "NO" CONFIGURE_FLAGS+=--with-xml2-config=${SOLARVERSION}/${INPATH}/bin/xml2-config \ --with-xslt-config=${SOLARVERSION}/${INPATH}/bin/xslt-config diff --git a/main/redland/rasqal/makefile.mk b/main/redland/rasqal/makefile.mk index c0eb2585f0..01789a5c60 100644 --- a/main/redland/rasqal/makefile.mk +++ b/main/redland/rasqal/makefile.mk @@ -74,7 +74,7 @@ rasqal_LIBS+=$(MINGW_SHARED_LIBSTDCPP) CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJD [...] +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) [...] BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/main/redland/redland/makefile.mk b/main/redland/redland/makefile.mk index 07af657757..48e75c941e 100644 --- a/main/redland/redland/makefile.mk +++ b/main/redland/redland/makefile.mk @@ -59,7 +59,7 @@ PATCH_FILES=$(OOO_PATCH_FILES) \ OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2 CONFIGURE_DIR= CONFIGURE_ACTION=libtoolize --force && aclocal && autoconf && .$/configure RAPTOR2_CFLAGS=-I${PWD}$/..$/${INPATH}/inc RAPTOR2_LIBS='-L${PWD}/..$/${INPATH}/lib -lraptor2 -lxml2 -lcurl' PKG_CONFIG_PATH='../raptor2-2.0.15;../rasqal-0.9.33' -CONFIGURE_FLAGS=--disable-dependency-tracking --disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore -without-iodbc --without-unixodbc --without-datadirect --without-virtuoso --with-regex-library=posix --with-decimal=none --with-www=xml --disable-ltdl-install --disable-modular --without-included-ltdl --disable-ltdl- [...] +CONFIGURE_FLAGS=--disable-dependency-tracking --disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore -without-iodbc --without-unixodbc --without-datadirect --without-virtuoso --with-regex-library=posix --with-decimal=none --disable-ltdl-install --disable-modular --without-included-ltdl --disable-ltdl-convenience BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -76,7 +76,7 @@ redland_LIBS+=$(MINGW_SHARED_LIBSTDCPP) CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(redland_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-al [...] +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(redland_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(I [...] BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -129,7 +129,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config CONFIGURE_DIR= #CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" RAPTOR2_CFLAGS=-I${PWD}$/..$/${INPATH}/inc RAPTOR2_LIBS="-L${PWD}/..$/${INPATH}/lib -lraptor2" PKG_CONFIG_PATH="../raptor2-2.0.15:../rasqal-0.9.33" CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" PKG_CONFIG_PATH="../raptor2-2.0.15:../rasqal-0.9.33" -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore -without-iodbc --without-unixodbc --without-datadirect --without-virtuoso --with-regex-library=posix --with-decimal=none --with-www=xml --disable-ltdl-install --disable-modular --without-included-ltdl --disable-ltdl-convenience +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore -without-iodbc --without-unixodbc --without-datadirect --without-virtuoso --with-regex-library=posix --with-decimal=none --disable-ltdl-install --disable-modular --without-included-ltdl --disable-ltdl-convenience BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/main/solenv/bin/modules/installer/parameter.pm b/main/solenv/bin/modules/installer/parameter.pm index 820ec747df..419e5d9156 100644 --- a/main/solenv/bin/modules/installer/parameter.pm +++ b/main/solenv/bin/modules/installer/parameter.pm @@ -420,6 +420,15 @@ sub setglobalvariables if ( $ENV{'TMP'} ) { $installer::globals::temppath = $ENV{'TMP'}; } elsif ( $ENV{'TEMP'} ) { $installer::globals::temppath = $ENV{'TEMP'}; } elsif ( $ENV{'TMPDIR'} ) { $installer::globals::temppath = $ENV{'TMPDIR'}; } + # On macOS, $TMPDIR (like /tmp) lives under /var, which is itself a + # symlink to /private/var. Archive::Zip's extraction safety check + # refuses to extract through a symlinked path component, so resolve + # it here rather than let that fail deep inside packaging. + if ( -e $installer::globals::temppath ) + { + my $resolved = Cwd::realpath($installer::globals::temppath); + $installer::globals::temppath = $resolved if ( $resolved ); + } $installer::globals::temppath =~ s/\Q$installer::globals::separator\E\s*$//; # removing ending slashes and backslashes $installer::globals::temppath = $installer::globals::temppath . $installer::globals::separator . $installer::globals::globaltempdirname; installer::systemactions::create_directory_with_privileges($installer::globals::temppath, "777"); diff --git a/main/svx/inc/svx/msdffdef.hxx b/main/svx/inc/svx/msdffdef.hxx index b9f0265b57..7db2f6ff6e 100644 --- a/main/svx/inc/svx/msdffdef.hxx +++ b/main/svx/inc/svx/msdffdef.hxx @@ -1012,7 +1012,8 @@ enum MSO_LineStyle { mso_lineDouble, // Double lines of equal width mso_lineThickThin, // Double lines, one thick, one thin mso_lineThinThick, // Double lines, reverse order - mso_lineTriple // Three lines, thin, thick, thin + mso_lineTriple, // Three lines, thin, thick, thin + mso_lineNone = 0xFFFF // sentinel: no line style is set (set by {Svx,Sw}MSDffManager::ProcessObj) }; // MSO_LINETYPE - how to "fill" the line contour diff --git a/main/sw/source/filter/ww8/ww8graf.cxx b/main/sw/source/filter/ww8/ww8graf.cxx index 0367ea837e..108218f7fd 100644 --- a/main/sw/source/filter/ww8/ww8graf.cxx +++ b/main/sw/source/filter/ww8/ww8graf.cxx @@ -1646,7 +1646,7 @@ sal_Int32 SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor, nIdx = WW8_BordersSO::double5;// 180 break; // no line style is set - case (MSO_LineStyle)USHRT_MAX: + case mso_lineNone: break; // erroneously not implemented line style is set default: diff --git a/main/sw/source/filter/ww8/ww8par.cxx b/main/sw/source/filter/ww8/ww8par.cxx index 432bdd5186..b5ebe24cb2 100644 --- a/main/sw/source/filter/ww8/ww8par.cxx +++ b/main/sw/source/filter/ww8/ww8par.cxx @@ -965,7 +965,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, ? (MSO_LineStyle)GetPropertyValue( DFF_Prop_lineStyle, mso_lineSimple ) - : (MSO_LineStyle)USHRT_MAX; + : mso_lineNone; pImpRec->nFlags = rObjData.nSpFlags;
