summaryrefslogtreecommitdiffstats
path: root/RepositoryExternal.mk
Commit message (Collapse)AuthorAgeFilesLines
* curl: upgrade to release 7.78.0Michael Stahl2022-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | * Fixes CVE-2020-8284 CVE-2021-22924 * Also fixes these which don't look relevant to LO: CVE-2020-8231 CVE-2020-8285 CVE-2020-8286 CVE-2021-22876 CVE-2021-22890 CVE-2021-22897 CVE-2021-22898 CVE-2021-22901 CVE-2021-22922 CVE-2021-22923 CVE-2021-22925 CVE-2021-22926 * disable some new protocols and dependencies * remove curl-ios.patch.1 as the code no longer exists upstream Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119313 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 946f457c885bd10ff1a7281c351f3981f035f5a7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119262 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 020eb3b363a5c9444c97075a2e15b63ccbe7bf2d) Change-Id: I12d5f87f4d503a5f9859226a05cfe2a07e46d993 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119423 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* postgresql: upgrade to release 13.1Michael Stahl2021-04-091-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CVE-2020-25694, plus a bunch more CVE that don't look relevant. * --with-krb5 no longer exists, neither does --disable-shared * remove internal-zlib.patch.1: zlib is only used by pg_* tools / contrib/pgcrypto * remove postgresql-libs-leak.patch: some relic from pre-gbuild times, not clear what the point is for static libs * remove postgresql-9.2.1-libreoffice.patch: another dmake .mk file relic, and the win32 nmake build system was removed * add postgres-msvc-build.patch.1 to fix Cygwin perl and openssl * on WNT, libpq.dll is now built, no longer static lib postgresql: fix mistake in RepositoryExternal.mk Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109640 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 234833f7823a1424b62c93e145f0cfe2c6b6efd5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109698 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 1362bf7fa2957d34a7cef18dd95ede22cc42787f) Conflicts: download.lst Change-Id: Ic0232a28801b2f604d9f4e33d5621ae3362defaa
* openssl: update to 1.1.1gJan-Marek Glogowski2021-04-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | The OpenSSL 1.1.1 release is currently the only supported version and it already has the Windows Arm64 support I was looking for. This change also explicitly enables thread support, which Python depends on since release 3.7, which removed the --without-threads build option. But the explicit OPENSSL_THREADS was just added in 3.8.4, so the old no-threads build fails now and was wrong since probably much longer. Change-Id: I61d94f966bc59407f213f4a81f0a49d0c05f8948 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98435 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> Conflicts: download.lst external/openssl/UnpackedTarball_openssl.mk external/python3/ExternalProject_python3.mk external/python3/python-3.7.6-msvc-ssl.patch.1 Change-Id: If841be42cd5571e88ca765f101c742948fdb98f2
* pdfium: don't patch out the COMPONENT_BUILD check, define itMiklos Vajna2021-04-091-0/+1
| | | | | | | | | So next time we update, no need to adapt a failing patch. Change-Id: I785f16047d1decbf922177fdde4bc6aad7cfebfc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87215 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
* mariadb: upgrade to release 3.1.8Michael Stahl2021-04-091-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CVE-2018-3081 CVE-2020-2574 CVE-2020-2752 CVE-2020-2922 CVE-2020-13249 Remove obsolete patches: * mariadb-msvc.patch.1 * mariadb-swap.patch * mariadb-inline.patch.1 * mariadb-CONC-104.patch.1 Don't build anything from plugins/ in the hope that it's not needed. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96466 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit fe041bbc343ee08c6e901f63985d55a90da71c8b) mariadb: forgot to adapt flatpak-manifest.in mariadb: the "pvio_socket" plugin turns out to be important ... otherwise can't connect to a TCP socket. (regression from fe041bbc343ee08c6e901f63985d55a90da71c8b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96536 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 82a1650683df7d5c1769dfd68a26a4d071f1a546) Change-Id: I1c8633866b7108a8bb22dae0e0dd5f4a44bf5150 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96519 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 329c83c57989948d16b4e4d646607b93ee407a9e)
* Drop '-Wno-shadow' previously set for qt5/kde5Michael Weghorn2019-06-141-12/+0
| | | | | | | | | | | | | | | | | The flag has been introduced with commit 9335945c7cb215f387ed1444e28533fac437c6e8 ("KF5 initial VCL plugin") and was presumably just copy-pasted in commit 4d78cf97d7b1629556df68fc461922fda930d9ec. The flag should no longer be necessary now; the only issue showing up after removing the flag was fixed. Change-Id: I65fe4d12bdf7d5888b75f8a5743bab6979a63295 Reviewed-on: https://gerrit.libreoffice.org/73892 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 41a644dae966ecb958d1fe56cb14f3c091b0eceb) Reviewed-on: https://gerrit.libreoffice.org/73996
* build: support disabling popplerAshod Nakashian2019-03-071-0/+4
| | | | | | | | | | | | | This adds --enable-poppler configure option. Poppler can be enabled/disabled by setting this parameter to yes or no. Change-Id: I42ba2d27de7b5014d28523394310616d20073b71 Reviewed-on: https://gerrit.libreoffice.org/68602 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/68842 Tested-by: Jenkins
* Make LDAP support optionalAndrew Udvare2019-02-101-1/+2
| | | | | | | Change-Id: Ifbd3903494a81e7b155bf6468f6ca2c50b3370a4 Reviewed-on: https://gerrit.libreoffice.org/65958 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
* upload libcmis 0.5.2David Tardon2018-12-281-1/+1
| | | | | | | Change-Id: I0a7e888af770a332e2fec057507eecebf83621c4 Reviewed-on: https://gerrit.libreoffice.org/65646 Tested-by: Jenkins Reviewed-by: David Tardon <dtardon@redhat.com>
* kde5: remove older kde/tde plugins, and references to thatThorsten Behrens2018-12-171-27/+0
| | | | | | | | | | KDE4 is out of maintenance upstream since Nov. 2014, and binaries provided by TDF have switched to KDE5 as the official backend. Change-Id: I165465b56d3ba3a18912b203c06ae8fc6111c0c9 Reviewed-on: https://gerrit.libreoffice.org/60014 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* Fix typo in codeAndrea Gelmini2018-12-091-1/+1
| | | | | | | Change-Id: I766d68b8e79c500aedc1741dedf662663851ffc9 Reviewed-on: https://gerrit.libreoffice.org/64742 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
* external/harfbuzz's libharfbuzz.a links against icuuc libraryStephan Bergmann2018-09-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | buovjaga reported on IRC that his build (implicitly --without-system-harfbuzz --without-system-icu) failed to link e.g. Library_vclplug_gtk3 due to harfbuzz missing symbols from ICU, like > /usr/bin/ld: /home/user/libreoffice/workdir/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a(libharfbuzz_la-hb-icu.o): in function `hb_icu_unicode_decompose_compatibility(hb_unicode_funcs_t*, unsigned int, unsigned int*, void*)': > /home/user/libreoffice/workdir/UnpackedTarball/harfbuzz/src/hb-icu.cc:334: undefined reference to `unorm2_getNFKDInstance_62' [...] It is not clear to me why Library_vclplug_gtk3 would actually use libharfbuzz.a's hb_icu_unicode_decompose_compatibility (and for e.g. my builds, it apparently doesn't), but in general libharfbuzz.a does depend on some symbols from icuuc, so it is correct to add icuuc to the link when linking against harfbuzz. (And "gb_LinkTarget_use_external,...,icuuc" conveniently only adds libs for linking, and does not add C/C++ include file paths, which would not be wanted here.) (<https://gerrit.libreoffice.org/#/c/60882/> "Revert 'Add more more dependencies to VCL makefiles'" was a false start trying to address the above issue.) Change-Id: Ic8bcfa2aab185f8a9487d7787b4f22068e7cb481 Reviewed-on: https://gerrit.libreoffice.org/60898 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* Update orcus to 0.14.0.Kohei Yoshida2018-09-011-2/+2
| | | | | | | | | And make all necessary adjustments for the new version of orcus. Change-Id: I0dc207162a3ddfaad6da198a3d13b65f530757d5 Reviewed-on: https://gerrit.libreoffice.org/59884 Tested-by: Jenkins Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
* RepositoryExternal: mariadb needs iconv on MacOSMichael Stahl2018-08-301-0/+5
| | | | Change-Id: I78928baab2ea3accfdd7db62240e39e486c2f52c
* rename ENABLE_HEADLESS option to DISABLE_GUINoel Grandin2018-08-271-1/+1
| | | | | | | | | | since it has nothing to do with the headless command line option, so use the name it has in the configure.ac file Change-Id: Ibf0615ed02695d6e48a797f5632e4f417c010c70 Reviewed-on: https://gerrit.libreoffice.org/59611 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* drop unnecessary SYSTEM_MYSQL_CONNECTOR_CPPCaolán McNamara2018-08-261-37/+0
| | | | | | | Change-Id: I41cfbf41247270d29e08e5125adc05aac198b175 Reviewed-on: https://gerrit.libreoffice.org/59608 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* Moving mysqlc into connectivity as a libraryTamas Bunth2018-08-241-1/+4
| | | | | | | | | | | | | | 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>
* tdf#118261 package libnumbertext data files into installation setsChristian Lohmaier2018-08-221-0/+4
| | | | | | | Change-Id: I1d4bfc9de274df2b467614fba7639e7f5a653377 Reviewed-on: https://gerrit.libreoffice.org/59421 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
* tdf#112343 Change dependency from dbus-glib to dbusArkadiy Illarionov2018-08-081-1/+1
| | | | | | | | | | | Add check for GLib support for modules which depends on dbus and glib separately. Also fix copy-paste typo. Change-Id: Ibd33573b2f8dff9e0a7f2e0fc983d93878bb5357 Reviewed-on: https://gerrit.libreoffice.org/57157 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* poppler: upgrade to release 0.66.0Michael Stahl2018-06-211-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Fix dependencies for CppunitTest_svl_qa_cppunit.mkMike Kaganski2018-05-171-1/+1
| | | | | | | | | Change-Id: I391ea52f5137975073a674ac1ad380277fe99846 Reviewed-on: https://gerrit.libreoffice.org/54381 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Rene Engelhard <rene@debian.org> Tested-by: Rene Engelhard <rene@debian.org> Tested-by: Jenkins <ci@libreoffice.org>
* workdir/UnpackedTarball/libnumbertext/src/config.h is generatedStephan Bergmann2018-05-041-1/+1
| | | | | | | | ...from workdir/UnpackedTarball/libnumbertext/src/config.h.in, and included via lingucomponent/source/numbertext/numbertext.cxx -> workdir/UnpackedTarball/libnumbertext/src/Numbertext.hxx Change-Id: Idd007cf230b0c297c6dd692b1565336209a73ba8
* tdf#117171 support localized number name numbering stylesLászló Németh2018-05-031-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | in page number, chapter and outline numbering in ~30 languages by integrating libnumbertext library. - offapi: add linguistic2::NumberText New NumberingType constants: - ordinal indicators (1st, 2nd, 3rd...) - cardinal number names (One, Two, Three...) - ordinal number names (First, Second, Third...) Note: these numberings are parts of OOXML, too. Plain text files of Libnumbertext's language data are installed in share/numbertext (similar to share/fingerprint), allowing further customization. Change-Id: I4034da0a40a8c926f14a3f591749a89a8d807d5a Reviewed-on: https://gerrit.libreoffice.org/53313 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: László Németh <nemeth@numbertext.org>
* Install UCRT from MSUs, not using nested VC Redist installMike Kaganski2018-04-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Change-Id: I1529356fdcc67ff24b232c01ddf8bb3a31bb00bd Reviewed-on: https://gerrit.libreoffice.org/52923 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
* Revert "Remove dead HSQLDB driver"Sophia Schröder2018-04-121-0/+47
| | | | | | | | | | | | | | | We cannot silently convert user data or their used file formats and then await them to accept it or reinstall an older version. Let us make a soft change instead of an hard (heart) break and avoid us to been attacked with fire and forks from our users. This reverts commit 8d381ae8d6c742a7e15bf7ad9e07b65f81728ef6. Change-Id: Ia153640935e355771acb85cf652f8fe4c21fafbb Reviewed-on: https://gerrit.libreoffice.org/52731 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Bunth <btomi96@gmail.com>
* Remove dead HSQLDB driverTamas Bunth2018-04-101-47/+0
| | | | | | | Change-Id: Id4cfb69079f0150c9cca2626c16df7fab441d916 Reviewed-on: https://gerrit.libreoffice.org/52611 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Bunth <btomi96@gmail.com>
* Improve gpgmepp -> libassuan/libgpg-error lib dependenciesStephan Bergmann2018-03-081-11/+0
| | | | | | | | | ...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>
* Probably better to comment on these dependenciesStephan Bergmann2018-03-081-0/+3
| | | | | | ...added with f23651ff10da2d4bbbc47d0152b5cc321c29f0d1 "Missing dependencies" Change-Id: I4cd02fc8b242b3a3737305546bf3155425614d65
* Missing dependenciesStephan Bergmann2018-03-071-0/+8
| | | | | | | Change-Id: Iabdc81c9df2cc50ec4f4713af42d2fb9c3cc1f43 Reviewed-on: https://gerrit.libreoffice.org/50915 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* Build external lxml if not provided by systemSamuel Thibault2018-02-281-0/+1
| | | | | | | | | | | | except on windows, where gla11y will resort to python's internal xml parser, which does not provide line numbers. This allows gla11y to be runnable on all systems. Change-Id: Ica4eb90f59bddfcefd783fc2ed9c8c27357e7572 Reviewed-on: https://gerrit.libreoffice.org/50115 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* tdf#114635: Add TWAINDSM.DLL to 64-bit Windows packageMike Kaganski2018-02-031-2/+8
| | | | | | | | | | | | | | | | | | | This patch allows us to use our own bundled TWAINDSM.dll (from twain-dsm project, http://www.twain.org, https://github.com/twain/twain-dsm) on 64-bit Windows systems that don't have their own TWAIN DLL, and without requiring users to install it from some other source. The DLL is put into INSTALLOCATION/program along soffice.bin. Of course, TWAIN sources still need to be 64-bit themselves (i.e., true 64-bit TWAIN drivers required) to be usable by 64-bit program. Also this drops external/twain/inc/twain/twain.h, which is an old version copied from twain-dsm, and instead uses the tarball to get the header (required by Library_scn on both 32- and 64-bit Windows). Change-Id: I191027f3221ce46db17f50db91c9cb9315900810 Reviewed-on: https://gerrit.libreoffice.org/46992 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
* Extend build system to support linking against KDE Frameworks 5Milian Wolff2018-01-231-0/+35
| | | | | | | | | | | | Pass --enable-kde5 to autogen.sh to enable this feature. Then add kde5 to the list of externals to link against KF5. I will introduce other code that depends on KF5 though which will leverage this feature. Change-Id: I17e434a53ac769000b0f805b1f41cdc5c2c84ee2 Reviewed-on: https://gerrit.libreoffice.org/47715 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* fix libxml2 dependency on icuMichael Stahl2018-01-191-1/+1
| | | | | | | liblangtag build runs a "reg2xml.exe" which requires the ICU dlls in instdir. Change-Id: Icf44c51e802636de613f76a25fb16a567a8d982d
* tdf#108580: integrate vc_redist.exe into MSIMike Kaganski2017-12-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... in InstallUISequense. Use --with-vcredist-dir to point to a directory with vc_redist.x64.exe and/or vc_redist.x86.exe. Use --without-vcredist-dir (or --with-vcredist-dir=no) if you don't want to ship it as part of installer and want to silence the configure warning. VCRedist 2015 version 14.0.24215.1 is available at https://www.microsoft.com/en-us/download/details.aspx?id=53840 Since VisualStudio 2015, VC redist merge module that we used before started to work differently: it installs the UCRT only on WinXP, but not on later OSes (Vista to 8.1) which may lack the UCRT (Win10 has it out of the box). The merge module only installs VCRuntime on those systems, which still leaves us with "api-ms-*.dll is missing" problem. (https://blogs.msdn.microsoft.com/vcblog/2015/03/03/introducing-the-universal-crt/ gives more information on VCRedist refactoring background.) Since commit 71d9a61302e65fe091cf70c13fa72b3df09b7e3a, we use a workaround described at the page mentioned above as "App-local deployment of the Universal CRT". We just copy all UCRT DLLs to LibreOffice/program. This has a drawback though, that our UCRT is not updated by Windows Update, so users would rely on LibreOffice updates in case of some vulnerabilities in UCRT (and they could even not realize they have that problem). MS recommends to install UCRT using EXEs they provide from their site. The EXEs install both VCRuntimes and UCRTs, along with required patches, for all Windows versions (Windows XP through Windows 10, where they only install VCRuntimes); the installed libraries are managed by system's update mechanism. But those EXEs cannot be used in MSI custom actions inside InstallExecuteSequence, because they use MSI themselves. So this patch integrates the vc_redist.xXX.exe into MSI binary table, and uses custom action to run the EXE after ExecuteAction in InstallUISequence. This will show the user a VCRedist install window after the main LibreOffice installation finishes; no user interaction is required (except for one additional UAC request), and errors are ignored. Since this installation takes care of both VCRuntime and UCRT, we can ultimately drop both the app-local workaround, and vcredist merge module (so VCRuntime would also be updated by system). The former is done here: this reverts commit 71d9a61302e65fe091cf70c13fa72b3df09b7e3a. This approach has its drawback: if one wants to use unattended installation (without UI; one example is deployment using ActiveDirectory GPO), then InstallUISequence is not run, and so VCRedist isn't installed. In this case, one should install VCRedist separately. Supposedly this should not be huge problem, because this is the case for many existing applications that need separate VCRedist deployment in these scenarios, and unattended installation is advanced stuff that requires prepared user. A notice would be required in release notes and FAQ, though. Change-Id: Ia6a16be60af8a08f41ea7c3dbd457d8f89006006 Reviewed-on: https://gerrit.libreoffice.org/46356 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
* external: upload libepubgen-0.1.0Miklos Vajna2017-12-141-1/+1
| | | | | | | | | | | The only change is that version support is now available unconditionally, otherwise most code changes were bundled already in the form of patches. Change-Id: I0e456d85c9d84002cabcd77b31b02c9a7ad16ac5 Reviewed-on: https://gerrit.libreoffice.org/46386 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
* fix fuzzer buildCaolán McNamara2017-12-081-0/+3
| | | | | | | | Change-Id: I87933b78126ffbf29999f4d17b212df21560bdbd Reviewed-on: https://gerrit.libreoffice.org/46080 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* move conditional stuff to RepositoryExternal.mkDavid Tardon2017-11-261-0/+14
| | | | | | | Change-Id: I33e299277c53e8e2b8ab7e4cdf52d2487f90b51b Reviewed-on: https://gerrit.libreoffice.org/45211 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
* gpgme: fix buildThorsten Behrens2017-11-241-1/+1
| | | | Change-Id: I89170e90ea7fdd5b159a952fb0b2b1b4d0ae9204
* fix build: use same conditional as in configureThorsten Behrens2017-11-231-1/+1
| | | | Change-Id: I2383baaafbb5f79e1469a6296f3d65f1eadfa5eb
* gpg4libre: package gpgme spawn helper for WindowsThorsten Behrens2017-11-231-0/+4
| | | | | | | | Change-Id: If8dbe10b87d329fab3639392f6c352bce75c54c1 Reviewed-on: https://gerrit.libreoffice.org/45127 Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* gpg4libre: cleanup gpgme & add gbuild lib for gpgmeppThorsten Behrens2017-11-221-7/+60
| | | | | | | | | | | | | | | This moves the external to gpgmepp, since that's what we _actually_ link against; plus tons of enablement for Windows build, mostly related to linker probs integration. There's still no good way to build a DLL with autotools, so we fall back to gbuild manual make, see also tdf#91480 Change-Id: Ifd8217ef58536612d2389d48e343db133a13fb9c Reviewed-on: https://gerrit.libreoffice.org/44970 Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* Updated liborcus to 0.13.1.Kohei Yoshida2017-11-181-2/+2
| | | | | | | Change-Id: Id5aa07f87603879fe7a21dc96cad207f1b168286 Reviewed-on: https://gerrit.libreoffice.org/44850 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
* QT5 rename from KF5Jan-Marek Glogowski2017-11-061-9/+9
| | | | | | | | Move out of unx, as this will eventually compile on other OS platforms. At least currently it doesn't contain platform dependant code. Change-Id: Iea0bebf574201881ea158381fe7ba8af2a9a6488
* KF5 initial VCL pluginJan-Marek Glogowski2017-11-061-0/+31
| | | | | | | Something that compiles, basically just interface stubs. All used Svp classes don't use any cairo. Change-Id: I9a8858c930989438cc2a3f3346c01a7abc579d62
* related: tdf#103884 remove gltf/collada featureThorsten Behrens2017-10-301-105/+0
| | | | | | | Change-Id: Icd26ad96c0337844ef1463dabfbe791caa00dd2d Reviewed-on: https://gerrit.libreoffice.org/43972 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* RepositoryExternal.mk: fix inverted gpg conditionMichael Stahl2017-10-261-1/+1
| | | | | | (regression from 16598d526e9cc79698152daa5acc1e2718da933c) Change-Id: Ic621979926a9629aa8d8fb95a80957850ae0661b
* gpg4libre: enable OpenPGP support for MacThorsten Behrens2017-10-261-1/+1
| | | | | | | | Change-Id: Iad7d6b045be90efb32da3ffb1c19753b58b1753d Reviewed-on: https://gerrit.libreoffice.org/43616 Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* curl: upgrade to release 7.56.1Michael Stahl2017-10-241-1/+1
| | | | | | | | | | | | | | | - fixes a very minor CVE: CVE-2017-1000254 - the Windows nmakefiles we were previously using have been removed, so we use the *other* Windows nmake build system now - /EHs override is pointless, default /EHsc should work fine - the macros defined in ExternalProject are not needed any more - curl-msvc-schannel.patch.1: drop, not needed with new makefiles - curl-osx.patch.1: none of it applies, presumably fixed upstream Change-Id: I15c71b9c82c31d286d935b57543a1b0216123b66 Reviewed-on: https://gerrit.libreoffice.org/43724 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
* consistent naming of externals: mysqlcppconn -> mysql-connector-cppMichael Stahl2017-09-151-6/+6
| | | | | | | Change-Id: Ibfb3aa69895eef6023c38e2ff3b7ae98a05f5820 Reviewed-on: https://gerrit.libreoffice.org/42300 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
* consistent naming of externals: xslt -> libxsltMichael Stahl2017-09-151-11/+11
| | | | | | | Change-Id: Ie66848187cef395d8b0af4727a4d9c0919e3c9dc Reviewed-on: https://gerrit.libreoffice.org/42299 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>