summaryrefslogtreecommitdiff
path: root/external
AgeCommit message (Collapse)Author
2022-09-17upgrade to libwebp-1.2.4Taichi Haradaguchi
Change-Id: Iaa3872345abcc2b9042abb32a824ff4b95ec57b5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139921 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-09-17external/gpgmepp: Fix various -Wincompatible-function-pointer-typesStephan Bergmann
...after Clang 16 trunk <https://github.com/llvm/llvm-project/commit/af01f717c48f0fd2481600ed6c00441763365b62> "Default implicit function pointer conversions diagnostic to be an error". The changes in workdir/UnpackedTarball/gpgmepp/src/assuan-support.c are due to the difference between ssize_t as used by > ssize_t (*read) (assuan_context_t ctx, assuan_fd_t fd, void *buffer, > size_t size); > ssize_t (*write) (assuan_context_t ctx, assuan_fd_t fd, > const void *buffer, size_t size); in workdir/UnpackedTarball/libassuan/src/assuan.h and gpgme_ssize_t as defined by > #ifdef _WIN64 > # include <stdint.h> > typedef int64_t gpgme_off_t; > typedef int64_t gpgme_ssize_t; > #else /* _WIN32 */ > typedef long gpgme_off_t; > typedef long gpgme_ssize_t; > #endif /* _WIN32 */ in workdir/UnpackedTarball/gpgmepp/src/gpgme.h: > assuan-support.c(353,5): error: incompatible function pointer types initializing 'ssize_t (*)(assuan_context_t, assuan_fd_t, void *, size_t)' (aka 'long (*)(struct assuan_context_s *, void *, void *, unsigned long long)') with an expression of type 'gpgme_ssize_t (assuan_context_t, assuan_fd_t, void *, size_t)' (aka 'long long (struct assuan_context_s *, void *, void *, unsigned long long)') [-Wincompatible-function-pointer-types] > my_read, > ^~~~~~~ > assuan-support.c(354,5): error: incompatible function pointer types initializing 'ssize_t (*)(assuan_context_t, assuan_fd_t, const void *, size_t)' (aka 'long (*)(struct assuan_context_s *, void *, const void *, unsigned long long)') with an expression of type 'gpgme_ssize_t (assuan_context_t, assuan_fd_t, const void *, size_t)' (aka 'long long (struct assuan_context_s *, void *, const void *, unsigned long long)') [-Wincompatible-function-pointer-types] > my_write, > ^~~~~~~~ Change-Id: I71f34da1a14421335a9416dd500a91d94de2f48a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140097 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-09-17external/firebird: Fix -Wincompatible-function-pointer-typesStephan Bergmann
...after Clang 16 trunk <https://github.com/llvm/llvm-project/commit/af01f717c48f0fd2481600ed6c00441763365b62> "Default implicit function pointer conversions diagnostic to be an error" Change-Id: Ibe06a94f45010efdeaf0c05a661f269e7a07d561 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140095 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-09-16external/coinmp: Adapt to std::bind2nd gone from C++17Stephan Bergmann
...which started to be an issue when building with recent Clang 16 trunk after <https://github.com/llvm/llvm-project/commit/3e99b8d947ac024831e59be2b604ac67a24fed94> "C++/ObjC++: switch to gnu++17 as the default standard" against libc++. (Recent versions of GCC similarly default to C++17, but libstdc++ by default still provides bind2nd even for C++17.) Alternatively, we could define _LIBCPP_ENABLE_CXX17_REMOVED_BINDERS to work around this. But as these appear to be the only leftover occurrence of bind2nd across all of the code base, and all but one of them have already been addressed upstream, lets address it for good with this little patch. (Where the last remaining occurrence not yet addressed upstream is fixed in the same way as the other upstream fixes, using a loop rather than e.g. a lambda that would force us to start to pass CXXFLAGS_CXX11 into ExternalProejct_coinmp.) Change-Id: Iddcdddd22ea4c6d537b64bf2cf0b887d11da162f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139931 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-09-16external/firebird: Work around std::auto_ptr gone from C++17Stephan Bergmann
...which started to be an issue when building with recent Clang 16 trunk after <https://github.com/llvm/llvm-project/commit/3e99b8d947ac024831e59be2b604ac67a24fed94> "C++/ObjC++: switch to gnu++17 as the default standard" against libc++: > src/cloop/Main.cpp:31:12: error: no member named 'auto_ptr' in namespace 'std' > using std::auto_ptr; > ~~~~~^ (Recent versions of GCC similarly default to C++17, but libstdc++ by default still provides auto_ptr even for C++17.) Adding -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR to CXXFLAGS didn't work, though, as firebird apparently only honors CXXFLAGS during the configure step, but not in its makefiles. So instead add it directly to CXX. (Adding /all/ the CXXFLAGS to CXX caused issues at least on Windows, where <https://ci.libreoffice.org/job/gerrit_windows/135851/> failed with > Main.cpp > C:\cygwin\home\tdf\jenkins\workspace\gerrit_windows\workdir\UnpackedTarball\firebird\extern\cloop\src\cloop\Expr.h(25): fatal error C1034: string: no include path set etc. This probably needs a general clean-up, and the other *FLAGS passed into the firebird build system might have a similar issue.) Change-Id: Idf0a5243938fddfb8348cc960074e60dea775650 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139932 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-09-16sw content controls: add PDF export of font propertiesMiklos Vajna
Like font name or size. Change-Id: Ie7b0d38be0ef69faf364b7c801d0bd3fdd60777a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140038 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2022-09-15Fix building without system cairo, fontconfig, freetype, and harfbuzzTor Lillqvist
At least for me, this was needed when I added --without-system-cairo --without-system-fontconfig --without-system-freetype --without-system-harfbuzz to my otherwise fairly normal autogen.input on Linux. Change-Id: I149a57c24d6c11d710298125e53cb9524cb3dcaa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140001 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2022-09-15poppler: upgrade to release 22.09.0Michael Stahl
Fixes CVE-2022-38784 Add external/poppler/disable-freetype.patch.1 to get rid of some new code that unconditionally requires freetype, to avoid building that on WNT/MACOSX. Change-Id: I854d1865286b6fb4112cdf37898cda0203c52f2e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139941 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2022-09-15zlib: add patch for CVE-2022-37434Michael Stahl
Change-Id: If09c419ba00fc9be021249e4d4da27d1650b9080 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139913 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2022-09-14libxml2: upgrade to release 2.10.2Michael Stahl
Fixes CVE-2022-2309 Change-Id: I180218be275d3b6d38f8f74aa51c57e50d2734ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139911 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2022-09-14external: update pdfium to 5298Miklos Vajna
pdfium_arm64.patch.1 is now upstreamed as <https://pdfium-review.googlesource.com/c/pdfium/+/96010>. Change-Id: Iafb1ba480161429094db5446ab50314068ae4cfc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139876 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-09-14Fix build of boost for iOSTor Lillqvist
Change-Id: If5d812e1b37c9aa16b2b6075585f5f3023aca431 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139827 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2022-09-10upgrade to openssl-3.0.5Caolán McNamara
patch out using IPC::Cmd instead of requiring adding it to build-time dependencies for mysterious: The system cannot find the path specified. NMAKE : fatal error U1077: '""C:\PROGRA~2\MIB055~1\2019\COMMUN~1\VC\Tools\MSVC\1429~1.301\bin\Hostx64\x86\cl.exe' : return code '0x1' Stop. NMAKE : fatal error U1077: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x86\nmake.exe"' : return code '0x2' Stop. include fix from https://github.com/openssl/openssl/issues/18823 and for move /Y crypto/aes/aes-586.asm.i crypto/aes/aes-586.asm The system cannot find the path specified. NMAKE : fatal error U1077: 'move' : return code '0x1' add own patch to use mv and rm for move and del Change-Id: I071750e20efd0931ea1c5c3b49e7a5173c7283f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139641 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-09-07Remove obsolete commentStephan Bergmann
...after c8fd50f9ec02a131fd4c99e80f7252b49015653a "python3: upgrade to release 3.8.13" Change-Id: I43428485e7cdffec7b3a7a575334bd886e2f26c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139609 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-09-07python3: upgrade to release 3.8.13Taichi Haradaguchi
Remove some code in external/python3/darwin.patch.0 as it was fixed upstream(https://bugs.python.org/issue45405). Change-Id: Ie6bfb2456f96a63adbf0dbcb9c902dc56f1151ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139493 Tested-by: Jenkins Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-09-05tdf#150749 Find and replace on very large sheetNoel Grandin
This requires 2 fixes (*) First, we are deleting from the front of a block in the mdds storage, so apply a similar patch to mdds to the previous improvement, (*) Then, we end up with an O(n^2) situation in ScRangesList::Join. But we are only displaying this data, and in fact, we only display the first 1000 ranges anyway, so just clamp the list to 1000 entries, and pass a flag up to the dialog so that we can report that we stopped counting. (*) I had to tweak the testSharedStringPool unit test, since we are not actually clearing the underlying mdds storage, the reference counts do not drop until we have removed all the elements in that block of mdds storage (because then the entire block is destructed, including the not-yet destructed elements) Change-Id: I2c998f81dfb46453a48fce1254fd253d299d12b8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139400 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2022-09-02external/cairo: Remove dead code from cairo.RGB24_888.patchStephan Bergmann
...now that ab157ab93e0c5a62927947a8d2b0c1c277e526ac "move part of sanitizer patch to the patch that introduced the problem" unilaterally folded in here the content of f5e1314ffa564077c27fb9c954c792b498bcae12 "external/cairo: Fix previous -fsanitize=alignment fix", about which that commit's message had stated: "The following line > pixel &= 0x00ffffff; /* ignore next pixel bits */ should no longer be necessary now, and it is probably better to directly fix the original code in external/cairo/cairo/cairo-1.10.2.patch, but I'll leave that for a potential follow-up fix, once the provenance and assumed quality of that original CAIRO_FORMAT_RGB24_888 code is clarified." (The provenance and quality of that code is still not clarified though, see the still unanswered question in the comment at <https://gerrit.libreoffice.org/c/core/+/116637/2#message-407ec72875fcb015a3024f9a7ebf8480513b1e5e> "external/cairo: Fix previous -fsanitize=alignment fix".) Change-Id: Ic729bff238a35fac69d048b7c3912dd706a5b601 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139211 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-08-31document attempt to upstream cairo patchesCaolán McNamara
Change-Id: If3fc80931a544030a6cef97978f9fed835b4530b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139095 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-08-31move part of sanitizer patch to the patch that introduced the problemCaolán McNamara
Change-Id: I3fdec4dd5ae93187aebb4a17f9fb01f0a536c9cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139094 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-08-31ofz#50805 crash seen in fuzzing libreoffice text renderingCaolán McNamara
Change-Id: I8af207ff21399f1bc3f36c01b7d2912692cbb06b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139093 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-08-27ofz: -Wp,-D_FORTIFY_SOURCE=2 in cairo a problem with msanCaolán McNamara
Change-Id: I5c7bc7b9a370ee3a5c7dd3f7a2c92c5f2b193d58 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138920 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-08-23backport some upstream hunspell commitsCaolán McNamara
Change-Id: I0c2b94a27af8c25c69579b367b944a4f77036487 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138735 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-08-22upgrade to hunspell 1.7.1Caolán McNamara
Change-Id: Ifff2f17d17ab2764f3703b008fcb096ff08c9315 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138690 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-08-19Upgrade external/boost to latest Boost 1.80.0Stephan Bergmann
<https://dev-www.libreoffice.org/src/boost_1_80_0.tar.xz> has been generated (on Fedora 36) with > $ wget https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.bz2 > $ printf '1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0 boost_1_80_0.tar.bz2' | sha256sum -c # cf. <https://www.boost.org/users/history/version_1_80_0.html> > boost_1_80_0.tar.bz2: OK > $ external/boost/repack_tarball.sh boost_1_80_0.tar.bz2 > Unpacking boost_1_80_0.tar.bz2 ... > Removing unnecessary files ... > Creating boost_1_80_0.tar.xz ... > Cleaning up ... > 322e567e98c466c0aa0e380ed8c647552fe4af48998648428f1b5f0c8eff4666 boost_1_80_0.tar.xz > Done. * In StaticLibrary_boost_filesystem, <https://github.com/boostorg/filesystem/commit/36cf9aaf816a39dce3d32e2bfe09e214d7f3ab64> "Updated protection of remove_all against CVE-2022-21658 on POSIX" had introduced uses of certain POSIX *at functions (like utimensat) conditionally on some new BOOST_FILESYSTEM_HAS_POSIX_AT_APIS, to be discovered by workdir/UnpackedTarball/boost/libs/filesystem/CMakeLists.txt which we don't run. At least AT_NO_AUTOMOUNT, as used in workdir/UnpackedTarball/boost/libs/filesystem/src/operations.cpp, appears to be unavailable on the macOS baseline, but otherwise assume that all that POSIX functionality is available on all other non-Windows baselines and hardcode that in external/boost/StaticLibrary_boost_filesystem.mk. (If it turns out that we need to exclude some more platforms there, we /might/ need to backport <https://github.com/boostorg/filesystem/commit/5864f397ccad30f6e73221b90bdac57a303b9752> "Fixed a missing include on POSIX systems that don't support *at APIs" from the develop branch towards Boost 1.81.) * In StaticLibrary_boost_locale, <https://github.com/boostorg/locale/commit/41868c62a0519799696b544518f1efd831ff71c2> "Support systems without implicit include path" had moved source files around (and then would have failed with > workdir/UnpackedTarball/boost/libs/locale/src/boost/locale/shared/mo_lambda.cpp:7:10: fatal error: 'boost/locale/shared/mo_lambda.hpp' file not found > #include "boost/locale/shared/mo_lambda.hpp" > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ etc. without the additional -I option). * Some Clang builds would have started to fail with > In file included from desktop/qa/unit/desktop-lok-init.cxx:19: > In file included from desktop/inc/lib/init.hxx:20: > In file included from workdir/UnpackedTarball/boost/boost/container/flat_map.hpp:26: > workdir/UnpackedTarball/boost/boost/container/new_allocator.hpp:168:12: error: '__cpp_sized_deallocation' is not defined, evaluates to 0 [-Werror,-Wundef] > # if __cpp_sized_deallocation > ^ so add another external/boost/include/ wrapper. Change-Id: I5e53f7ddab07eadba9bdf653acad571f50517b46 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138511 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-08-18external/epoxy: 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 > workdir/UnpackedTarball/epoxy/src/gl_generated_dispatch.c:114547:77: error: incompatible integer to pointer conversion passing 'uintptr_t' (aka 'unsigned long') to parameter of type 'GLhandleARB' (aka 'void *') [-Wint-conversion] > GEN_THUNKS(glAttachObjectARB, (GLhandleARB containerObj, GLhandleARB obj), ((uintptr_t)containerObj, (uintptr_t)obj)) > ^~~~~~~~~~~~~~~~~~~~~~~ > workdir/UnpackedTarball/epoxy/src/dispatch_common.h:150:40: note: expanded from macro 'GEN_THUNKS' > GEN_GLOBAL_REWRITE_PTR(name, args, passthrough) \ > ^~~~~~~~~~~ > workdir/UnpackedTarball/epoxy/src/dispatch_common.h:95:14: note: expanded from macro 'GEN_GLOBAL_REWRITE_PTR' > name passthrough; \ > ^~~~~~~~~~~ etc. That only hit on macOS because of the different > #ifdef __APPLE__ > typedef void *GLhandleARB; > #else > typedef unsigned int GLhandleARB; > #endif in OpenGL's glext.h, which <https://github.com/anholt/libepoxy/commit/0cfb0a044bc43245409c020e2ca34091c96283d4> "Fix most GLhandleARB warnings on OS X with a big comment in our code" had tried to address by adding "a cast to uintptr_t to shut up the compiler" in its src/gen_dispatch.py (but without stating what compiler diagnostics exactly were supposed to be silenced by that cast that now started to cause the above issues with Clang 16 trunk). It turns out that at least my macOS build with Clang 16 trunk builds fine without that cast, so just drop it for good. (And patching epoxy's src/gen_dispatch.py means that UnpackedTarball_epoxy needs to switch from gb_UnpackedTarball_set_pre_action to gb_UnpackedTarball_set_post_action.) Change-Id: I2c87bca2cc5510d17098028d4532989f48e349a9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138407 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-08-17tdf#150452: Revert "tdf#130795 use concurrent hashmap in SharedStringPool"Xisco Fauli
This commit reverts 3749d9af3745c0eaff7239e379578e4e2af89e9d which removes the dependency on the external library cuckoo Without using cuckoo the same file in tdf#130795 takes real 0m4,892s user 0m5,298s sys 0m0,449s With it, it takes real 0m4,914s user 0m5,276s sys 0m0,444s pretty much the same time Change-Id: I4cc9000ac5bf26de22bb9835283ae8d5b3230196 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138435 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-08-17Revert "workaround clang-16 complaint in skia"Noel Grandin
This reverts commit 7548748e34966174abed39f3682bae445f1c8bdc. No longer necessary after doing a fresh pull of llvm, so llvm is at commit 4c244b2833bdc51bbb7970ea6433e844dfddf622 Change-Id: I6dc721b47a905f553b227db3a036899173b35bae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138408 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2022-08-16pdfium: replace windows arm64 patch with a backport from upstreamMiklos Vajna
No functional changes intended, just this way the patch can be dropped trivially the next time we update pdfium. Change-Id: I3259e98ddd20a51e109e860e1a3ab4c138597436 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138323 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-08-15external/nss: Fix -Wincompatible-function-pointer-typesStephan Bergmann
...with recent Clang 16 trunk since <https://github.com/llvm/llvm-project/commit/af01f717c48f0fd2481600ed6c00441763365b62> "Default implicit function pointer conversions diagnostic to be an error", causing > ../../../pr/tests/testfile.c:126:41: error: incompatible function pointer types passing 'void (*)(void *)' to parameter of type 'void *(*)(void *)' [-Wincompatible-function-pointer-types] > if (!pthread_create(&tid, NULL, start, arg)) { > ^~~~~ > /usr/include/pthread.h:204:15: note: passing argument to parameter '__start_routine' here > void *(*__start_routine) (void *), > ^ and > ../../../pr/tests/testfile.c:576:31: error: incompatible function pointer types passing 'PRInt32 (void *)' (aka 'int (void *)') to parameter of type 'void (*)(void *)' [-Wincompatible-function-pointer-types] > DirTest, &thrarg, > ^~~~~~~ > ../../../pr/tests/testfile.c:93:36: note: passing argument to parameter 'start' here > void (*start)(void *arg), > ^ Change-Id: I642e5ca69289993c86abafded65ac23a63fd837e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138267 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-08-15external/lxml: Fix -Wincompatible-function-pointer-typesStephan Bergmann
...with recent Clang 16 trunk since <https://github.com/llvm/llvm-project/commit/af01f717c48f0fd2481600ed6c00441763365b62> "Default implicit function pointer conversions diagnostic to be an error", causing > src/lxml/etree.c:175589:60: error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types] > xmlHashScan(__pyx_v_self->__pyx_base._xpathCtxt->nsHash, __pyx_f_4lxml_5etree__registerExsltFunctionsForNamespaces, __pyx_v_self->__pyx_base._xpathCtxt); > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > workdir/UnpackedTarball/libxml2/include/libxml/hash.h:213:22: note: passing argument to parameter 'f' here > xmlHashScanner f, > ^ Change-Id: I2a359ed0dfdfa83b49fb03f447967a6d0ff73989 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138266 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-08-15external/cairo: Fix -Wincompatible-function-pointer-typesStephan Bergmann
...with recent Clang 16 trunk since <https://github.com/llvm/llvm-project/commit/af01f717c48f0fd2481600ed6c00441763365b62> "Default implicit function pointer conversions diagnostic to be an error", causing > pixman-bits-image.c:1184:39: error: incompatible function pointer types passing 'const float (int, int)' to parameter of type 'dither_factor_t' (aka 'float (*)(int, int)') [-Wincompatible-function-pointer-types] > buffer = dither_apply_ordered (iter, dither_factor_blue_noise_64); > ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > pixman-bits-image.c:1130:60: note: passing argument to parameter 'factor' here > dither_apply_ordered (pixman_iter_t *iter, dither_factor_t factor) > ^ > pixman-bits-image.c:1189:39: error: incompatible function pointer types passing 'const float (int, int)' to parameter of type 'dither_factor_t' (aka 'float (*)(int, int)') [-Wincompatible-function-pointer-types] > buffer = dither_apply_ordered (iter, dither_factor_bayer_8); > ^~~~~~~~~~~~~~~~~~~~~ > pixman-bits-image.c:1130:60: note: passing argument to parameter 'factor' here > dither_apply_ordered (pixman_iter_t *iter, dither_factor_t factor) > ^ Change-Id: I3e28280c9c25dfb7cee5155719a71655db00e344 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138265 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-08-12workaround clang-16 complaint in skiaNoel Grandin
Change-Id: I4c7ce097c4992939f2c3443ac1eb4c7cea73b8d9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138147 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2022-08-09Mark external/boost/constexpr.patch.0 as upstreamedStephan Bergmann
Change-Id: I23898f6aebd5a1fd28a2de9da6a89503b25eb6ea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138035 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-08-08Pass $(verbose) into ExternalProject_libxml2Stephan Bergmann
Change-Id: I11c7c15f4a97d3024a179fd2489fdace27f15216 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137892 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-08-04external/openldap: 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 > checking for pthread_detach with <pthread.h>... no > configure: error: could not locate pthread_detach() because of > configure:19227: checking for pthread_detach with <pthread.h> > configure:19249: ~/llvm/inst/bin/clang -o conftest -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_BSD_SOURCE -O0 -fstrict-aliasing -fstrict-overflow -ggdb2 -gsplit-dwarf -Xclang -debug-info-kind=constructor -ggnu-pubnames -Iworkdir/UnpackedTarball/nss/dist/public/nss -Iworkdir/UnpackedTarball/nss/dist/out/include -Iworkdir/UnpackedTarball/nss/dist/public/nss -Iworkdir/UnpackedTarball/nss/dist/out/include -fuse-ld=lld --ld-path=~/llvm/inst/bin/ld.lld -Wl,--gdb-index -Lworkdir/UnpackedTarball/nss/dist/out/lib -pthread conftest.c >&5 > conftest.c:109:16: error: incompatible pointer to integer conversion passing 'void *' to parameter of type 'pthread_t' (aka 'unsigned long') [-Wint-conversion] > pthread_detach(NULL); > ^~~~ > ~/llvm/inst/lib/clang/16.0.0/include/stddef.h:89:16: note: expanded from macro 'NULL' > # define NULL ((void*)0) > ^~~~~~~~~~ > /usr/include/pthread.h:269:38: note: passing argument to parameter '__th' here > extern int pthread_detach (pthread_t __th) __THROW; > ^ > 1 error generated. > configure:19249: $? = 1 Change-Id: I3f2b8836e7aba6536e2877b492b43de588804f86 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137758 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-08-04tdf#150247: patch orcus to use UTF-16 paths on WindowsMike Kaganski
This adds UTF8->UTF16 conversion of the paths passed to ctor of file_content on Windows, since both boost::filesystem::file_size and boost::interprocess::file_mapping take UTF-16 strings on this platform. So the assumption is that 8-bit path strings passed to orcus are UTF-8-encoded. This partially reverts commit 75252e58d9b5d020bf7bd6ca66b3a9d780463051 (it keeps use of osl_getThreadTextEncoding for platforms other than Windows). Change-Id: Ie467f71a65945f4f07ff432136ea06b811c3f794 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137759 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2022-08-03external/boost: Fix ill-formed constant expression errorsStephan Bergmann
...with recent Clang 16 trunk since <https://github.com/llvm/llvm-project/commit/b3645353041818f61e2580635409ddb81ff5a272> "[Clang] Diagnose ill-formed constant expression when setting a non fixed enum to a value outside the range of the enumeration values", causing > In file included from IWORKTable.cpp:10: > In file included from ./IWORKTable.h:21: > In file included from ./IWORKTypes.h:20: > In file included from external/boost/include/boost/variant.hpp:31: > In file included from workdir/UnpackedTarball/boost/boost/variant.hpp:17: > In file included from workdir/UnpackedTarball/boost/boost/variant/variant.hpp:34: > In file included from workdir/UnpackedTarball/boost/boost/variant/detail/hash_variant.hpp:22: > In file included from workdir/UnpackedTarball/boost/boost/variant/apply_visitor.hpp:16: > In file included from workdir/UnpackedTarball/boost/boost/variant/detail/apply_visitor_unary.hpp:21: > In file included from workdir/UnpackedTarball/boost/boost/mpl/advance.hpp:19: > In file included from workdir/UnpackedTarball/boost/boost/mpl/negate.hpp:17: > In file included from workdir/UnpackedTarball/boost/boost/mpl/integral_c.hpp:32: > workdir/UnpackedTarball/boost/boost/mpl/aux_/integral_wrapper.hpp:73:31: error: non-type template argument is not a constant expression > typedef AUX_WRAPPER_INST( BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (value - 1)) ) prior; > ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > workdir/UnpackedTarball/boost/boost/mpl/aux_/static_cast.hpp:24:47: note: expanded from macro 'BOOST_MPL_AUX_STATIC_CAST' > # define BOOST_MPL_AUX_STATIC_CAST(T, expr) static_cast<T>(expr) > ^ > workdir/UnpackedTarball/boost/boost/mpl/integral_c.hpp:31:54: note: expanded from macro 'AUX_WRAPPER_INST' > #define AUX_WRAPPER_INST(value) AUX_WRAPPER_NAME< T, value > > ^~~~~ > workdir/UnpackedTarball/boost/boost/numeric/conversion/detail/meta.hpp:30:46: note: in instantiation of template class 'mpl_::integral_c<boost::numeric::udt_builtin_mixture_enum, boost::numeric::builtin_to_builtin>' requested here > enum { x = ( BOOST_MPL_AUX_VALUE_WKND(T1)::value == BOOST_MPL_AUX_VALUE_WKND(T2)::value ) }; > ^ > workdir/UnpackedTarball/boost/boost/mpl/if.hpp:63:68: note: in instantiation of template class 'boost::numeric::convdetail::equal_to<mpl_::integral_c<boost::numeric::udt_builtin_mixture_enum, boost::numeric::builtin_to_builtin>, mpl_::integral_c<boost::numeric::udt_builtin_mixture_enum, boost::numeric::builtin_to_builtin>>' requested here > BOOST_MPL_AUX_STATIC_CAST(bool, BOOST_MPL_AUX_VALUE_WKND(T1)::value) > ^ > workdir/UnpackedTarball/boost/boost/mpl/eval_if.hpp:37:22: note: in instantiation of template class 'boost::mpl::if_<boost::numeric::convdetail::equal_to<mpl_::integral_c<boost::numeric::udt_builtin_mixture_enum, boost::numeric::builtin_to_builtin>, mpl_::integral_c<boost::numeric::udt_builtin_mixture_enum, boost::numeric::builtin_to_builtin>>, boost::mpl::identity<boost::numeric::convdetail::get_subranged_BuiltIn2BuiltIn<int, unsigned long>>, boost::mpl::eval_if<boost::numeric::convdetail::equal_to<mpl_::integral_c<boost::numeric::udt_builtin_mixture_enum, boost::numeric::builtin_to_builtin>, mpl_::integral_c<boost::numeric::udt_builtin_mixture_enum, boost::numeric::builtin_to_udt>>, boost::mpl::identity<boost::mpl::identity<boost::numeric::convdetail::subranged_BuiltIn2Udt<int, unsigned long>>>, boost::mpl::if_<boost::numeric::convdetail::equal_to<mpl_::integral_c<boost::numeric::udt_builtin_mixture_enum, boost::numeric::builtin_to_builtin>, mpl_::integral_c<boost::numeric::udt_builtin_mixture_enum, boost::numeric::udt_to_builtin>>, boost::mpl::identity<boost::numeric::convdetail::subranged_Udt2BuiltIn<int, unsigned long>>, boost::mpl::identity<boost::numeric::convdetail::subranged_Udt2Udt<int, unsigned long>>>>>' requested here > typedef typename if_<C,F1,F2>::type f_; > ^ > workdir/UnpackedTarball/boost/boost/numeric/conversion/detail/meta.hpp:81:12: note: in instantiation of template class 'boost::mpl::eval_if<boost::numeric::convdetail::equal_to<mpl_::integral_c<boost::numeric::udt_builtin_mixture_enum, boost::numeric::builtin_to_builtin>, mpl_::integral_c<boost::numeric::udt_builtin_mixture_enum, boost::numeric::builtin_to_builtin>>, boost::mpl::identity<boost::numeric::convdetail::get_subranged_BuiltIn2BuiltIn<int, unsigned long>>, boost::mpl::eval_if<boost::numeric::convdetail::equal_to<mpl_::integral_c<boost::numeric::udt_builtin_mixture_enum, boost::numeric::builtin_to_builtin>, mpl_::integral_c<boost::numeric::udt_builtin_mixture_enum, boost::numeric::builtin_to_udt>>, boost::mpl::identity<boost::mpl::identity<boost::numeric::convdetail::subranged_BuiltIn2Udt<int, unsigned long>>>, boost::mpl::if_<boost::numeric::convdetail::equal_to<mpl_::integral_c<boost::numeric::udt_builtin_mixture_enum, boost::numeric::builtin_to_builtin>, mpl_::integral_c<boost::numeric::udt_builtin_mixture_enum, boost::numeric::udt_to_builtin>>, boost::mpl::identity<boost::numeric::convdetail::subranged_Udt2BuiltIn<int, unsigned long>>, boost::mpl::identity<boost::numeric::convdetail::subranged_Udt2Udt<int, unsigned long>>>>>' requested here > mpl::eval_if<is_case0,Case0TypeQ,choose_1_2_3Q>::type > ^ > workdir/UnpackedTarball/boost/boost/numeric/conversion/detail/udt_builtin_mixture.hpp:41:7: note: in instantiation of template class 'boost::numeric::convdetail::ct_switch4<mpl_::integral_c<boost::numeric::udt_builtin_mixture_enum, boost::numeric::builtin_to_builtin>, mpl_::integral_c<boost::numeric::udt_builtin_mixture_enum, boost::numeric::builtin_to_builtin>, mpl_::integral_c<boost::numeric::udt_builtin_mixture_enum, boost::numeric::builtin_to_udt>, mpl_::integral_c<boost::numeric::udt_builtin_mixture_enum, boost::numeric::udt_to_builtin>, boost::numeric::convdetail::get_subranged_BuiltIn2BuiltIn<int, unsigned long>, boost::mpl::identity<boost::numeric::convdetail::subranged_BuiltIn2Udt<int, unsigned long>>, boost::mpl::identity<boost::numeric::convdetail::subranged_Udt2BuiltIn<int, unsigned long>>, boost::mpl::identity<boost::numeric::convdetail::subranged_Udt2Udt<int, unsigned long>>>' requested here > ct_switch4<UdtMixture > ^ > workdir/UnpackedTarball/boost/boost/numeric/conversion/detail/is_subranged.hpp:205:9: note: (skipping 3 contexts in backtrace; use -ftemplate-backtrace-limit=0 to see all) > for_udt_builtin_mixture<udt_builtin_mixture, BuiltIn2BuiltInQ, BuiltIn2UdtQ, Udt2BuiltInQ, Udt2UdtQ>::type > ^ > workdir/UnpackedTarball/boost/boost/numeric/conversion/conversion_traits.hpp:22:7: note: in instantiation of template class 'boost::numeric::convdetail::non_trivial_traits_impl<int, unsigned long>' requested here > : convdetail::get_conversion_traits<T,S>::type > ^ > workdir/UnpackedTarball/boost/boost/numeric/conversion/detail/converter.hpp:584:22: note: in instantiation of template class 'boost::numeric::conversion_traits<int, unsigned long>' requested here > typedef typename Traits::trivial trivial ; > ^ > workdir/UnpackedTarball/boost/boost/numeric/conversion/converter.hpp:29:32: note: in instantiation of template class 'boost::numeric::convdetail::get_converter_impl<boost::numeric::conversion_traits<int, unsigned long>, boost::numeric::def_overflow_handler, boost::numeric::Trunc<unsigned long>, boost::numeric::raw_converter<boost::numeric::conversion_traits<int, unsigned long>>, boost::numeric::UseInternalRangeChecker>' requested here > struct converter : convdetail::get_converter_impl<Traits, > ^ > workdir/UnpackedTarball/boost/boost/numeric/conversion/cast.hpp:53:16: note: in instantiation of template class 'boost::numeric::converter<int, unsigned long, boost::numeric::conversion_traits<int, unsigned long>, boost::numeric::def_overflow_handler, boost::numeric::Trunc<unsigned long>>' requested here > return converter::convert(arg); > ^ > IWORKTable.cpp:782:45: note: in instantiation of function template specialization 'boost::numeric_cast<int, unsigned long>' requested here > cellProps.insert("librevenge:column", numeric_cast<int>(c)); > ^ > workdir/UnpackedTarball/boost/boost/mpl/aux_/integral_wrapper.hpp:73:31: note: integer value -1 is outside the valid range of values [0, 3] for this enumeration type > typedef AUX_WRAPPER_INST( BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (value - 1)) ) prior; > ^ > workdir/UnpackedTarball/boost/boost/mpl/aux_/static_cast.hpp:24:47: note: expanded from macro 'BOOST_MPL_AUX_STATIC_CAST' > # define BOOST_MPL_AUX_STATIC_CAST(T, expr) static_cast<T>(expr) > ^ etc. when building ExternalProject_libetonyek Change-Id: I1830c1182a7ab966bb068b5eb97db099c9678fe8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137757 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.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-08-02more_fonts: Update Reem KufiKhaled Hosny
Also update test expectation due to changed glyph order. Change-Id: I8f6d1a057077cb6de5e5d7fce4bec29929edb8b9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137663 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2022-07-31Update HarfBuzz to 5.1.0Khaled Hosny
Dropping negativeadvance.patch that was applied upstream. Change-Id: I8eba49d2d158c0c29911f4079315ed0bf87b7fa6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137648 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-07-28pdfium: fix build on windows aarch64 - no __popcntChristian Lohmaier
see https://docs.microsoft.com/en-us/cpp/intrinsics/arm64-intrinsics Change-Id: I291f727c1aa6e00d02d2339fcb338159ae49d0c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137568 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-07-20external: update pdfium to 5187Miklos Vajna
build.patch.1 is extended to avoid: > C:/lo/master/workdir/UnpackedTarball/pdfium/third_party/libopenjpeg/openjpeg.c(438): error C2491: 'opj_decoder_set_strict_mode': definition of dllimport function not allowed and also is extended to avoid: > /opt/rh/devtoolset-7/root/usr/include/c++/7/bits/stl_tree.h:2028:5: note: no known conversion for argument 1 from ‘std::pair<fxcrt::RetainPtr<CPDF_Object>, std::unique_ptr<CPDF_PageObjectAvail> >::first_type {aka fxcrt::RetainPtr<CPDF_Object>}’ to ‘const CPDF_Object* const&’ Change-Id: Icacc05627a8612b33d6445685d26470e7c757b8e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137238 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2022-07-14Adapt to new Clang 15 trunk -Wdeprecated-builtinsStephan Bergmann
...<https://github.com/llvm/llvm-project/commit/0b89d1d59f82cf5b45c250cd5c3351e43ce35ef9> "[Sema] Add deprecation warnings for some compiler provided __has_* type traits", which hits in Boost include files, > In file included from libreofficekit/qa/tilebench/tilebench.cxx:27: > In file included from external/boost/include/boost/property_tree/json_parser.hpp:31: > In file included from workdir/UnpackedTarball/boost/boost/property_tree/json_parser.hpp:14: > In file included from external/boost/include/boost/property_tree/ptree.hpp:31: > In file included from workdir/UnpackedTarball/boost/boost/property_tree/ptree.hpp:16: > In file included from workdir/UnpackedTarball/boost/boost/property_tree/string_path.hpp:15: > In file included from workdir/UnpackedTarball/boost/boost/property_tree/id_translator.hpp:16: > In file included from external/boost/include/boost/optional.hpp:31: > In file included from workdir/UnpackedTarball/boost/boost/optional.hpp:15: > In file included from workdir/UnpackedTarball/boost/boost/optional/optional.hpp:42: > workdir/UnpackedTarball/boost/boost/type_traits/has_nothrow_constructor.hpp:27:84: error: builtin __has_nothrow_constructor is deprecated; use __is_nothrow_constructible instead [-Werror,-Wdeprecated-builtins] > template <class T> struct has_nothrow_constructor : public integral_constant<bool, BOOST_HAS_NOTHROW_CONSTRUCTOR(T)>{}; > ^ > workdir/UnpackedTarball/boost/boost/type_traits/intrinsics.hpp:199:48: note: expanded from macro 'BOOST_HAS_NOTHROW_CONSTRUCTOR' > # define BOOST_HAS_NOTHROW_CONSTRUCTOR(T) (__has_nothrow_constructor(T) && is_default_constructible<T>::value) > ^ etc. Change-Id: I08376710e25013b44279532d6e5fc256ed95cb76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137046 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-07-01external/libnumbertext: Silence -Werror,-Wdeprecated-declarationsStephan Bergmann
...as seen now with LLVM 15 trunk libc++, which marks the std::codecvt_utf8 and std::wstring_convert functionality, deprecated since C++17, as such (<https://github.com/llvm/llvm-project/commit/3ee9a50a146c585fc92f79e742c538261f98bd4e> "[libc++] Implement P0618R0 (Deprecating <codecvt>)") Change-Id: Id34e3fea540b76591ead8ba3df4c31a71d7b4aaf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136776 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-06-29Adapt to LLVM 15 trunk libc++ dropping std::unary_/binary_functionStephan Bergmann
...for C++17 and beyond with <https://github.com/llvm/llvm-project/commit/681cde7dd8b5613dbafc9ca54e0288477f946be3> "[libc++] Complete the implementation of N4190". (Unless explicitly opted-in with _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION. This is similar to the MSVC standard library needing _HAS_AUTO_PTR_ETC=1 to enable those zombie functions for quite some time now. Only libstdc++ still supports them unconditionally.) Most uses of those zombie functions across LibreOffice itself and the bundled external/* are indirectly within Boost include files. And many (but not all) of those Boost include files only use those zombie functions conditionally, based on BOOST_NO_CXX98_FUNCTION_BASE. For the (Dinkumware-derived) MSVC standard library, workdir/UnpackedTarball/boost/boost/config/stdlib/dinkumware.hpp already defined BOOST_NO_CXX98_FUNCTION_BASE. So add a patch to define that also in workdir/UnpackedTarball/boost/boost/config/stdlib/libcpp.hpp (for all of C++11 and beyond, even if those functions were still available as deprecated in C++11 and C++14, but which shouldn't make a difference with our C++17 baseline anyway; only make sure that things still work if those Boost include files ever get used by code built with gb_CXX03FLAGS). (Patching our bundled external/boost of course doesn't help when building with such a new libc++ and --with-system-boost against an unpatched Boost, but lets consider that "not my problem". Also, one could always use a sledgehammer like passing CPPFLAGS=-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION into gbuild in such a case.) Then there are two places that include boost/multi_array.hpp, which indirectly includes workdir/UnpackedTarball/boost/boost/functional.hpp, which still uses those zombie functions for non-MSVC builds (at least in the bundled Boost 1.79.0). Lets do a targeted _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION in those cases. (Alternatively, we could patch workdir/UnpackedTarball/boost/boost/functional.hpp. Also, I decided to make loplugin:reservedid support the new suppression mechanism, rather than extending its existing ignorelist even further.) And then there is external/clucene using those zombie functions even outside of a Boost include file, so extend the existing hack there that was already needed for MSVC. (And adapt the accompanying comment: For one, we are unconditionally "in C++17 mode" by now. And for another, the exact places where external/clucene uses those functions have apparently changed over time.) Change-Id: Id0eec3bedcfddae86b16d33c02c7b5d3b3f8a16f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136579 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-06-28Fix typoStephan Bergmann
...that was present since 173214d92046b4ea11f6c0959ca40999d1e0bbd2 "Fix liborcus build for Android" (but doesn't seem to have caused issues all those years) Change-Id: I70161f20a94655e8f485cd49bec9ce461c7507f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136563 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-06-28The std::unary_function workaround should no longer be necessaryStephan Bergmann
...with the bundled Boost 1.79.0, as workdir/UnpackedTarball/boost/boost/numeric/conversion/detail/converter.hpp no longer uses it since <https://github.com/boostorg/numeric_conversion/commit/ebfded1d7d4a2f773e8233c4df6f96131f79d72e> "Remove the deprecated uses of std::unary_function (again)" in Boost 1.66.0 Change-Id: I58808cc2a7836c63ee13cf63c8528fc95f4e2cea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136555 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-06-27Mark external/libnumbertext/EmptyString.patch1 as upstreamedCaolán McNamara
Change-Id: I8d926046c11f38daf3a8d7fb4d4176b78a995af3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136497 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-06-27Mark external/liborcus/overrun.patch.0 as upstreamedStephan Bergmann
Change-Id: Ibc77db49c7b584df1f5f3c086ecd479a28eb7797 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136484 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-06-27crashtesting: fix assert seen on loading forum-nl-1226.odsCaolán McNamara
Change-Id: If8c08a51b11a459a03b4a0604c1fb9897351e598 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136480 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>