summaryrefslogtreecommitdiff
path: root/external
AgeCommit message (Collapse)Author
2019-03-12poppler: upgrade to release 0.74.0Michael Stahl
Fixes CVE-2019-7310. Add patch to fix CVE-2019-9200 too. CVE-2018-20662 looks irrelevant because we don't build pdfunite tool. Change-Id: I5e7ddabbb341f6bfefb376d552b50c4006f41906 Reviewed-on: https://gerrit.libreoffice.org/69094 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-03-03cairo: forgotten changeAndras Timar
2019-03-03cairo: upgrade to release 1.16.0Michael Stahl
This fixes some minor CVEs. Not including the fix for CVE-2018-18064, which does not affect LO because we use the default implementation of FT_Memory which uses free/malloc. Change-Id: Ic047ed52cff3fdeba068f1b8d303c6c96c69addd Reviewed-on: https://gerrit.libreoffice.org/68088 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-on: https://gerrit.libreoffice.org/68359 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-02-27mDNSResponder: upgrade to release 878.200.35Michael Stahl
Apple can't afford the costly GPG licenses to sign releases apparently, but the sha256 matches some OpenWRT and FreshPorts repos... Fixes CVE-2015-7988. Removing windows build patches, fixed upstream (except for the last hunk of the SOCKET patch, but that is in code that is only used on MacOSX). Reviewed-on: https://gerrit.libreoffice.org/68092 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 3a85c2db176db708c0ff9401c40858eb60e80f1e) Reviewed-on: https://gerrit.libreoffice.org/68139 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Change-Id: I9fdba5929badb75f995c66da0850d188780e7beb
2019-02-21Don't use the non-public fdatasync() API when sandboxed on macOSTor Lillqvist
Change-Id: I9e36cb78e3e945f6531a31e0ddf73d9c8d655f7d
2019-01-17poppler: upgrade to release 0.73.0Michael Stahl
Reviewed-on: https://gerrit.libreoffice.org/66306 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 0609ea4fc27f34367716bf41c0cdaa7785aed9da) Reviewed-on: https://gerrit.libreoffice.org/66369 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 033ff5b3eb90deaf6fd5eb8a74100233aa5fe772) Change-Id: If20998f8565b5534a96b3f29ccec572273edca1d
2019-01-17lcms2: upgrade to release 2.9Michael Stahl
... at least, that's the plan - this is harder than it appears, as the upstream maintainer appears to have released version 2.9 at least 3 times: - Fedora has a file evidently downloaded before Nov. 17 with SHA512 of e30ad5a9a1ab9e7aaace9431434caa19a5ff6143db46644aba971a5ee37a265b26bf738e886d766405a7eb45a9d620d67c7ab3684ace86a107cf5a76642c04a5 - Gentoo has a file evidently downloaded before Nov. 19 with SHA256 of d4ad6f8718f7f9dc8b2a3276c9f237aa3f5eccdcf98b86dedc4262d8a1e7f009 - Debian has a file evidently downloaded before Dec. 17 with SHA256 of 48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20 The lcms2-2.9.tar.gz available from sourceforge currently matches the one Debian has, so let's use it. * 0017-Upgrade-Visual-studio-2017-15.8.patch added (fixing CVE-2018-16435) * 0001-Added-an-extra-check-to-MLU-bounds.patch.1 removed (fixed upstream) Reviewed-on: https://gerrit.libreoffice.org/66400 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 99b20e589e64fbcf374d84ae68911ef2a96e537c) Reviewed-on: https://gerrit.libreoffice.org/66428 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 5d6a91c4df0ea51bb32794ff6068fa19bda44307) Change-Id: Iab8dada8f6d77d5b2da8560993380b3332bc02f6
2019-01-17python3: add patch bpo-17239: Disable external entities in SAX parserMichael Stahl
Change-Id: I44e969d8d3a8fe6b6426d61a1cbe83154c8518dd Reviewed-on: https://gerrit.libreoffice.org/66329 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit a57dd8eba9c0799dd42eb547a37622bce8fdb0b3) Reviewed-on: https://gerrit.libreoffice.org/66370 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 66b3860fd1772284dc12d0d2d2c76ac59b16883e)
2019-01-17libxml2: upgrade to release 2.9.9Michael Stahl
* fixes CVE-2018-14404 * drop one hunk from libxml2-android.patch that was added in commit 6a17d2f2ba7acfec277314b97b50e41532d6b44d; presumably nan() exists now given that other code is calling it. Change-Id: I696cc4e1da55536ea1c89a6e0446ce5bc8398ba4 Reviewed-on: https://gerrit.libreoffice.org/66308 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit beea5852720b22043aefcd1e6b7243c202b40601) Reviewed-on: https://gerrit.libreoffice.org/66367 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 69b5995ed815bea4d21080f64a4232f44131696f)
2018-12-29Copy gpgme-w32spawn.exe to workdir/LinkTarget/ExecutableMike Kaganski
... to avoid "GpgME not installed correctly" message boxes during unit tests. See the mail list thread started with https://lists.freedesktop.org/archives/libreoffice/2018-October/081209.html Change-Id: Ie57e6b5a7281d8f20ba97912f3413eafaac9cfd4 Reviewed-on: https://gerrit.libreoffice.org/61903 Tested-by: Jenkins Tested-by: Jan-Marek Glogowski <glogow@fbihome.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 0de0b8c9d80d68619b6f3c0e8d9429d8b08553fb) Reviewed-on: https://gerrit.libreoffice.org/65093 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2018-11-09call System.runFinalizersOnExit by reflection, since it was removed in jdk11Fridrich Štrba
Change-Id: I542c87bc1de21727a035cc6ac3b3e20c0ccfb5f7 Reviewed-on: https://gerrit.libreoffice.org/63208 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2018-11-08libxmlsec: drop not needed xmlsec1-customkeymanage.patch.1Miklos Vajna
This was added in commit ebd1b95bb5f9235d1dba1b840fd746c9b53320d2 (INTEGRATION: CWS xmlsec08 (1.1.2); FILE ADDED; 2005-03-10) without any real commit message to explain why this is necessary. system-xmlsec (not containing this patch) works fine for our XML signing purposes with software certificates, and just recently I learned that even hardware-based certificates work fine without this patch, so it can go away. I assume this was a refactor to allow some new feature as a next step, but that feature was never implemented. Reviewed-on: https://gerrit.libreoffice.org/55296 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit f06004c03bbd076767a570180b7fc239064713e6) Conflicts: external/xmlsec/UnpackedTarball_xmlsec.mk Change-Id: I31639230483cd34b14b35fd41b4fcd8284476138
2018-10-30libqxp, add update of config.subjan Iversen
Change-Id: I4999be84c45fa32d0ae6f62f667b2c7470972f49 (cherry picked from commit 90c22bf8a1e41cb6f4f8124f554e5efe081cc756) Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
2018-09-06Properly encode OAuth2 credentialsStephan Bergmann
Reviewed-on: https://gerrit.libreoffice.org/59986 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 33f7485dedea90e0f80c6348fa8ac5f27c5052e0) Conflicts: external/libcmis/UnpackedTarball_libcmis.mk Change-Id: Ic3edeae035262309e91fb01e3aca5c2f905bc3e5 Reviewed-on: https://gerrit.libreoffice.org/60017 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 2c4c7a11f18dd54a9dc319d00fa61672adbdc66d)
2018-08-29mariadb-connector-c: fix Windows buildMiklos Vajna
--enable-ext-mariadb-connector is not the default, this fixes the build after using that switch up to the mariadb-connector-c module. mysql-connector-cpp is still broken, VS 2015 gives internal compiler error there for the used boost pieces... Change-Id: I1845cde03d5166594aac67c23e61186920ab3785 Reviewed-on: https://gerrit.libreoffice.org/55055 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 46ac3e24f65ee69154afa6ba93997635629f79c0)
2018-08-28don't need dangling Library_mysqlcppconn.mkCaolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/59607 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 74ef0185b1945d610c591b7ec3cda67e5c857d22) Change-Id: I18fbe9feead3d48d9437cc7372eb1373ffb67c3e
2018-08-28Moving mysqlc into connectivity as a libraryTamas Bunth
Additionally I erased the remains of the old mysql C++ connector. Also update the code where the clang plugins were unhappy after moving the mysqlc module. Remove mysql-cpp-connector external. Change-Id: I771cc7afacf5012fc349afb6b36828fb0fee5a66 Reviewed-on: https://gerrit.libreoffice.org/59200 Tested-by: Jenkins Reviewed-by: Tamás Bunth <btomi96@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/59713 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-08-21Don't break on twain_dsm warningsMike Kaganski
(the warnings have appeared since MSVC 2017 update 8) Change-Id: I5e180ebef0a9d6809f0b5ca3014f60eaedd8ffe9 Reviewed-on: https://gerrit.libreoffice.org/59070 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit c144dcbdb54cf657e21b0ba09ca8675246441519) Reviewed-on: https://gerrit.libreoffice.org/59177 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2018-08-21nss: upgrade to release 3.38Michael Stahl
Fixes CVE-2018-0495 and "the ASN.1 code". (Remove one hunk of nss-android.patch.1 that should be obsolete with the current Android toolchain baseline (but that hunk didn't exist in libreoffice-6-0 or older anyway).) Change-Id: I5516edec17b72f53acd2749e8840805eead077bc Reviewed-on: https://gerrit.libreoffice.org/58697 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 3ef76067bfa1f9f60ec3989bd6b40a5760137903) Reviewed-on: https://gerrit.libreoffice.org/58722 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit e4874f777048535650a2bb1ce875e1a6e3e4b7ef)
2018-07-09Revert "Fix Python CVE-2017-1000158"Andras Timar
This reverts commit bb9c949c31d8a17a34baeaebb7bbac81f9056d61.
2018-07-02Fix Python CVE-2017-1000158Andras Timar
Change-Id: Id686120f85d44c8a0d65ae8683bcb7ed6e42854b
2018-07-02Resolve conflict with firebird-cygwin-msvc.patchAndras Timar
Change-Id: I7dbc8f71c25a6c6fb508614c3cb9e396f178ff8a
2018-06-27poppler: try to work around GCC 4.8.2 bugMichael Stahl
As seen on Linux-rpm_deb-x86@71-TDF: poppler/Annot.cc:2491:1: internal compiler error: in connect_traces, at dwarf2cfi.c:2676 The bug report claims that -march=i586 works around the bug. (cherry picked from commit 1c7921c43960a4a6717c816d646cf0f65fbaec12) Reviewed-on: https://gerrit.libreoffice.org/56292 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit dce6401f7e1f466c30996ad606699479713209e5) poppler: fix incorrect GCC_VERSION check The minor version is encoded into the last 2 digits, the micro version is not avialable. Reviewed-on: https://gerrit.libreoffice.org/56380 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins Change-Id: I1d97d2df9049e058d49987424cc8e4818a9fa9c6 Reviewed-on: https://gerrit.libreoffice.org/56298 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins (cherry picked from commit 08f77bc1c6650ee7b2dd9d7825bbc1cf08d4761b)
2018-06-27poppler: upgrade to release 0.66.0Michael Stahl
Unfortunately the autotools build system was removed in 0.60.0, and the CMake one is a bit overeager in linking against system libraries that happen to be installed on the build machine, and we currently don't require CMake anyway, so avoid the problems by using a gbuild makefile and a patch to add the generated header files. Remove all current patches: poppler-notests.patch.1: obsolete (autotools build system) poppler-mac-fake.patch.1: presumed obsolete ubsan.patch.0: presumably fixed differently upstream in https://cgit.freedesktop.org/poppler/poppler/commit/?id=f43cb73939f85952d83afc87a6dc638dc1ae311b poppler-libjpeg.patch.1: obsolete (autotools build system; there appears to be no way to do this with CMake?) 0001-Fix-building-with-old-clang.patch.1: merged upstream Change-Id: I271c87ab3ec25cc9d1e8fafb04dae7c004acc350 Reviewed-on: https://gerrit.libreoffice.org/56166 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 67e5355a8b0d51111934e0a0c30870b053c8e0d3) Reviewed-on: https://gerrit.libreoffice.org/56235 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit b893993869e720bbc078324c201ad9a3be8c0749)
2018-06-18Back-port of essential bits of Stephan's Firebird macOS alignment crack fixTor Lillqvist
Fixes the SEGV from isql ("Segmentation fault: 11") during 'make firebird' for me. Change-Id: Ie912932d07299ef39b96d833aaadf7c9ebbb8520 Reviewed-on: https://gerrit.libreoffice.org/56033 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-06-01svx: set the font name of imported PDF textAshod Nakashian
Change-Id: I79dde3c8983a70311de2d2a46093fac2722fb372
2018-06-01svx: update PDFium patch and codeAshod Nakashian
Change-Id: I07c6a7c65d5631b70da64927a35d7a3b371eff25
2018-06-01pdfium: update to 3426Miklos Vajna
Allows dropping the ugly freetype.patch.1. Reviewed-on: https://gerrit.libreoffice.org/54294 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 56195a4d0bbb21edeed1cea7a45283141c733f18) Change-Id: Ifa8a6dac02a49a2c13572e59773261a847efad3f
2018-06-01svx: cleanup pdfium importerAshod Nakashian
Change-Id: Id925ba7734a2c73270e40f19d3fc50552441c34e
2018-06-01svx: import processed PDF textAshod Nakashian
Some PDFs don't include spaces in the text. Instead, they rely on the explicit positioning of each character to render visually separated words. Latex seems to be prone to this approach, though not exclusively. Luckily, PDFium does process text and inserts "generated" spaces where necessary, which is what we retrieve and use as the text string while importing. Change-Id: Ic21fe6c8416ecaba66f06b6260f1d6b040ff12af
2018-06-01svx: correctly possition form objects from PDFAshod Nakashian
Change-Id: I7d216ca61b8a10219628877db7dd593a4987ef60
2018-06-01svx: support importing forms from PDFsAshod Nakashian
Still missing the context matrix transformations. Change-Id: Id9457c6475463127d3bc444f36fa373a6ec8fcb6
2018-06-01svx: support color text for imported PDFsAshod Nakashian
Change-Id: I01cba9456b37bd7a63c823bbe332d686f7ede389
2018-06-01svx: correct the positioning of PDF Paths and the stroke widthAshod Nakashian
Change-Id: I5b150721cc1b61b028f282062c1466ef6a67fcae
2018-06-01svx: improved text importing from PDFAshod Nakashian
Change-Id: I9a2fc2c8511655c1aa362c1a03a5e82ae3ba697e
2018-06-01svx: improve path importing from PDFAshod Nakashian
Change-Id: I8e63b2a35d841e065ef32fea95c0a5f22ca6f049
2018-06-01svx: support Paths in PDFs while importingAshod Nakashian
Change-Id: Idba294cf5a3a8dd00988f94786715b110039e000
2018-06-01svx: support PDF text colorAshod Nakashian
Change-Id: I7fa675c6560504e4fc7917e19cac3cceb2700d8e
2018-06-01svx: import PDF images as BGRAAshod Nakashian
This makes it trivial to support all sort of odd bit-format and 8-bit paletted images. Change-Id: I4555794eccd0ee2906f9a39bd93957ad3775432c
2018-06-01svx: more accurate PDF text importingAshod Nakashian
Change-Id: If37119510cbc091dc86cb5f699984186167745c7
2018-06-01svx: import PDF text using PDFiumAshod Nakashian
Change-Id: I7c75477f5257931f5182b8d65e898857526bf555
2018-06-01external: update pdfium to 3358Miklos Vajna
pdfium now has a build_config.h which is something between a generated file (it's not part of git) and a normal header (works in a way, so the same header works for all platforms), handle it the same way as clucene. Reviewed-on: https://gerrit.libreoffice.org/50840 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 612fae5c248e95d4f0985c51ebf05e3b0c278289) Change-Id: I674eca0c52fb8681c3a20501e39f95a8f9d8724e
2018-06-01pdfium: disable custom allocatorMiklos Vajna
That causes problems on aarch64 (see <https://lists.freedesktop.org/archives/libreoffice/2018-February/079384.html>) and provides little benefit to our use-case. Change-Id: I133d41476ab84cec67abc5b36a1e16c91bc6ac15 Reviewed-on: https://gerrit.libreoffice.org/49684 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 9efd288b31e259b964097d3eeeff7f6c10945cb3)
2018-06-01pdfium: update to 3312Miklos Vajna
Reviewed-on: https://gerrit.libreoffice.org/47689 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit e1026e267b4b1b0b0bd645c6bc212d6fa71544f8) Change-Id: I3e81c097870264bfcdd8c14407dcb95f5b153793
2018-05-31external/python3: Drop nis.cpython-*m.soStephan Bergmann
At least Fedora 28 glibc-2.27-8.fc28 no longer provides the nis development headers and libraries. (It only still contains some binaries for backwards compatibility, in the libnsl sub-package: "This package provides the legacy version of libnsl library, for accessing NIS services.") There is probably no real need to have nis.cpython-*m.so contained in external/python3/ExternalPackage_python3.mk (it probably just happened to build fine when that list was originally created, so was included). Change-Id: Ic6128fd872432005c0ded76640c5b56781ca69a1 Reviewed-on: https://gerrit.libreoffice.org/52535 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 93e6a823bd8543d30621769c7b34d6261ea5cb01)
2018-05-31Don't ever attempt to initialise a std::locale with a UTF-8 locale on WindowsTor Lillqvist
As I said in 2ff121f298e64ff204621220622472fe697d599d, passing a POSIX-style locale name to the std::locale constructor on Windows is decidedly odd, and apparently boost adds insult to injury by even really attempting to use a UTF-8 one if that is what our code thinks it wants. Or something. This commit avoids the ton of "warn:unotools.i18n:7996:3544:unotools/source/i18n/resmgr.cxx:123: CRT Report Hook: ASSERT: f:\dd\vctools\crt\crtw32\stdcpp\xmbtowc.c(89) : Assertion failed: ploc->_Mbcurmax == 1 || ploc->_Mbcurmax == 2" we otherwise get when built with --enable-dbgutil and a current VS2015 (or 2017?). Change-Id: I3a774dff7b12d9960f553c9f242e0463c6d13d5d Reviewed-on: https://gerrit.libreoffice.org/54444 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2018-05-23curl: upgrade to release 7.60.0Thorsten Behrens
This fixes the following CVEs: * FTP: shutdown response buffer overflow CVE-2018-1000300 * RTSP: bad headers buffer over-read CVE-2018-1000301 Reviewed-on: https://gerrit.libreoffice.org/54418 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Conflicts: download.lst Change-Id: Ic3229577083286501162aa5979a94ce934739557 Reviewed-on: https://gerrit.libreoffice.org/54464 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 8ddb3ca84b66050c394140fa4f7290e3607d84f5)
2018-05-15Related tdf#117105 fix RPATHS of gpgme and assuanStephan Bergmann
libgpg-error doesn't need RPATH at all ...as it doesn't link against any of our libs Change-Id: Iaf0df9d5dc5eefb976d2041f24b2921cb3e3b1ba Reviewed-on: https://gerrit.libreoffice.org/50953 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 5a13e78562bdd0871ad5866676a8a50659692af9) Remove apparently unused external/libgpg-error/disable-rpath-option.patch ...which only patched configure.ac not configure, and the latter does not appear to be regenerated from the former in ExternalProject_libgpg-error Change-Id: Id0132ed8fd8ea3a5012e4a2bc309bd5f3983ad11 Reviewed-on: https://gerrit.libreoffice.org/50954 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 4cb1f0a5ff1c3e74c650f17d9a164e97c34e9327) Fix external/libassuan Linux RPATH In other external projects using libtool, we fix that by patching configure, resetting hardcode_libdir_flag_spec[_CXX] at the end of the linux*) case block that sets the Linux-specific value. But here we run autoreconf in ExternalProject_libassuan, so that patch in configure would be overwritten. The relevant code in configure comes from autoconf boilerplate, so we cannot just do the same patch in configure.ac. But we can reset hardcode_libdir_flag_spec sufficiently late in configure.ac so that things still work as intended. Reviewed-on: https://gerrit.libreoffice.org/50959 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 24d0704fa468b300558a3f904ae853fcb7fca312) Change-Id: Ic6c6123bcfe8bc2dac87812f919842519374abaa Improve gpgmepp -> libassuan/libgpg-error lib dependencies ...so that other executables than svidl would benefit, too Change-Id: I208ebbc04189c2f25eace19ef0875349cf63d3f0 Reviewed-on: https://gerrit.libreoffice.org/50963 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 598cf9f76176c6bef00402755d0e941a036c6a2d) Fix external/gpgmepp Linux RPATH In other external projects using libtool, we fix that by patching configure, resetting hardcode_libdir_flag_spec[_CXX] at the end of the linux*) case block that sets the Linux-specific value. But here we run autoreconf in ExternalProject_libassuan, so that patch in configure would be overwritten. The relevant code in configure comes from autoconf boilerplate, so we cannot just do the same patch in configure.ac. But we can reset hardcode_libdir_flag_spec sufficiently late in configure.ac so that things still work as intended. Disable tests that would build executabes linking against libgpgme.so, which in turn links against the libassuan and libgpg-error libs, which would no longer be found by the linker because of the dropped -rpath flags. (Alternatives might be to pass in LD_LIBRARY_PATH or to link with --allow-shlib-undefined.) Reviewed-on: https://gerrit.libreoffice.org/50960 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit d4347f5d585232e1b025b4199ded53e6619d6242) Change-Id: I7e37abf802d213347bd80383b7980d85cf0762d4 Reviewed-on: https://gerrit.libreoffice.org/53789 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 4f7028dd292e22f09cd505b529d93713747ebd6b)
2018-04-26Install UCRT from MSUs, not using nested VC Redist installMike Kaganski
Using nested install is bad because (1) MS advises against it (though it most possibly doesn't relate to our specific case, when we install the vc redist exe package in UI part, so actually only a single MSI session is active at any time); (2) because it adds some extra interactions (user sees something "unrelated" being installed, which raises concerns; additional admin authentication required); and (3) because it runs in InstallUISequence, thus only installing the UCRT when doing interactive installation (unattended installs, including GPO, need to install UCRT separately). This patch aims to incorporate the original UCRT MSU (Windows Update) packages (https://support.microsoft.com/en-us/help/2999226) available as a zip archive from https://www.microsoft.com/en-us/download/details.aspx?id=48234 - the same as used in VC redists for VS 2015 and 2017. This obsoletes the separate installation of the redist; since we also have the redist as merge module in our MSI, that is enough (and removes redundancy). The MSUs are installed using wusa.exe in a custom action (deferred, non-impersonating). As a small bonus, embedding MSUs instead of redist EXE allows us to shrink the size of installer a little (~10 MB). As deferred custom actions cannot access current installer database, we workaround this by using initial immediate impersonating action to extract the binaries into a temporary location. To ensure that the file gets removed upon completion (both successful and failed), we use an additional cleanup action. Commit 61b1d631331551b43bc7d619be33bfbfeff7cad6 is effectively reverted. This commit also includes changes from commits from master: 8faa1bc61fa8f09365d483364aea2b1c2751b587 1f8a3657216e44796cb94087450552aa977ebdae 378c1576d2890625ebbd18ec9ccff560eeb1619f Change-Id: I1529356fdcc67ff24b232c01ddf8bb3a31bb00bd Reviewed-on: https://gerrit.libreoffice.org/53332 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-04-23Suppport _MSC_VER 1900 through (less then) 2000 (Firebird)Mike Kaganski
(see https://gerrit.libreoffice.org/52164 for master) (see https://blogs.msdn.microsoft.com/vcblog/2016/10/05/visual-c-compiler-version/) Change-Id: I7e67d9d53b66251ba1dab34815412fbba7f8e6b1 Reviewed-on: https://gerrit.libreoffice.org/53311 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
generated by cgit (git 2.34.1) at 2024-06-06 10:40:34 +0000