summaryrefslogtreecommitdiff
path: root/external
AgeCommit message (Collapse)Author
2023-03-01fontconfig: upgrade to release 2.14.2Taichi Haradaguchi
Change-Id: I5347580318c752517c9ef7a37d4175a2c6db36bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145134 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-03-01curl: upgrade to release 7.88.1Taichi Haradaguchi
Fixes CVE-2023-23916, 2 CVEs that probably don't affect LO. Reference: https://curl.se/docs/security.html Change-Id: If9b3fc7c5ce66bfe1027caff39ea2c1cf55df7ad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147673 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-03-01postgresql: upgrade to release 13.10Taichi Haradaguchi
Fixes CVE-2022-41862 Reference: https://www.postgresql.org/support/security/CVE-2022-41862/ Change-Id: I6075838972fec1c091f3150b19c5da4dc80ad6d3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147674 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-02-28upgrade to libjpeg-turbo 2.1.5Caolán McNamara
Change-Id: Ia6355beaf19765e6255f9388d60e2179206ddc5b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147951 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-02-27It seems to work to compile also the MMX code for WASMTor Lillqvist
Change-Id: I27b56297a07e248102cae1bee4074b7be422ce23 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147875 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2023-02-26zxing: fix build after upgrade to v.2.0Mike Kaganski
Change-Id: If1b85a1f9f1b562aed8f357fd34434c8fe97e2f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147737 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-02-24upgrade zxing-cpp to 2.0.0Caolán McNamara
Change-Id: I3dc00f34359ec56a22cf7d8ba8e565ccb755c755 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147619 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-02-24freetype: upgrade to release 2.13.0Taichi Haradaguchi
As the issue has been fixed upstream[1], removed some codes from "external/freetype/ubsan.patch". [1]"[truetype] Fix undefined pointer arithmetic." <https://gitlab.freedesktop.org/freetype/freetype/-/commit/905270925dd0492ba557e58938e5513f062e6fc5> Change-Id: I66c11e414cd9ecdad8678487d0c3f645a352ad92 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147464 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2023-02-22vcl: Avoid the need to patch HarfBuzzKhaled Hosny
Reverts parts of d552b4a549d614a03aa9328e017dec27bd3ff41e and 97e2e73e87479a742b798f362eda4baafb89497c. Instead of patching HarfBuzz, lets make use of the already mmap’ed file we use with FreeType. Change-Id: Ia81222118162a30cadb8c988bc477ad3ce36166d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147410 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-02-21Mark recently added external/cppunit/*.patch.0 as upstreamedStephan Bergmann
Change-Id: I62c62ee6fbd8ec6bf1846cea305ab97d4e567ae0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147385 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-02-20external/cppunit: Don't mis-apply GCC < 4.6 workaround for ClangStephan Bergmann
...which happens to define __GNUC__=4, __GNUC_MINOR__=2 Change-Id: I128547d0bd375ffec9deb6abd744eeb2667ba666 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147257 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-02-20external/cppunit: Use snprintf instead of sprintfStephan Bergmann
...to avoid > workdir/UnpackedTarball/cppunit/include/cppunit/TestAssert.h:115:8: error: 'sprintf' is deprecated: This function is provided for compatibility reasons only. Due to security concerns inherent in the design of sprintf(3), it is highly recommended that you use snprintf(3) instead. [-Werror,-Wdeprecated-declarations] > sprintf(buffer, "%.*g", precision, x); > ^ > /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/usr/include/stdio.h:188:1: note: 'sprintf' has been explicitly marked deprecated here > __deprecated_msg("This function is provided for compatibility reasons only. Due to security concerns inherent in the design of sprintf(3), it is highly recommended that you use snprintf(3) instead.") > ^ > /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/usr/include/sys/cdefs.h:215:48: note: expanded from macro '__deprecated_msg' > #define __deprecated_msg(_msg) __attribute__((__deprecated__(_msg))) > ^ on macOS after the upcoming <https://gerrit.libreoffice.org/c/core/+/147257> "Don't mis-apply GCC < 4.6 workaround for Clang" Change-Id: I213de1d112cb56fba220006842e611c56ccc7331 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147333 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-02-16android: Use actual Android API level for minSdkVersion, nssMichael Weghorn
When an Android API level is explicitly set with the `--with-android-api-level` switch introduced in commit 4c0bccbb21ba022fd9d630eb1d9ae34673b4dc11 Date: Thu Jul 4 09:06:49 2019 +0200 android: Allow specification of the API level. , use that for the minSdkVersion for the Android Viewer app and the API level for the NSS build, rather than leaving that hard-coded at API level 16. Building with a newer API level means that the app won't run on devices with older API levels. With this in place, this will be recognized at install time (installation will fail: INSTALL_FAILED_OLDER_SDK) rather than crashing at run time. Change-Id: Id6047b768d265b965696f3a3161d7828e5f3696e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146127 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2023-02-16android: Switch from GNU binutils to support NDK 23.x, require 21.xMichael Weghorn
Relevant announcement from revision history for NDK 23 [1]: > * GNU binutils, excluding the GNU Assembler (GAS), has been removed. GAS > will be removed in the next release. If you are building with > -fno-integrated-as, file bugs if anything is preventing you from > removing that flag. Therefore, switch from uses of GNU binutils to the corresponding LLVM tools instead. NDK 20.x doesn't provide `llvm-ranlib` yet, so bump the minimum version to 21.x. Also drop the previous uses of `ANDROID_BINUTILS_PREBUILT_ROOT`, which appear to no longer be relevant by now. commit 4082a18406c18af7b4fcef7bd501c3679c3be56b Date: Wed Nov 22 23:08:06 2017 +0100 android: use unified headers and llvm-c++ STL (x86) with NDK 16 gnustl (and others) are to be removed in future versions of the ndk also bump gradle and build-tools to current versions along with it arm unfortunately crashes with llvm-c++, so keep with gnustl for now/fix that later that introduced one of those uses mentions issues on ARM, but building and running the app at least on my 32-bit ARM device (Samsung Galaxy S4 I9505, LineageOS 17.1/Android 10) didn't show any issues in a quick test with this change in place. Update the Jenkins config to switch from the now no longer supported NDK 20.1.5948944 to 23.2.8568313 for which building and running the app has been tested on devices for all of the four supported architectures with upcoming change Change-Id I9ea714255faf29d50bb5f8e206f13495637da867 "android: Require NDK 23 and use default linker lld" in place on top, s. that one's commit message for more details. Note however that the NDK version will be further updated to use NDK 25 in upcoming change Change-Id Ib8e65f433ee89ff1bc12432722570bf8f9f7ed85 ("android: Support NDK 24.x and 25.x, use NDK 25 for Jenkins"). [1] https://developer.android.com/ndk/downloads/revision_history [2] https://lists.freedesktop.org/archives/libreoffice/2023-January/089878.html Change-Id: I7645f8025d42f0fa384b5bceb31bb4b1c0a44cb5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146118 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2023-02-15use upstream suggested fixCaolán McNamara
Change-Id: Ibe61144ea45211aa1b68e51d267ce5b7e1764839 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147026 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-02-14disable script dumpCaolán McNamara
Change-Id: I04d740cc0fcf87daa192a0a6af34138278043a19 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146905 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-02-13ofz#55872 fix oss-fuzz build wrt fontconfig not getting built staticCaolán McNamara
change from static to dynamic was hidden away in commit: commit d552b4a549d614a03aa9328e017dec27bd3ff41e Date: Tue Sep 20 16:07:14 2022 +0300 Enable opening of downloaded fonts only in ForKit in Online Change-Id: Ia6e636fdbdac31f6cf746fc70c892d71462a9619 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146895 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-02-13Only package the external/cairo library that is named the same as the SONAMEStephan Bergmann
Change-Id: Id97fe380c3e3976e56a6962eaebfbd696bab7332 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146908 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-02-13fix openssl build on aarch64 - _umul128 is not available on non x64Christian Lohmaier
adding upstream patch that uses __umulh as a fallback Change-Id: Ib95de30d3f7208c38421df0c63eb1ceafccd9354 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146839 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2023-02-11Update liborcus to 0.18.1Kohei Yoshida
Change-Id: I0439640789e59e4dd6e92d7f2975538de2f42f53 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146826 Tested-by: Jenkins Reviewed-by: Kohei Yoshida <kohei@libreoffice.org>
2023-02-10Avoid implicit function declaration warningsTor Lillqvist
Noticed when compiling with Emscripten for WASM, but might well happen in other cases, too. Change-Id: I37ae326af21204d81a6a3267831d7a0198d1d501 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146744 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2023-02-09Use SIMD in pixman for WASMTor Lillqvist
Emscripten and WASM do have some support for SSSE3, so let's try to use it, with -msimd128. See https://emscripten.org/docs/porting/simd.html. WASM is not x86, though, so avoid use of inline x86 assembly, like the CPUID instruction. Emscripten does not have <mmintrin.h> but does have <xmmintrin.h>, <emmintrin.h>, and <tmmintrin.h>. Change-Id: Ic3a47291f6c6dee6843e93ccecc92a643b269cb1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146691 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2023-02-09Enable opening of downloaded fonts only in ForKit in OnlineTor Lillqvist
We want that only the ForKit process needs to have access to new font files added to a Collabora Online instance dynamically by downloading from a server. There are however many locations in the Kit process, in core and in external libraries like harfbuzz, where the code wants to open a font file. Handle this so that the ForKit process opens such a downloaded font file and doesn't close it. The file descriptor is thus inherited by Kit processes. The font file pathname passed on to other code is a fake on in the format "/:FD:/%d" where the %d is the file descriptor of the opened font file. Add checks in all places where font files are opened, look for this special pathname format, and modify the code to just dup() the already open file descriptor in that case. All this is relevant for Linux only, as Collabora Online runs on Linux. Do the above for harfbuzz, cairo, fontconfig, and freetype. In addition make sure that these libraries (except harfbuzz which needs to be a static library and freetype) when bundled, on Linux, are built as shared libraries, and won't be confused with the corresponding system libraries by making sure their sonames are different. Change-Id: Ib059cb27e1637d07bb709249abd0d984f948caa9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140714 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146341 Tested-by: Jenkins
2023-02-09fix internal python build on powerpc64le-unknown-linux-gnuAndras Timar
Change-Id: I49c1368542a1af5dbbf377dbd8cb0cad8c6e2a38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135174 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146689 Tested-by: Jenkins
2023-02-08openssl: upgrade to release 3.0.8Michael Stahl
Fixes CVE-2023-0401 CVE-2023-0286 CVE-2023-0217 CVE-2023-0216 CVE-2023-0215 CVE-2022-4450 CVE-2022-4304 CVE-2022-4203 CVE-2022-3996 Remove the patch that fixed CVE-2022-3996. Change-Id: I8587d780ea7dc07637278643dc1c49b577e3ae56 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146657 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-01-30external/skia: Still missing includeStephan Bergmann
9c9a711ac5d8f32ac318d0e4ecab7b3a26bc2150 "Update skia to m111" had removed the whole external/skia/missing-include.patch.0, including the part added by 5877c6b118c99c9ec807a111471bfd67720a5086 "external/skia: Missing include" (for snprintf in workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h), even though at least my GCC 13 trunk build still requires that. However, the comment at <https://gerrit.libreoffice.org/c/core/+/145552/2#message-7fad3bfd39568500aa66b1c03dfd1670dad636f2> "external/skia: Missing include" pointed out that this "landed upstream at https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/commit/29d492b60c84ca784ea0943efc7d2e6e0f3bdaac", so switch to using a git-format-patch of that (slightly hand-edited to fix up the path of that project's vk_mem_alloc.h as included in the Skia tarball, and to cater for that file's usage of CRLF line endings). Change-Id: I31192b6e0aaf355d5cfee96badc59903ab592aae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146365 Reviewed-by: Sam James <sam@gentoo.org> Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-30external/skia: Another constexpr template point of instantiation issueStephan Bergmann
...with --with-latest-c++ after 9c9a711ac5d8f32ac318d0e4ecab7b3a26bc2150 "Update skia to m111", > In file included from workdir/UnpackedTarball/skia/src/core/SkBitmapDevice.cpp:8: > In file included from workdir/UnpackedTarball/skia/src/core/SkBitmapDevice.h:11: > In file included from workdir/UnpackedTarball/skia/include/core/SkBitmap.h:12: > In file included from workdir/UnpackedTarball/skia/include/core/SkImageInfo.h:14: > In file included from workdir/UnpackedTarball/skia/include/core/SkRect.h:19: > In file included from /Users/stephan/llvm/inst/bin/../include/c++/v1/algorithm:1747: > In file included from /Users/stephan/llvm/inst/bin/../include/c++/v1/__algorithm/inplace_merge.h:28: > ~/llvm/inst/bin/../include/c++/v1/__memory/unique_ptr.h:63:19: error: invalid application of 'sizeof' to an incomplete type 'SkStrikePinner' > static_assert(sizeof(_Tp) >= 0, "cannot delete an incomplete type"); > ^~~~~~~~~~~ > ~/llvm/inst/bin/../include/c++/v1/__memory/unique_ptr.h:297:7: note: in instantiation of member function 'std::default_delete<SkStrikePinner>::operator()' requested here > __ptr_.second()(__tmp); > ^ > ~/llvm/inst/bin/../include/c++/v1/__memory/unique_ptr.h:263:75: note: in instantiation of member function 'std::unique_ptr<SkStrikePinner>::reset' requested here > _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 ~unique_ptr() { reset(); } > ^ > workdir/UnpackedTarball/skia/src/core/SkStrikeCache.h:46:47: note: in instantiation of member function 'std::unique_ptr<SkStrikePinner>::~unique_ptr' requested here > std::unique_ptr<SkStrikePinner> = nullptr) SK_EXCLUDES(fLock); > ^ > workdir/UnpackedTarball/skia/src/core/SkStrikeCache.h:20:7: note: forward declaration of 'SkStrikePinner' > class SkStrikePinner; > ^ Change-Id: I367323706d047da18fd8d4230a47a78fbb32b677 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146349 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-30Update skia to m111Noel Grandin
(*) Remove patches already upstream (*) Remove the skia_sk_cpu_sse_level_0_by_default.patch.1 patch and rather set that define via -D parameter, because that is how the skia BUILD.gn seems to do it. (*) I hand edited the PCH file, because running the update_pch script failed for me. Change-Id: I1fd175b9f63f8d2792a1876e4ece03fe92fb5374 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146251 Tested-by: Jenkins Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-01-28Related: tdf#145988 Reset layer's pixel format to MTLPixelFormatBGRA8UnormPL
Skia initally sets the layer's pixel format to be BGRA8888 but macOS may change the layer's pixel format when a window has moved to a screen with 30-bit color depth so reset it back to BGRA8888. Change-Id: I1ad47a31e41aaa197e3052146243882e0b4ef673 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146301 Tested-by: Jenkins Reviewed-by: Patrick Luby <plubius@neooffice.org>
2023-01-28Fix 'Architecture' string on ppc64le platform, Debian uses 'ppc64el'Andras Timar
Change-Id: Idb678ac2669914575d3ddb813d35212df26e3d17 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146297 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@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-26tdf#147342 Notify Skia that the window's backing properties changedPatrick Luby
Change-Id: I4185a240a2ca6df1c92e86ff9950f86234d4ace8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146142 Tested-by: Jenkins Reviewed-by: Patrick Luby <plubius@neooffice.org>
2023-01-26Just use std::variant and std::getKohei Yoshida
Change-Id: If467225fae07a9d33e324cac9ff32300d6c56534 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146151 Tested-by: Kohei Yoshida <kohei@libreoffice.org> Reviewed-by: Kohei Yoshida <kohei@libreoffice.org>
2023-01-26Upgrade mdds and orcus to 2.1.0 and 0.18.0, respectivelyKohei Yoshida
Change-Id: I288b5b54bd07d951bcc68afda7514bde730193dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146107 Tested-by: Jenkins Reviewed-by: Kohei Yoshida <kohei@libreoffice.org>
2023-01-25Revert "Update skia to m110"Stephan Bergmann
This reverts commit aef70869b0fae3001648ec2a2651ffc9c507678f plus follow-up 4172fcb7514ff8a9e9740ff0939e9a2f611edbce "Fix no-pch Windows build: missing include". It caused my Windows build `instdir/program/soffice` to immediatley fail with > skia\include/core/SkRefCnt.h(62): fatal error: "assert(this->getRefCnt() > 0)" > warn:skia:10572:7804:external/skia/source/SkMemory_malloc.cxx:32: sk_abort_no_print on start. Change-Id: I751f83eda28d9a5a8f9dd4b2429389906ffce983 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146132 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-25Fix no-pch Windows build: missing includeMike Kaganski
> In file included from C:/lo/src/build/workdir/UnpackedTarball/skia/tools/sk_app/win/VulkanWindowContext_win.cpp:9: > C:/lo/src/build/workdir/UnpackedTarball/skia\tools/sk_app/win/WindowContextFactory_win.h(23,1): error: unknown type name 'SK_API' > SK_API std::unique_ptr<WindowContext> MakeVulkanForWin(HWND, const DisplayParams&); > ... Change-Id: I7f88cbb005310dd586e53b262ce31a71d49faedc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146121 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-01-25Update skia to m110Noel Grandin
Removing those bits of the patches that appear to have been upstreamed. Change-Id: Ia7683c26af4c622ca4fccb828df023ae30e724a6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146069 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-01-23Enforce compiling cairo and pixman for WASM with -O3Tor Lillqvist
Earlier, no -O flag at all got used in the cairo and pixman builds. Which was sad, as these two libraries are performance-critical. Yes, this change is quick-and-dirty. The proper way would be to modify things in solenv/gbuild. But that is somewhat complicated. In general it seems fairly hard to make sure the same compiler flags get used for every external bundled library. Each external library is a special snowflake, more or less, with a differently structured ExternalProject makefile. For instance for the libwpd library (just picked randomly as an example), even -O2 gets used. (Which as such is OK.) This despite solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk apparently trying to enforce use of -O1 for Emscripten. This change has a visible impact on the performance of COWASM. Change-Id: I99d74db2da733134fde16661881856f9a81100f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146009 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2023-01-23Mark external/zxing/missing-include.patch.0 as upstreamedTaichi Haradaguchi
Change-Id: Ia4c251c952889b4ae174b172839a946302d41c48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145524 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-23Mark external/zxing/android_include.patch.0 as upstreamedTaichi Haradaguchi
Change-Id: I05f51e0ee83f43614dc85e0b1ca5854f8aed21a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145523 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-20ofz#54685 TimeoutCaolán McNamara
Change-Id: I2f71f61c371055521c884a00dde48a811d204df1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145875 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-17Don't bother building the liborcus benchmarkTor Lillqvist
It causes a problem when building with Emscripten and --enable-wasm-exceptions. Instead of fixing that problem, just don't bother building executables we won't run anyway. (Ideally liborcus should have some --disable-benchmark configure options, ping Kohei.) Change-Id: Ic8c1d51513793bba85dc2833cc8fd9ec5b97ce76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145645 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2023-01-16external/skia: Missing includeStephan Bergmann
> In file included from workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.cpp:27: > In file included from workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h:35: > workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h:2817:9: error: use of undeclared identifier 'snprintf' > snprintf(outStr, strLen, "%u", static_cast<unsigned int>(num)); > ^ etc. Change-Id: I4f13c8a137f23ef62d67c3b4dfa8f1c0ddfc5ec9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145552 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-16external/python3: fix line offsets in internal-zlib.patch.0Taichi Haradaguchi
"@@ -11607,13 +11607,13 @@" -> "@@ -12333,13 +12333,13 @@" Change-Id: I03542ad3171814f6869bccab4dde77673eaa90f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144982 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
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>
2023-01-07Related: rhbz#2158548 allow longer words for hunspell-koCaolán McNamara
https://github.com/hunspell/hunspell/issues/903 A problem since the sanity check added in: commit 05e44e069e4cfaa9ce1264bf13f23fc9abd7ed05 Author: Caolán McNamara <caolanm@redhat.com> Date: Thu Sep 1 13:46:40 2022 +0100 Check word limit (#813) * check against hentry blen max Change-Id: Iab2c062584da076260c3262537690435eae7f396 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145154 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-06curl: upgrade to release 7.87.0Taichi Haradaguchi
Fixes CVE-2022-43551 and CVE-2022-43552. https://curl.se/docs/CVE-2022-43551.html https://curl.se/docs/CVE-2022-43552.html Change-Id: I979ed11c212aef226ad9f26420462e5f9dbe15e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144885 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-06openssl3: add patch for CVE-2022-3996Taichi Haradaguchi
Severity: Low backport <https://github.com/openssl/openssl/commit/7725e7bfe6f2ce8146b6552b44e0d226be7638e7>. OpenSSL 1.1.1 series are not affected by this vulnerability. Security Advisary: https://www.openssl.org/news/secadv/20221213.txt Change-Id: I42caba9c51291445fa96fc6f2280c681d6d6e582 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144791 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-05external/icu: Fix intermittent cross build failureMichael Weghorn
The ICU build for Android sometimes failed as follows: > ICU for C/C++ 72.1 is ready to be built. > === Important Notes: === > Data Packaging: static > This means: ICU data will be stored in a static library. > To locate data: ICU will use the linked data library. If linked with the stub library located in stubdata/, the application can use udata_setCommonData() or set a data path to override. > Building ICU: Use a GNU make such as /usr/bin/gmake to build ICU. > checking the version of "/usr/bin/gmake"... gmake[2]: Entering directory '/home/michi/development/git/libreoffice-WORKTREE-for-android-x86/workdir/UnpackedTarball/icu/source' > 4.3 (we wanted at least 3.80) > gmake[2]: Leaving directory '/home/michi/development/git/libreoffice-WORKTREE-for-android-x86/workdir/UnpackedTarball/icu/source' > ok > ## Note: you have disabled ICU's tools. This ICU cannot build its own data or tests. > ## Expect build failures in the 'data', 'test', and other directories. > icudefs.mk:328: @cross_mixed_buildroot@/config/icucross.mk: No such file or directory > make[2]: *** No rule to make target '@cross_mixed_buildroot@/config/icucross.mk'. Stop. > make[1]: *** [/home/michi/development/git/libreoffice-WORKTREE-for-android-x86/external/icu/ExternalProject_icu.mk:68: /home/michi/development/git/libreoffice-WORKTREE-for-android-x86/workdir/ExternalProject/icu/build] Error 1 > make: *** [Makefile:289: build] Error 2 config.log showed that instead of the `cross_mixed_buildroot` and `cross_unix_buildroot` configure variables introduced instead of `cross_buildroot` in commit 7f16cabf00daa30e9284d2fb2494bd341352c25e Date: Thu Oct 1 11:20:50 2020 +0200 icu: fix Windows Cygwin cross build , only the latter was set. While that commit also added a call to autoconf to update `configure` from the patched `configure.ac`, autoconf would leave the old version in place if the timestamp of `configure` was newer than that of `configure.ac` after unpacking the tarball. Call autoconf with the `-f` param to force the update. Do the same for another autoconf invocation that was added in commit 6c94958e56fcbacb8e1f689550a60034b074857c Date: Fri Jul 17 22:25:01 2020 +0200 icu: fix Windows Arm64 build Change-Id: I5685ebce13e2950a4dc8f1dec75c4aed18d584f6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145043 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2023-01-05Upgrade external/boost to latest Boost 1.81.0Stephan Bergmann
<https://dev-www.libreoffice.org/src/boost_1_81_0.tar.xz> has been generated (on Fedora 37) with > $ wget https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.bz2 > $ printf '71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa boost_1_81_0.tar.bz2' | sha256sum -c # cf. <https://www.boost.org/users/history/version_1_81_0.html> > boost_1_81_0.tar.bz2: OK > $ external/boost/repack_tarball.sh boost_1_81_0.tar.bz2 > Unpacking boost_1_81_0.tar.bz2 ... > Removing unnecessary files ... > Creating boost_1_81_0.tar.xz ... > Cleaning up ... > 1deb0a5a9e33a6626fcaa1d2efd4c0e74ca2b0eea87c1559e3917f3066b633d6 boost_1_81_0.tar.xz > Done. * external/boost/windows-no-utf8-locales.patch.0, introduced with f046fed2782f0d4244aff719ba70a56399a2583a "Don't ever attempt to initialise a std::locale with a UTF-8 locale on Windows", was presumably obsoleted by <https://github.com/boostorg/locale/commit/f45adfc9b963feacc827c3754e2549dd0cffaecb> "Use UTF-16 <-> UTF-8 codecvt on Windows". * external/boost/libc++.patch.0 was obsoleted by <https://github.com/boostorg/config/commit/f0af4a9184457939b89110795ae2d293582c5f66> "The std lib unary/binary_function base classes are deprecated/removed from libcpp15." * external/boost/0001-Change-mpl-integral_c-to-boost-integral_constant-to-.patch.2 was obsoleted by <https://github.com/boostorg/numeric_conversion/commit/50a1eae942effb0a9b90724323ef8f2a67e7984a> "Change mpl::integral_c to boost::integral_constant to avoid Clang 16 errors when constructing out of range enums (refs #24, boostorg/mpl#69)". * external/boost/0001-Avoid-boost-phoenix-placeholders-uarg1.10-ODR-violat.patch.2 is needed to e.g. avoid > ./.libs/libetonyek_internal.a(libetonyek_internal_la-KEY1DivElement.o):(.bss+0x3e): multiple definition of `boost::phoenix::placeholders::uarg1'; ./.libs/libetonyek_internal.a(libetonyek_internal_la-IWORKFormula.o):(.bss+0x3e): first defined here etc. while building ExternalProject_libetonyek, caused by <https://github.com/boostorg/phoenix/commit/8b6a9c26c115bc2cefea300b5c0abf7edf6dd9b7> "std::tuple support (Resolving #103) (#104)". Change-Id: I48773166d0c50f2850d8bb37fa6215d9e5c0d51d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145044 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
generated by cgit (git 2.34.1) at 2025-01-10 20:14:12 +0000