summaryrefslogtreecommitdiff
path: root/external
AgeCommit message (Collapse)AuthorFilesLines
3 daystdf#161292: Fix create-partial-info for newly added filesStephan Bergmann1-1/+7
084c64982ef6187292fd73e6deaa4448e0b6f3de "Create MAR updates from msi rather than from archive" had patched make_add_instruction (in workdir/UnpackedTarball/onlineupdate/tools/update-packagin/common.sh) to unconditionally use add-if (with the file itself as test file) rather than plain add (because we can't reuse Mozilla's extension logic there to determine optional installation parts), and it noted in its commit message that "addition of files will cause a MAR update to miss them". Which turned out to be a problem with <https://update-mar.libreoffice.org/24.2.2.2/LibreOffice_24.2.2.2_Windows_X86_64_d56cc158d8a96260b836f100ef4b4ef25d6f1a01_from_bf759d854b5ab45b6ef0bfd22e51c6dc4fb8b882_partial.mar>, updating from 24.2.2.1 with instdir/program/python-core-3.8.18/ to 24.2.2.2 with instdir/program/python-core-3.8.19/: All the files in python-core-3.8.19 were recorded as add-if testing on themselves, so were never added. So a better approach is, for newly added files to make them add (so they get added unconditionally, even if they are part of some optional component that happens to not be installed; this hopefully won't cause further issues) instead of add-if. (Existing files that are added instead of patched still use add-if, though.) This does not address the create-update-info target for full mar updates (which is not used currently?), just the create-partial-info target. (The existing calls to make_add_instruction in the upstream Mozilla code already have a seemingly rotten mix of two-argument calls and calls with three arguments where the third argument is ignored, and would check for a fourth "forced" argument but which is never passed in. So avoid extending that mess further, and just replace this never-use-add-if call to make_add_instruction directly with that function's (accordingly tweaked) body.) Change-Id: Ib596f3aa72c3ab9f896b20f7d623bc574eb15fd8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168285 Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> Tested-by: Jenkins
4 daysexternal/libetonyek: Missing include (std::front_inserter)Stephan Bergmann2-0/+11
Change-Id: I4caeb6dd3d042b1a5ccbd3355c1b4ae192ab4925 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168242 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
9 daysofz#68840 another putcontig8bitYCbCr22tile issueCaolán McNamara2-0/+18
Change-Id: I6e119cf1b3bec609f94784eb0c439835875d6112 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168031 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
12 dayscurl: Upgrade to 8.8.0Xisco Fauli1-3/+3
Downloaded from https://curl.se/download/curl-8.8.0.tar.xz Change-Id: Ib6ecbdb774f4d2643d8e848d8826704a51884eac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167929 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2024-05-19tdf#150082 tdf#161141 fix typecasting error in MakefilePrintf Debugging1-1/+1
In patch https://gerrit.libreoffice.org/c/core/+/167057 , cast to st_mysql_client_plugin instead of st_mysql_client_plugin_AUTHENTICATION Change-Id: I76e0717eb3fe5e665c262a33852908c4b6b38ecf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167806 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2024-05-17beanshell: upgrade to 2.1.1Xisco Fauli5-37/+21
* Adapt external/beanshell/java9.patch.0 to fix [javac] error: Source option 6 is no longer supported. Use 7 or later. [javac] error: Target option 6 is no longer supported. Use 7 or later. Downloaded from https://github.com/beanshell/beanshell/releases/download/2.1.1/bsh-2.1.1-src.zip Change-Id: I969813fd2bb2a910004b6c28f5ed9ba95c39895f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167764 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2024-05-15lpsolve: remove obsolete dmake patchXisco Fauli2-85/+0
Added with 249a4da9cd5217b0c340edd779bd17e44e21d678 "warn free build of dmake, concat-deps and lpsolve" Change-Id: I1c8eb1e4882526749fe5f46906cdea05e62386a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167698 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2024-05-15Java-WebSocket: Upgrade to 1.5.6Xisco Fauli1-1/+1
Downloaded from https://github.com/TooTallNate/Java-WebSocket/archive/refs/tags/v1.5.6.tar.gz Change-Id: Ie6c86b3f7e41147133919daca699a6c96372e44f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167665 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2024-05-15lok: use of lok random hook in NSS.Michael Meeks2-0/+99
This allows us to avoid opening /dev/urandom which may not be there. Change-Id: I51727fe4a2a28be802afdf6d9ccca5a198167b7d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165851 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 708663da401e1cc5c4531c8cbb3370c4cf2843d6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167670 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Jenkins
2024-05-13poppler: Upgrade 24.05.0Xisco Fauli4-24/+37
* external/poppler/char_traits.patch is no longer neeeded after https://cgit.freedesktop.org/poppler/poppler/commit/cpp/poppler-global.h?id=b4ac7d9af7cb5edfcfcbda035ed8b8c218ba8564 * Adapt external/poppler/disable-nss-and-gpgmepp.patch.1 after https://cgit.freedesktop.org/poppler/poppler/commit/?id=d40bb7e308c9e3299e50d3e2880229cd6272587e Downloaded from https://poppler.freedesktop.org/poppler-24.05.0.tar.xz Change-Id: I87ed833f92e504f0a39b5f64c1db42d579050a37 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167582 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2024-05-13SKIA_IMPLEMENTATION is always defined, either 0 or 1Caolán McNamara1-1/+1
rather than !defined in the not-building-skia case Change-Id: Ib27783c958e327b01ab9c8496eee969c6f9c50a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167591 Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> Tested-by: Jenkins
2024-05-13Update to ICU 74.1Taichi Haradaguchi1-1/+0
https://icu.unicode.org/download/74 Unicode 15.1 https://blog.unicode.org/2023/09/announcing-unicode-standard-version-151.html CLDR 44 https://cldr.unicode.org/index/downloads/cldr-44 New Unicode blocks: UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_I Change-Id: Ic9196e10138663d07235f5ebd9cc4bf3a9750824 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158749 Tested-by: Eike Rathke <erack@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com>
2024-05-12help msvc -analyzer out wrt SkASSERTCaolán McNamara2-0/+26
Change-Id: I32387c80273d0bc080e47a1d9ccf7454a4a3d79a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167518 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-05-12add noreturn to boost::spirit::throw_Caolán McNamara2-0/+13
Change-Id: Iac1d998a408d756f50f7c18944f4e1f8afef2e83 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167523 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-05-11Update Hunspell URL in readmesIlmari Lauhakangas3-3/+3
Change-Id: Ic1a993029060a1260dffa126a930e29d4135fe61 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167506 Tested-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
2024-05-10libmwaw: Upgrade to 0.3.22Xisco Fauli1-0/+3
Change-Id: I95169f11e7b188ab9b4667b2d4736bd0d5a4a083 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167477 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2024-05-10help msvc -analyzer out wrt CPPUNIT_ASSERTCaolán McNamara2-0/+61
so it can code following the CPPUNIT_ASSERT doesn't need to check what condition might have failed in the assert Change-Id: Ife7e5e54b17a8316425222d2a0efd694c9467089 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167480 Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> Tested-by: Jenkins
2024-05-10librevenge: upgrade to 0.0.5Xisco Fauli3-8/+20
* Add C2039-unique-shared_ptr.patch.0 to fix C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/UnpackedTarball/librevenge/src/lib/RVNGBinaryData.cpp(96): error C2039: 'unique': is not a member of 'std::shared_ptr<librevenge::`anonymous-namespace'::DataImpl>' C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/UnpackedTarball/librevenge/src/lib/RVNGBinaryData.cpp(86): note: see declaration of 'std::shared_ptr<librevenge::`anonymous-namespace'::DataImpl>' make[1]: *** [C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/solenv/gbuild/LinkTarget.mk:398: C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/GenCxxObject/UnpackedTarball/librevenge/src/lib/RVNGBinaryData.o] Error 2 on Windows Change-Id: I31023633426fc902e2298c696826d8371bb4d63b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167388 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins
2024-05-07cool#7015 fix rgba emojisCaolán McNamara1-0/+60
We initially added this for android so we could match the OpenGL GL_RGBA layout available there. Later we made it available for all platforms via --enable-cairo-rgba which is useful for the kit case. But along the line color emoji support was added to cairo which wasn't present at the time of the original patch, so now capture those uses as well. https: //github.com/CollaboraOnline/online/issues/7015 Change-Id: I6039607a46a58a7e9cbf5c052e6fb34234fd19b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167225 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-05-07Revert "make skia into static library"Noel Grandin2-43/+44
This reverts commit 6517ce70e50e61441484e7ee7a4be0e265020175. Reason for revert: <_rene__> noelgrandin: ping? <_rene__> noelgrandin: /usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/LinkTarget/StaticLibrary/libskia.a: error adding symbols: archive has no index; run ranlib to add one <_rene__> noelgrandin: caused by your skia static library change. I think I pointed that out once already... <_rene__> $ ld -v <_rene__> GNU ld (GNU Binutils for Debian) 2.42 <noelgrandin> hmm, it's not an ld version issue, because I have ld 2.41 <_rene__> gcc version 13.2.0 (Debian 13.2.0-24) <_rene__> and <_rene__> Debian clang version 16.0.6 (27) <_rene__> fwiw, too <noelgrandin> is that a mergelibs build, or a regular build? <_rene__> mergelibs <_rene__> (the "normal" one, not =more) <_rene__> noelgrandin: ... and LTO <_rene__> noelgrandin: (saying because googling gives me https://github.com/mesonbuild/meson/issues/8371. and yes, .a is built with clang and the rest with gcc "of course") <_rene__> noelgrandin: but the Linux release builds _do_ that: <_rene__> $ grep -E "(lto|merge)" distro-configs/LibreOfficeLinux.conf <_rene__> --enable-mergelibs <_rene__> --enable-lto <_rene__> $ <loircbot> LibreOffice (core) [libreoffice-7-6-7] lohmaier+LibreOffice · readlicense_oo/license/CREDITS.fodt · update credits <noelgrandin> oh yeah, good spotting <noelgrandin> yes, LTO is going to be a problem because skia is built with clang Change-Id: I96c63109d2856c6e4cb22cf9ac945d4cfa9848c9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167227 Tested-by: René Engelhard <rene@debian.org> Reviewed-by: René Engelhard <rene@debian.org> Tested-by: Jenkins
2024-05-07make skia into static libraryNoel Grandin2-44/+43
(1) we only use it from inside vcl (2) it exports a boatload of symbols (3) its a performance hotspot so lets link it inside and give the optimiser as much room as possible. Change-Id: If19d5556e3b45f40ef09d1e9225d12ef5f1ec32a Change-Id: I3d5edca20f5a15e8981f17fe9fcb9a338006eaff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167273 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2024-05-07lxml: upgrade to 5.2.1Xisco Fauli4-182/+0
* 0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1 got obsoleted with https://github.com/lxml/lxml/commit/9686dd9c7670d18acff6360c8444520273d5f1b2 * Wincompatible-function-pointer-types.patch and Wincompatible-pointer-types.patch got obsoleted with https://github.com/lxml/lxml/commit/6bdf4c321b92e002123b4c162c75524dbeb4d54d Change-Id: I8f0dcba3bd64a1766a2292b687c8959c739ced6d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167278 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2024-05-07glm: Upgrade to 1.0.1Xisco Fauli3-21/+9
c++20.patch.0 got obseleted in https://github.com/g-truc/glm/commit/6fdeff4d67f3db493d47c44da20aa1efaa6574ef Change-Id: I8698968b55f299c55777fe280b3eda9e2bea9cdc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167268 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2024-05-06makefile simplification: replace $(call gb_UnpackedTarball_get_dir,foo)Christian Lohmaier68-232/+232
…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
2024-05-06tdf#150082: LO Base MariaDB/MySQL connector don't accept auth via gssapi...Julien Nabet2-11/+7
take 2 + add sspi support for Windows Thank you Mike for the suggestion and explanation about error I had done on initial commit! We need to link with Secur32 to have: - AcquireCredentialsHandleA - __imp__FreeCredentialsHandle - _InitializeSecurityContextA - __imp__DeleteSecurityContext referenced by function _auth_client without this, we've got for example on Windows Jenkins: mariadb-connector-c.lib(sspi_client.o) : error LNK2019: unresolved external symbol _AcquireCredentialsHandleA@36 referenced in function _auth_client Change-Id: I138224942f16c0c6a23bb2854ef0ca561e82b061 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167057 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2024-05-03makefile simplification: replace $(call gb_CustomTarget_get_workdir,foo)Christian Lohmaier1-1/+1
…by a simple/static $(gb_CustomTarget_workdir)/foo The build system has a lot of overly complicated leftovers from when it was introduced and had not only deal with split repositories but also had to coexist with another buildsystem. Along with lots of copy'n'paste along the years the makefiles became hard to grasp for newcomers with all our calls and evals. As a first step to streamline that, the macros from TargetLocations that simply prefix a static path to the argument (and similar of the same kind) are a natural pick before simplifying the rules themselves/getting rid of a bunch of eval statements. Change-Id: Ia06dbbcd5d1994755a2ff05b84f72ccbc4e3cab5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167005 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2024-05-03Related tdf#150082: remove duplicate gssapi_client/gssapi_errmsgJulien Nabet1-4/+0
Change-Id: I38be66163320c1408f5bbb846727994c92e3c246 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167036 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2024-05-01WaE: C6011 Dereferencing NULL pointer warningsCaolán McNamara2-0/+11
Change-Id: I5a4d2982b5d980704dfc19fd92d01fd8aeefe144 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166952 Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> Tested-by: Jenkins
2024-04-26use strawberry perl in wsl-as-helper case for opensslChristian Lohmaier1-1/+2
it needs modules that are not available in git-bash perl, and strawberry perl is already used as a way to get windres and similar utilities Might want to revisit that to streamline the dependencies Change-Id: Ieb1c83831292677e9930d376d9d71283c6a1140e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166342 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2024-04-26run autoconf/autoreconf via wsl in wsl-as-helper caseChristian Lohmaier3-3/+3
Change-Id: I9bcdfe352fd378e1bf09e15b8d8f7dcea82c0b5e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166341 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2024-04-26extracting tarballs that call helpers to uncompress require unix-style pathsChristian Lohmaier1-1/+1
Change-Id: I528e343fb5b22194b4639649fbfc04c0583f77c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166336 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2024-04-26add MSYS_NO_PATHCONV=1 to prevent MSYS auto-magicChristian Lohmaier22-22/+22
git-bash/MSYS tries to resolve anything that looks like a path (i.e. anything starting with a /) - if the "target" doesn't exists, it just prepends the MSYS installation dir and breaks all kind of stuff. You could escape those with double-slash at the beginning, but that would mean lots of noise/unnecessary changes in pretty much every makefile, so just getting rid of that behavior is much better. ant and some externals however rely on MSYS path-conversion, so unset MSYS_NO_PATHCONV for those. Ant does its own checks whether it runs under cygwin or msys, and easier to please externals using the autoconversion than to add patches to force them into compliance… Change-Id: Ie80964e40c53ace80adb4707aae0db63ebc4ee4c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166330 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2024-04-26libgpg-error: Upgrade to 1.49Xisco Fauli1-1/+1
Change-Id: I1bd83294e58952ebdbaaf0362bd8675c1911b9be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166697 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
2024-04-26add debuginfo generation flags to internal nssCaolán McNamara1-1/+5
Change-Id: I34c9df0f94121013dada738ecd2b6bf91d138024 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166528 Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> Tested-by: Jenkins
2024-04-26Typo gb_Trace_ liblangtrag instead of liblangtagJulien Nabet1-2/+2
Change-Id: Ib4b66549725c6010b1c9b9baf11674f86ac5f1ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166652 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins
2024-04-26Upgrade external/boost to latest Boost 1.85.0Stephan Bergmann4-50/+0
<https://dev-www.libreoffice.org/src/boost_1_85_0.tar.xz> has been generated (on Fedora 40) with > $ wget https://boostorg.jfrog.io/artifactory/main/release/1.85.0/source/boost_1_85_0.tar.bz2 > $ printf '7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617 boost_1_85_0.tar.bz2' | sha256sum -c # cf. <https://www.boost.org/users/history/version_1_85_0.html> > boost_1_85_0.tar.bz2: OK > $ external/boost/repack_tarball.sh boost_1_85_0.tar.bz2 > Unpacking boost_1_85_0.tar.bz2 ... > Removing unnecessary files ... > Creating boost_1_85_0.tar.xz ... > Cleaning up ... > 4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a boost_1_85_0.tar.xz > Done. Three patches failed to apply: * external/boost/boost_1_59_0.property_tree.wreturn-type.patch ("aka MSVC warning C4715: not all control paths return a value") should no longer be necessary after <https://github.com/boostorg/property_tree/commit/e7c4005098749d878375be9ea8778b420ee89b86> "Use BOOST_UNREACHABLE_RETURN at the end of function" (the referenced <https://svn.boost.org/trac/boost/ticket/11501> appears to no longer be reachable, though). * The boost/math parts of external/boost/Wundef.patch.0 are obsoleted by <https://github.com/boostorg/math/commit/30cb6fc1fe871046c2880c8c39b0cea5b91a7f2c> "Fix -Wundef warnings". * external/boost/boost-emscripten-noshm.patch.0 is obsoleeted by <https://github.com/boostorg/interprocess/commit/94ead3e59d197e0d8d908b7e8918673bed51fa34> "emscripten doesn't support shm". Change-Id: Id2d86d25a60097f3f0852063b5ac2a8220f6b479 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166656 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2024-04-24use --binary flag when applying patches with patch from git-bashChristian Lohmaier6-0/+31
Change-Id: Idbd4ad7ad89dc727e2f0cf851c4c62f05d5b2a0c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166328 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2024-04-23external/icu: Drop hidden dependency on PythonStephan Bergmann2-0/+12
...which was always satisfied directly from the system, regardless of our --enable-python=... setting. (And which was a problem for my Git Bash and WSL based Windows build attempt, where it happened to find a dysfunctional Python wrapper at C:/Users/steph/AppData/Local/Microsoft/WindowsApps/python3 which caused a [...] > Not rebuilding data/rules.mk, assuming prebuilt data in data/in > Spawning Python to generate test/testdata/rules.mk... > Python was not found; run without arguments to install from the Microsoft Store, or disable this shortcut from Settings > Manage App Execution Aliases. > configure: error: Python failed to run; see above error. error when building ExternalProject_icu.) There are three uses of that PYTHON setting across workdir/UnpackedTarget/icu: 1 In source/configure.ac to generate source/data/rules.mk if source/data/locales/root.txt would exist---but which doesn't, so we don't actually need PYTHON there. 2 In source/configure.ac to generate source/test/testdata/rules.mk, but which our (non-check) build apparently doesn't need anyway. 3 In source/data/Makefile.in for target check-local, which is a sub-target of check (which we don't build). Change-Id: I7455cc91fc67f36582bf54851c07030830cd3b8d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166500 Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> Tested-by: Jenkins
2024-04-22tdf#150082: LO Base MariaDB/MySQL connector don't accept auth via gssapiJulien Nabet2-0/+15
Exclude Windows since we're not sure gssapi.h is available (at least Jenkins Windows machine doesn't have it) Change-Id: Iba396f77b07dce4291de5eb0e6ad7c0c25e6c3c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159954 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2024-04-22Update pdfium to 6425Miklos Vajna6-77/+28
Drop parts of build.patch.1 and the entire include.patch, which are probably obsolete and don't apply anymore. Change-Id: I18c8d5e2ee97c7793e75ac0e47b5705b99585d59 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166415 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2024-04-22REAL_CC[_CFLAGS] are already set by gb_ExternalProject_runChristian Lohmaier1-7/+1
(and that also takes care of proper quoting) Change-Id: Ic8c29300a2e6d5381c0d8873572f7c076362c93d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166324 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2024-04-18external/argon2: Adapt vcxproj to Debug|ARM64Stephan Bergmann1-10/+60
Change-Id: I3a881c56859d5db36ee13a63aec6926d0e3f2638 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166230 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2024-04-18libwebp: Upgrade to 1.4.0Xisco Fauli1-9/+12
Change-Id: I196316b0c7efbe27c06b8dfed90db5248db6dce4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166185 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2024-04-15Update libxmlsec to 1.3.4Miklos Vajna2-35/+0
Allows dropping xmlsec-nss-Ensure-NSS-algorithms-are-initialized-754.patch.1, which was a backport. Change-Id: Ifdd0b5285daa79116a91ab2d122a9809f8effb5e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166019 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2024-04-08clean up after removal of patched rhinoRene Engelhard1-9/+0
Change-Id: I193fd0c10d297555faa7a832718dbd6cd929a406 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165762 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2024-04-07Upgrade external/boost to latest Boost 1.84.0Stephan Bergmann6-95/+109
<https://dev-www.libreoffice.org/src/boost_1_84_0.tar.xz> has been generated (on Fedora 39) with > $ wget https://boostorg.jfrog.io/artifactory/main/release/1.84.0/source/boost_1_84_0.tar.bz2 > $ printf 'cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454 boost_1_84_0.tar.bz2' | sha256sum -c # cf. <https://www.boost.org/users/history/version_1_84_0.html> > boost_1_84_0.tar.bz2: OK > $ external/boost/repack_tarball.sh boost_1_84_0.tar.bz2 > Unpacking boost_1_84_0.tar.bz2 ... > Removing unnecessary files ... > Creating boost_1_84_0.tar.xz ... > Cleaning up ... > fd4a2ee785ea0e4efc5221a4284e0cf51096e8409871fb70fdaced002eeffc0b boost_1_84_0.tar.xz > Done. * external/boost/0001-Avoid-boost-phoenix-placeholders-uarg1.10-ODR-violat.patch.2 was obsoleted by <https://github.com/boostorg/phoenix/commit/665047aac26ad4d96b266d87504b3a88ad21b37e> "avoid ODR by making this const". * The modified external/boost/windows-no-utf8-locales.patch.0, whose original version no longer applied as-is, should hopefully still mitigate the issue described in 072a25e1ef4815bbef4f18f59f025862a0d8e876 "tdf#157135 workaround: restore and update windows-no-utf8-locales.patch.0". * external/boost/Wundef.patch.0 is needed to silence > In file included from /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/throw_exception.hpp:24, > from /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/unordered/detail/serialize_tracked_address.hpp:16, > from /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/unordered/detail/fca.hpp:117, > from /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/unordered/detail/implementation.hpp:17, > from /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/unordered/detail/map.hpp:7, > from /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/unordered/unordered_map.hpp:17, > from /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/unordered_map.hpp:17, > from /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/external/boost/include/boost/unordered_map.hpp:30, > from /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/configmgr/source/modifications.hxx:28, > from /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/configmgr/source/data.hxx:34, > from /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/configmgr/source/groupnode.cxx:26: > /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/unordered/detail/type_traits.hpp:51:22: error: "BOOST_LIBSTDCXX_VERSION_WORKAROUND_GUARD" is not defined, evaluates to 0 [-Werror=undef] > 51 | #if BOOST_WORKAROUND(BOOST_LIBSTDCXX_VERSION, < 50000) > | ^~~~~~~~~~~~~~~~~~~~~~~ > /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/config/workaround.hpp:272:10: note: in definition of macro ‘BOOST_WORKAROUND’ > 272 | ((symbol ## _WORKAROUND_GUARD + 0 == 0) && \ > | ^~~~~~ > /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/unordered/detail/type_traits.hpp:64:22: error: "BOOST_LIBSTDCXX_VERSION_WORKAROUND_GUARD" is not defined, evaluates to 0 [-Werror=undef] > 64 | #if BOOST_WORKAROUND(BOOST_LIBSTDCXX_VERSION, < 50000) > | ^~~~~~~~~~~~~~~~~~~~~~~ > /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/config/workaround.hpp:272:10: note: in definition of macro ‘BOOST_WORKAROUND’ > 272 | ((symbol ## _WORKAROUND_GUARD + 0 == 0) && \ > | ^~~~~~ > /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/unordered/detail/type_traits.hpp:77:22: error: "BOOST_LIBSTDCXX_VERSION_WORKAROUND_GUARD" is not defined, evaluates to 0 [-Werror=undef] > 77 | #if BOOST_WORKAROUND(BOOST_LIBSTDCXX_VERSION, < 50000) > | ^~~~~~~~~~~~~~~~~~~~~~~ > /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/config/workaround.hpp:272:10: note: in definition of macro ‘BOOST_WORKAROUND’ > 272 | ((symbol ## _WORKAROUND_GUARD + 0 == 0) && \ > | ^~~~~~ etc. (<https://ci.libreoffice.org/job/gerrit_linux_gcc_release/155922/>) as seen with some versions of GCC which apparently fail to honor in that situation the > #pragma GCC diagnostic ignored "-Wundef" in the external/boost/include wrappers. (Using > #pragma GCC system_header in those external/boost/include wrappers had been dismissed with 29661a886e4157e0cb6141b49fb5602fa621cc9a "boost: stop using #pragma GCC system_header".) Change-Id: Idf1d5a17bc198b8ea7a54751e8e2fa6ca2169167 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161138 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2024-04-03external/lxml: Silence -Wincompatible-pointer-typesStephan Bergmann2-0/+66
...as seen with recent GCC 14 trunk, > gcc -Wno-unused-result -Wsign-compare -DDYNAMIC_ANNOTATIONS_ENABLED=1 -g -O0 -Wall -I/home/sberg/lo/core/workdir/UnpackedTarball/zlib -I/home/sberg/lo/core/workdir/UnpackedTarball/python3 -I/home/sberg/lo/core/workdir/UnpackedTarball/python3/Include -fPIC -DCYTHON_CLINE_IN_TRACEBACK=0 -I/home/sberg/lo/core/workdir/UnpackedTarball/libxml2/include -I/home/sberg/lo/core/workdir/UnpackedTarball/libxslt -Isrc -Isrc/lxml/includes -I/home/sberg/lo/core/workdir/UnpackedTarball/python3/Include -I/home/sberg/lo/core/workdir/UnpackedTarball/python3 -c src/lxml/etree.c -o build/temp.linux-x86_64-3.8-pydebug/src/lxml/etree.o -w > src/lxml/etree.c: In function ‘__pyx_pf_4lxml_5etree_11TreeBuilder_4data’: > src/lxml/etree.c:137698:66: error: passing argument 1 of ‘__pyx_f_4lxml_5etree_11TreeBuilder__handleSaxData’ from incompatible pointer type [-Wincompatible-pointer-types] > 137698 | __pyx_t_1 = __pyx_f_4lxml_5etree_11TreeBuilder__handleSaxData(((struct __pyx_obj_4lxml_5etree__SaxParserTarget *)__pyx_v_self), __pyx_v_data); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(3, 832, __pyx_L1_error) > | ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > | | > | struct __pyx_obj_4lxml_5etree__SaxParserTarget * > src/lxml/etree.c:137074:105: note: expected ‘struct __pyx_obj_4lxml_5etree_TreeBuilder *’ but argument is of type ‘struct __pyx_obj_4lxml_5etree__SaxParserTarget *’ > 137074 | static int __pyx_f_4lxml_5etree_11TreeBuilder__handleSaxData(struct __pyx_obj_4lxml_5etree_TreeBuilder *__pyx_v_self, PyObject *__pyx_v_data) { > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~ etc. Change-Id: I19f6768bf031c04730972c1fa4a006e2a7d50e27 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165758 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2024-04-02Update to latest Rhino 1.7.14Stephan Bergmann9-1259/+357
...at the expense of losing, at least for now, the script editor for it (which had been hacked into the old upstream sources in a hard-to-maintain way). rhino-1.7.14.zip is taken from <https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-1.7.14.zip>. Building it would now use Gradle, but instead just hack together an invocation of javac and jar in external/rhino/ExternalProject_rhino.mk that effectively generates the same jar as the upstream-built jar available at <https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-1.7.14.jar>. All the various patches are no longer necessary: * external/rhino/rhino1_5R5.patch and external/rhino/OfficeScriptInfo.java were mostly for the hacked-in script editor, which has been abandoned at least for now (see above). * external/rhino/rhino1_5R5-find_swing.patch (originally from 0a7f9346503a557f583bced269655fa1996550af "ause109: #i106296# make build.xml aware of TARFILE_LOCATION") appears to be obsolete. * external/rhino/rhino1_5R5-updateToolTip.patch is covered by <https://github.com/mozilla/rhino/commit/ab20a73b16f68daf715c7ac4808c119bb15d698c> "Fix bug 414869: Rhino debugger fails to launch due to updates in mac os x leopard". * external/rhino/rhino-classpath.patch.1 from bb58293296f843654045d7b0eba6899d11533a4a "rhino: unbreak build on Fedora 34" was only relevant when building with Ant. Change-Id: I5fca5915d785716f7aaf313ff2469a20f55f707a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165190 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2024-04-01lcms2: upgrade to 2.16Taichi Haradaguchi4-15/+29
* backport 0001-Added-missing-export.patch to fix the Windows build. * drop c++17.patch.1, which fixed uptream. Change-Id: Ib658ba3067c35ca5cd1ccb7b3f0f2f3bc9f82a43 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165350 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
2024-03-28libgpg-error: upgrade to release 1.48Xisco Fauli1-1/+1
Change-Id: I3920d10657a91b56f484a5a61017d2e2ba3291b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165457 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-03 20:00:00 +0000