summaryrefslogtreecommitdiff
path: root/external/redland
AgeCommit message (Collapse)Author
2024-07-17fix raptor build when using system-icuChristian Lohmaier
Change-Id: I1671e5872deb583c1c0395ab49ab33b171d0e086 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170620 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2024-07-10Fix UBSan build of ExternalProject_redlandStephan Bergmann
...after c75c21eef670fce33eb5a501357935dbd25be923 "Upgrade raptor to 2.0.16", where it now started to fail with > libtool: link: LD_RUN_PATH="/usr/local/lib:" /usr/bin/ccache /home/tdf/lode/opt_private/clang-llvmorg-12.0.1/bin/clang --gcc-toolchain=/opt/rh/gcc-toolset-12/root/usr -fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero -fsanitize=local-bounds -fsanitize-blacklist=/home/tdf/lode/jenkins/workspace/lo_ubsan/sanitize-ubsan-excludelist -fno-sanitize=function -DLIBRDF_INTERNAL=1 -O0 -Wp,-U_FORTIFY_SOURCE -fstrict-aliasing -fstrict-overflow -ggdb2 -gsplit-dwarf -Xclang -debug-info-kind=constructor -Wl,-z -Wl,origin -Wl,-rpath -Wl,\$ORIGIN -Wl,-rpath-link -Wl,/home/tdf/lode/jenkins/workspace/lo_ubsan/instdir/program -Wl,-z -Wl,origin -Wl,-rpath -Wl,\$ORIGIN -Wl,-rpath-link -Wl,/home/tdf/lode/jenkins/workspace/lo_ubsan/instdir/program -o .libs/redland-db-upgrade db_upgrade.o -L/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/UnpackedTarball/raptor/src/.libs /home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/UnpackedTarball/raptor/src/.libs/libraptor2.so -L/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/UnpackedTarball/libxml2/.libs /home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/UnpackedTarball/libxml2/.libs/libxml2.so -L/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/UnpackedTarball/rasqal/src/.libs /home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/UnpackedTarball/rasqal/src/.libs/librasqal.so ../src/.libs/librdf.so > /opt/rh/gcc-toolset-12/root/usr/bin/ld: /home/tdf/lode/jenkins/workspace/lo_ubsan/instdir/program/libicuuc.so.74: undefined reference to `__ubsan_vptr_type_cache' > /opt/rh/gcc-toolset-12/root/usr/bin/ld: /home/tdf/lode/jenkins/workspace/lo_ubsan/instdir/program/libicuuc.so.74: undefined reference to `__ubsan_handle_function_type_mismatch_v1' > /opt/rh/gcc-toolset-12/root/usr/bin/ld: /home/tdf/lode/jenkins/workspace/lo_ubsan/instdir/program/libicuuc.so.74: undefined reference to `__ubsan_handle_dynamic_type_cache_miss' > clang-12: error: linker command failed with exit code 1 (use -v to see invocation) > make[3]: *** [Makefile:489: redland-db-upgrade] Error 1 (<https://ci.libreoffice.org/job/lo_ubsan/3239/>) because $(CC) is used to link a (nominally C-only) executable that links against C++ ICU shared libraries that in turn require a C++-specific UBSan library to be linked in. So just use $(CXX) for linking instead. Change-Id: If7c61c6ee7e1b43965a928b1560f8ab4ae2b0603 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170277 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2024-07-09Upgrade raptor to 2.0.16Taichi haradaguchi
- Fixes CVE-2017-18926 and CVE-2020-25713. - drop 0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1: merged upstream - drop 0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1: merged upstream - drop libtool.patch: merged upstream - drop most of raptor-freebsd.patch.1: merged upstream - drop most of raptor-msvc.patch.1: merged upsttream - drop most of ubsan.patch: merged upstream - drop Wint-conversion.patch: merged upstream depend on package icu_ure to have libicuuc delivered and add corresponding directory to rpath-link to make sure the right copy is picked up use $(strip ...) in LDFLAGS to avoid having to escape , with $(COMMA) Change-Id: Ic05269ade5dae3761d98432ee504a51434a4c753 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161704 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins
2024-07-03raptor: Use --without-wwwXisco Fauli
it seems not used. Besides, it fails when upgrading to libxml2 2.13. See https://gerrit.libreoffice.org/c/core/+/169327 Change-Id: If383130eac3b5d6de911c4c273c8e371a4980f23 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169933 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2024-07-01Revert "libxml2: upgrade to 2.13.1"Xisco Fauli
This reverts commit 2b27f0eb5858a4fd296170fb7e4533e5fc7aa3e9. Reason for revert: JunitTest_unordf_complex fails Change-Id: I5c9b6ec454c46a737a7052cc8dd450044dd48495 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169817 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2024-06-27libxml2: upgrade to 2.13.1Xisco Fauli
Building with --without-system-libxml fails with /usr/bin/ld: /home/xisco/libreoffice/workdir/UnpackedTarball/raptor/src/.libs/libraptor2.so: undefined reference to `xmlNanoHTTPScanProxy' /usr/bin/ld: /home/xisco/libreoffice/workdir/UnpackedTarball/raptor/src/.libs/libraptor2.so: undefined reference to `xmlNanoHTTPClose' /usr/bin/ld: /home/xisco/libreoffice/workdir/UnpackedTarball/raptor/src/.libs/libraptor2.so: undefined reference to `xmlNanoHTTPReturnCode' /usr/bin/ld: /home/xisco/libreoffice/workdir/UnpackedTarball/raptor/src/.libs/libraptor2.so: undefined reference to `xmlNanoHTTPRead' /usr/bin/ld: /home/xisco/libreoffice/workdir/UnpackedTarball/raptor/src/.libs/libraptor2.so: undefined reference to `xmlNanoHTTPCleanup' /usr/bin/ld: /home/xisco/libreoffice/workdir/UnpackedTarball/raptor/src/.libs/libraptor2.so: undefined reference to `xmlNanoHTTPMethod' /usr/bin/ld: /home/xisco/libreoffice/workdir/UnpackedTarball/raptor/src/.libs/libraptor2.so: undefined reference to `xmlNanoHTTPInit' collect2: error: ld returned 1 exit status so use --without-www in external/redland/ExternalProject_raptor.mk since it seems no to be used by raptor. Libxml2 disabled http support by default in https://gitlab.gnome.org/GNOME/libxml2/-/commit/3018842c07e9b88d6bb0257f5644e7695cdeb2e2 Downloaded from https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.1.tar.xz Kudos to Michael Weghorn for helping me with this patch Change-Id: I2e41021e8aea3551eb9eec29cf12f6cd9f6ff89e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169327 Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp> Tested-by: Jenkins
2024-05-06makefile simplification: replace $(call gb_UnpackedTarball_get_dir,foo)Christian Lohmaier
…by a simple/static $(gb_UnpackedTarball_workdir)/foo see also 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f Change-Id: I8e6aa55c85534c4446556548910c950ddbe7c6fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167163 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins
2023-09-15A more principled suppression of -fsanitize=function in external C codeStephan Bergmann
...after <https://github.com/llvm/llvm-project/commit/279a4d0d67c874e80c171666822f2fabdd6fa926> "-fsanitize=function: support C". This includes reverts of 16af9e81863a80116f808ee3cfa4a1bab7c67ac5 "update clang asan suppressions" and 151a43f3d00f6523079c53d6c2d064f80b9a55d6 ""update clang asan suppressions". Change-Id: I49740f5f3a784af1d62b830b47bfdfa27fe3e471 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156935 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-05-24upgrade to libxml2-2.11.4Caolán McNamara
'checked' field removed with: https://gitlab.gnome.org/GNOME/libxml2/-/commit/ce76ebfd1312459951d555ad9d87fb9a89eede55 win32 'run_debug' removed with: https://gitlab.gnome.org/GNOME/libxml2/-/commit/59f2f60e3eff07324f1c7cd861a444d714be750b add libxml2-XMLCALL-redefine.patch.0 to avoid: UnpackedTarball\libxml2\include\libxml/xmlexports.h(41): error C2220: the following warning is treated as an error UnpackedTarball\libxml2\include\libxml/xmlexports.h(41): warning C4005: 'XMLCALL': macro redefinition UnpackedTarball\expat\lib\expat_external.h(69): note: see previous definition of 'XMLCALL' Change-Id: Ia9b1540dc1b4eccf91662c8d995c036f71de6fc6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152176 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-01-27Remove support for AIXStephan Bergmann
As discussed in the mailing list thread starting at <https://lists.freedesktop.org/archives/libreoffice/2023-January/089808.html> "Plan to remove dead C++ UNO bridge implementations (bridges/source/cpp_uno/*)", the bridge implementation at bridges/source/cpp_uno/gcc3_aix_powerpc is apparently dead and should thus be removed. However, that was the only bridge implementation for AIX, which implies that support for the AIX platform as a whole is dead and should thus be removed. Change-Id: I96de3f7f97d4fd770ff78256f0ea435383688be9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146057 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-12Adapt to newer Emscripten SDKTor Lillqvist
The check for platform in raptor's sort_r.h no longer worked with Emscripten 3.1.30. Looking for __EMSCRIPTEN__ explicitly helps. Change-Id: Ieccf723d809b4e90d44a8a510f71e12bd1d2e529 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145408 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2022-08-03external/redland: Fix -Wint-conversionStephan Bergmann
...with recent Clang 16 trunk since <https://github.com/llvm/llvm-project/commit/7068aa98412ade19a34b7ed126f4669f581b2311> "Strengthen -Wint-conversion to default to an error", causing > raptor_parse.c:260:66: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'int' [-Wint-conversion] > RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL); > ^~~~ and > raptor_serialize.c:243:66: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'int' [-Wint-conversion] > RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL); > ^~~~ Change-Id: I2c1083b78777589b992c180d8759e2313bf2fe42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137756 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-06-09redland WASM: add Emscripten flags to fix NEH buildJan-Marek Glogowski
Change-Id: I4ed242e774e1ce2ac05dabb9fc657329dc4a63c6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135519 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2022-04-12use gb_DEBUGINFO_FLAGS consistently in gbuild ExternalProject'sLuboš Luňák
A number of them didn't use it at all, others had it hand-written in various ways. Change-Id: Iaf86325f9cdc032926bac917dc3eef4e34661544 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132818 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2022-01-31externals: always provide platform configure flagsJan-Marek Glogowski
No idea why we just provided the platform flags when cross- compiling. In the curious case, where the host platform is detected as x86_64-pc-mingw32 per default and we actually want to override it with x86_64-pc-cygwin, we don't do a cross compile, but must override the host platform. But there is additional special handling needed for the omitted cross-platform build in the special case of --host=i686-pc-cygwin and --build=x86_64-pc-cygwin, where we deliberatly ignore cross building; Windows is already a slow build, so try to keep this optimization (AMD64 can execute x86 binaries). There is the theoretical case, where the externals config.guess would have detected something else and that "magically" even worked, while the LO detected triplet would fail, but this should be fixed in the external in any way. Change-Id: Ib7a9719e0e406fe90334b7611dc3f01b51692bfa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129153 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2021-12-03libxml2: use xml2-config dummy for internal buildJan-Marek Glogowski
When building a static LO with --disable-dynloading on Linux, --without-system-libs failed for me. And it left me really puzzled: raptor configure failed and claimed it couldn't link libxml2. raptor's config.log showed missing math functions. xml2-config of LO's build is patched and it includes a -lm. The xml2-config in my chroot doesn't. But we explicitly pass the xml2-config for non-system-libxml2 build. Reading the configure from raptor didn't reveal a way, that it could somehow pick up the xml2-config from the chroot, but that code is autoconf-complex... When running "sh -x configure", it turned out the configure script actually picks up the LIBXML_* flags from the environment, which are set by LO's config_host.mk. These just add -lm for Android. So this adds a xml2-config.in "dummy", which overwrites the one from the libxml2 source and just echos LO's LIBXML_* values and it adds -lm for all DISABLE_DYNLOADING targets. Change-Id: Ia713cf80c8e7dc989cf23c224e7a0f7ea1210a87 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116409 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2021-05-05WASM: add initial support for Emscripten cross buildJan-Marek Glogowski
- configure with: - --host=wasm64-local-emscripten - had to make a few externals optional, so adding: - --disable-nss - --disable-cmis - --disable-curl Change-Id: I48d1c73d2675ad2e2beaf2c341578199efbd24ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111130 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2020-11-24CVE-2020-25713 raptor2: malformed input file can lead to a segfaultCaolán McNamara
due to an out of bounds array access in raptor_xml_writer_start_element_common use a better fix than the initial suggestion See: https: //bugs.mageia.org/show_bug.cgi?id=27605 https: //www.openwall.com/lists/oss-security/2020/11/13/1 Change-Id: I9203904755b0e4ac98ae1e39942fd6f616c1efff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106488 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Caolán McNamara <caolanm@redhat.com>
2020-11-23CVE-2020-25713 raptor2: malformed input file can lead to a segfaultCaolán McNamara
due to an out of bounds array access in raptor_xml_writer_start_element_common See: https://bugs.mageia.org/show_bug.cgi?id=27605 https://www.openwall.com/lists/oss-security/2020/11/13/1 Change-Id: Ida4783a61412ffce868eacf81310da338d3e2df1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106423 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-09-03external/redland: Honour LIBXML_CFLAGS/LIBS in raptor's configureStephan Bergmann
I ran into this issue with a somewhat special setup on macOS, with both Xcode 11 and Xcode 12 beta installed, and > xcode-select -s /Applications/Xcode-beta.app/Contents/Developer and > CC/CXX=... -isysroot /Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk ... to make the LO build use the latest SDK from Xcode 12 beta. (And with implicit --with-system-libxml, and with recent Clang 12 trunk.) However, even though raptor's configure receives our LIBXML_CFLAGS/LIBS env vars from config_host.mk, it always overrides them with output from some $XML_CONFIG tool. For whatever reason, in my setup that caused raptor's LIBXML_CFLAGS to be set to > -I/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include (And a similar reference to that /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk in LIBXML_LIBS. That MacOSX.sdk directory symlinks to some /Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk. I don't know about that /Library/Developer/CommandLineTools/SDKs tree, but it smells like it is maintained by Xcode and not properly adapted for my Xcode 12 beta install.) Anyway, that LIBXML_CFLAGS ends up on raptor's compiler command lines, causing them to contain > ... -isysroot /Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk ... -I/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include ... so that something like > #include <stdio.h> in workdir/UnpackedTarball/raptor/src/raptor_parse.c will include > /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/stdio.h rather than > /Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/usr/include/stdio.h and consider the former not to be a system header, and thus emit warnings/errors like > In file included from raptor_parse.c:30: > /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/stdio.h:220:5: error: 'TARGET_OS_EMBEDDED' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] > #if TARGET_OS_EMBEDDED > ^ that it would suppress from system headers. Raptor's configure appears to always override LIBXML_CFLAGS/LIBS since <https://github.com/dajobe/raptor/commit/ 7da03ba5cd6e45ea41afebd4955acf6e96e9d622> "Switch libxml and libcurl to use PKG_PROG_PKG_CONFIG and PKG_CHECK_MODULES", which looks like a bug to me. (Trying to prevent that code from being executed by passing in --without-xml2-config, similar to the existing --without-xslt-config in external/redland/ExternalProject_raptor.mk, would fail with > configure: error: libxml2 is not available - please get it from http://xmlsoft.org/ from raptor's configure, apparently suppressing libxml2 detection altogether.) Change-Id: I5f2813e849bb61c0af48df0579abe87d3671185b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101991 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-16GBUILD_TRACE, support for finding out where the build time is spentLuboš Luňák
See instructions in solenv/gbuild/Trace.mk . This generates a file than can be viewed e.g. in the Chromium tracing view. Change-Id: I5f90647c58ca729375525b6daed2d4918adc8188 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88754 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-22Pass ENABLE_DEBUG into ExternalProject_redlandStephan Bergmann
Change-Id: Ifaacb82478b16e102108d32488a2807489c46901 Reviewed-on: https://gerrit.libreoffice.org/81320 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-10-22external/redland: Avoid UBSan nullptr-with-nonzero-offsetStephan Bergmann
...(new with Clang 10 trunk), as seen during CppunitTest_sw_ooxmlexport: > raptor_rfc2396.c:389:23: runtime error: applying non-zero offset 2 to null pointer > #0 in raptor_uri_normalize_path at workdir/UnpackedTarball/raptor/src/raptor_rfc2396.c:389:23 > #1 in raptor_uri_resolve_uri_reference at workdir/UnpackedTarball/raptor/src/raptor_rfc2396.c:617:21 > #2 in raptor_new_uri_relative_to_base_counted at workdir/UnpackedTarball/raptor/src/raptor_uri.c:293:19 > #3 in raptor_new_uri_relative_to_base at workdir/UnpackedTarball/raptor/src/raptor_uri.c:319:10 > #4 in raptor_rdfxml_end_element_grammar at workdir/UnpackedTarball/raptor/src/raptor_rdfxml.c:2613:32 > #5 in raptor_rdfxml_end_element_handler at workdir/UnpackedTarball/raptor/src/raptor_rdfxml.c:850:5 > #6 in raptor_sax2_end_element at workdir/UnpackedTarball/raptor/src/raptor_sax2.c:867:7 > #7 in xmlParseTryOrFinish at workdir/UnpackedTarball/libxml2/parser.c:11386:8 > #8 in xmlParseChunk__internal_alias at workdir/UnpackedTarball/libxml2/parser.c:12244:13 > #9 in raptor_sax2_parse_chunk at workdir/UnpackedTarball/raptor/src/raptor_sax2.c:534:10 > #10 in raptor_rdfxml_parse_chunk at workdir/UnpackedTarball/raptor/src/raptor_rdfxml.c:1169:8 > #11 in raptor_parser_parse_chunk at workdir/UnpackedTarball/raptor/src/raptor_parse.c:482:10 > #12 in librdf_parser_raptor_parse_as_stream_common at <null> (instdir/program/librdf-lo.so.0 +0x11ee39) > #13 in librdf_parser_raptor_parse_counted_string_as_stream at <null> (instdir/program/librdf-lo.so.0 +0x117ca4) > #14 in librdf_parser_parse_counted_string_as_stream at <null> (instdir/program/librdf-lo.so.0 +0x111967) > #15 in (anonymous namespace)::librdf_Repository::importGraph(short, com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const&, com::sun::star::uno::Reference<com::sun::star::rdf::XURI> const&, com::sun::star::uno::Reference<com::sun::star::rdf::XURI> const&) at unoxml/source/rdf/librdf_repository.cxx:1048:9 > #17 in sfx2::readStream(sfx2::DocumentMetadataAccess_Impl&, com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, rtl::OUString const&, rtl::OUString const&) at sfx2/source/doc/DocumentMetadataAccess.cxx:606:36 > #18 in sfx2::initLoading(sfx2::DocumentMetadataAccess_Impl&, com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, com::sun::star::uno::Reference<com::sun::star::rdf::XURI> const&, com::sun::star::uno::Reference<com::sun::star::task::XInteractionHandler> const&) at sfx2/source/doc/DocumentMetadataAccess.cxx:763:9 > #19 in sfx2::DocumentMetadataAccess::loadMetadataFromStorage(com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, com::sun::star::uno::Reference<com::sun::star::rdf::XURI> const&, com::sun::star::uno::Reference<com::sun::star::task::XInteractionHandler> const&) at sfx2/source/doc/DocumentMetadataAccess.cxx:1126:5 > #20 in SfxBaseModel::loadMetadataFromStorage(com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, com::sun::star::uno::Reference<com::sun::star::rdf::XURI> const&, com::sun::star::uno::Reference<com::sun::star::task::XInteractionHandler> const&) at sfx2/source/doc/sfxbasemodel.cxx:4411:15 > #21 in XMLReader::Read(SwDoc&, rtl::OUString const&, SwPaM&, rtl::OUString const&) at sw/source/filter/xml/swxml.cxx:810:19 > #22 in SwReader::Read(Reader const&) at sw/source/filter/basflt/shellio.cxx:188:22 > #23 in SwDocShell::Load(SfxMedium&) at sw/source/uibase/app/docshini.cxx:546:37 > #24 in SfxObjectShell::LoadOwnFormat(SfxMedium&) at sfx2/source/doc/objstor.cxx:3040:20 > #25 in SfxObjectShell::DoLoad(SfxMedium*) at sfx2/source/doc/objstor.cxx:696:40 > #26 in SfxBaseModel::load(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at sfx2/source/doc/sfxbasemodel.cxx:1851:36 > #27 in (anonymous namespace)::SfxFrameLoader_Impl::load(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&) at sfx2/source/view/frmload.cxx:691:28 > #28 in framework::LoadEnv::impl_loadContent() at framework/source/loadenv/loadenv.cxx:1157:37 > #29 in framework::LoadEnv::startLoading() at framework/source/loadenv/loadenv.cxx:390:20 > #30 in framework::LoadEnv::loadComponentFromURL(com::sun::star::uno::Reference<com::sun::star::frame::XComponentLoader> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at framework/source/loadenv/loadenv.cxx:171:14 > #31 in framework::Desktop::loadComponentFromURL(rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at framework/source/services/desktop.cxx:621:12 > #32 in non-virtual thunk to framework::Desktop::loadComponentFromURL(rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at framework/source/services/desktop.cxx > #33 in unotest::MacrosTest::loadFromDesktop(rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at unotest/source/cpp/macros_test.cxx:48:62 > #34 in SwModelTestBase::loadURL(rtl::OUString const&, char const*, char const*) at sw/qa/extras/inc/swmodeltestbase.hxx:765:23 > #35 in SwModelTestBase::load(rtl::OUString const&, char const*, char const*) at sw/qa/extras/inc/swmodeltestbase.hxx:720:16 > #36 in SwModelTestBase::executeImportExportImportTest(char const*, char const*) at sw/qa/extras/inc/swmodeltestbase.hxx:290:9 > #37 in testTdf118393::Import_Export_Import() at sw/qa/extras/ooxmlexport/ooxmlexport.cxx:84:1 Presumably, `cur` can legitimately be null there and the `s == (cur+2)` check was intended to always be false when `cur` is null? Change-Id: I0e3b762d5868933e586eb8f2255148f88a54e908 Reviewed-on: https://gerrit.libreoffice.org/81318 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-08-19Fix typosAndrea Gelmini
Change-Id: I5e7cbd49e8bd7d9d6957508f8c8534653854cb3c Reviewed-on: https://gerrit.libreoffice.org/77679 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-08-07redland/raptor: use system xml2-config only on MacOSXMichael Stahl
On Fedora 30, we get: instdir/program/libraptor2-lo.so.0 has suspicious NEEDED: liblzma.so.5 Because: > xml2-config --libs -lxml2 -lz -llzma -lm -ldl However: > pkg-config --libs libxml-2.0 -lxml2 So prefer pkg-config for system libxml2, except on MacOSX, where people claim that pkg-config leads to disaster. Change-Id: I29ffd2ced769d7111c4de17de53082db2e2ba326 Reviewed-on: https://gerrit.libreoffice.org/77093 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-05-24disable warnings in external libsLuboš Luňák
As in, really disable, so that they do not even show. This moreover avoids tons of D9025 warnings from MSVC about overriding -W4 with -w. Change-Id: Ia2e72fd72d883d91bdd89e467ee42f259e2ae033 Reviewed-on: https://gerrit.libreoffice.org/72899 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-04-29Remove spurious non-empty line from end of patch fileStephan Bergmann
(had caused a "patch unexpectedly ends in middle of line" warning) Change-Id: I10860a25266d1672f1fdd0ce89f3de37b260a5fb Reviewed-on: https://gerrit.libreoffice.org/71509 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-04-17avoid C4013 and C4117Tomoyuki Kubota
calloc,free,clock,time,ceil,frexp,fabs,ldex,access,getpid for C4013 __FUNCTION__ for C4117 Change-Id: I71e1894893f3aa9cf0e5ac699e44586144a14743 Reviewed-on: https://gerrit.libreoffice.org/70423 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-03-01Some more WIN32 -> _WIN32Stephan Bergmann
...at least some of which have presumably been missing from ce43d0ae9279edbf1ad108fe0d8325327a038d49 "use consistent #define checks for the Windows platform" by accident (and some just clean up comments) Change-Id: I5532685c7df96ae3c8a25b73d8064d7433964a9b Reviewed-on: https://gerrit.libreoffice.org/68580 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2018-11-29Rename Mac OS X to official name macOS in comments and documentationBartosz Kosiorek
Change-Id: I651b7f202fa52ff5f5357a11aa72c43eb7dc7f95 Reviewed-on: https://gerrit.libreoffice.org/64102 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
2018-11-01gbuild: rename value OS=IOS to OS=iOSMichael Stahl
This gets rid of the horrible hack in gbuild.mk to accomodate the case-incorrect iOS platform makefiles that cannot be renamed without upsetting git on file systems that sadly lack the case sensitivity feature. Keep the macro defined to IOS though. Change-Id: I1022bfef4900da00e75fc1ccce786b20f8673234 Reviewed-on: https://gerrit.libreoffice.org/62705 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2017-11-08redland: update autoconf configs the gbuild wayDavid Tardon
Change-Id: I8a46a2ee60bb028c7fd9edcfdcd389813498ba9b
2017-11-03-I$(dir $(3)) in gb_CObject__command_pattern is no longer neededStephan Bergmann
...in com_MSC_class.mk now, similar to ecbaf980625a9e7b06abe91c7c70e78f6ad469a7 for com_GCC_class.mk. Three libraries built from external sources (for Windows only) needed adjustment. Change-Id: Id8976a30b80efff6119afb18ccaf6811fe27d2f8 Reviewed-on: https://gerrit.libreoffice.org/44270 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-11-02Use gb_UnpackedTarball_get_dirStephan Bergmann
Change-Id: I931f0d95cad0a63d344c84d89ba7c80f14be8ec9
2017-10-31redland: pass opt. flags to configureosnola
Change-Id: Iab2e324ce1b7a7b64970b30314f1078d7e1d6ba5 Reviewed-on: https://gerrit.libreoffice.org/44112 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2017-10-28use predefined workdir pathDavid Tardon
Change-Id: Ia14aaba92e5d36064bc6a77dbc63463a833d8745 Reviewed-on: https://gerrit.libreoffice.org/43969 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2017-09-15consistent naming of externals: xml2 -> libxml2Michael Stahl
Change-Id: Ia1164c70d02dce70cb346c1fd4033f12d91c6e5d Reviewed-on: https://gerrit.libreoffice.org/42297 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-06-13iOS, patch redlandjan Iversen
Support for arm64 Change-Id: Id9f89452174bac4acb8d5b7dd3e23d91c2b2acf1
2017-05-02Make some externals' libtool copies cope with -mllvmStephan Bergmann
...as needed e.g. for <https://bugs.llvm.org/show_bug.cgi?id=32349> "r294897 + NewGVN cause build failure with LibreOffice", by applying <http://git.savannah.gnu.org/cgit/libtool.git/commit/ ?id=d9a35fe9d3508b5c0d56e7f2ec80fc05e8415fa3> "libtool: Discard '-mllvm $arg' options when linking." Change-Id: Id2afc3c8af3c6c9595e7cb33cef5084a74f78cb0
2017-04-19redland: add raptor patch to fix some bugsMichael Stahl
Change-Id: I4e3db61fdfe0b984d36b4f67f8e891da48f79ddb
2017-03-06drop various _MSC_VER < 1900 conditionalsCaolán McNamara
Change-Id: I68d93b260db1f542bb3b44858b61b2d30ae93530 Reviewed-on: https://gerrit.libreoffice.org/34856 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-03-03Fix typosAndrea Gelmini
Change-Id: I338dacd3cfe915714a9038e1dea4a60d586e9394 Reviewed-on: https://gerrit.libreoffice.org/34806 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-02-10Remove MinGW supportStephan Bergmann
In OOo times, there'd originally been efforts to allow building on Windows with MinGW. Later, in LO times, this has been shifted to an attempt of cross- compiling for Windows on Linux. That attempt can be considered abandoned, and the relevant code rotting. Due to this heritage, there are now three kinds of MinGW-specific code in LO: * Code from the original OOo native Windows effort that is no longer relevant for the LO cross-compilation effort, but has never been removed properly. * Code from the original OOo native Windows effort that is re-purposed for the LO cross-compilation effort. * Code that has been added specifially for the LO cross-compilation effort. All three kinds of code are removed. (An unrelated, remaining use of MinGW is for --enable-build-unowinreg, utilizing --with-mingw-cross-compiler, MINGWCXX, and MINGWSTRIP.) Change-Id: I49daad8669b4cbe49fa923050c4a4a6ff7dda568 Reviewed-on: https://gerrit.libreoffice.org/34127 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-02-02Adapt the external/redland/raptor/xml2-config.patch to raptor2-2.0.15Stephan Bergmann
The Yocto-based GNOME 3.20 SDK used to build the LO Flatpak has a broken xml2-config. I cannot understand why the previous workaround worked fine with raptor2-2.0.9 in LO 5.2 and fails with raptor2-2.0.15 since LO 5.3, but this updated workaround keeps raptor's configure happy. Change-Id: Ibfb2cb8a718f744e1bb4045082520fb186d6062b
2016-11-17chmod -xTor Lillqvist
Change-Id: Ie07ef2f9e9f6d0b31b513afa913b79d9c641e4f1
2016-10-23cond. build is already handled in Module_external.mkDavid Tardon
Change-Id: I5efe3bafc4f0b97578a75dc1f43e6c130a93bc4a
2016-08-26redland: upgrade raptor to 2.0.15, rasqal to 0.9.33, redland to 1.0.17:Michael Stahl
- drop rasqal-pkgconfig.patch.1: merged upstream - drop most of rasqal-msvc.patch.1: merged upstream - drop redland-query-rasqal-avoid-assert.patch.1: merged upstream - drop redland-pkgconfig.patch.1: merged upstream Change-Id: I4f03bed5fc5c4b30151c0c532572e438681da041 Reviewed-on: https://gerrit.libreoffice.org/28416 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-03-04external/redland: -Werror,-Wundef (__GNUC__ vs. clang-cl)Stephan Bergmann
Change-Id: I1998dc90f20958ea8631e4db49e7f5206c907978
2016-02-16use consistent #define checks for the Windows platformNoel Grandin
stage 1 of replacing usage of various checks for the windows platform with the compiler-defined '_WIN32' macro Change-Id: Iece73abdee530937e0737190b1aa97a46cd3075f Reviewed-on: https://gerrit.libreoffice.org/22390 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-02-15external/redland: Defend against Yocto's broken xml2-configStephan Bergmann
...which is hard-coded to fail with echo '--should-not-have-used-/usr/bin/xml2-config' exit 1 Change-Id: Ic358e7d494f01f67c1469c4add080d775525ebb6
generated by cgit (git 2.34.1) at 2025-02-03 18:43:22 +0000