summaryrefslogtreecommitdiff
path: root/RepositoryExternal.mk
AgeCommit message (Collapse)AuthorFilesLines
2020-01-13python3: bundle libffi for GNU/Linux buildsMichael Stahl1-0/+6
CPython commit f40d4ddff3c800b3c956a5e8820aabe3aa87cddd "Closes #27979: Remove bundled copy of libffi" causes a bit of a problem because it turns out that libffi isn't all that stable; there's libffi.so.5 on CentOS 6, libffi.so.6 on CentOS 7 and libffi.so.7 on lo_daily_update_gandalf tinderbox. So we have to bundle it in LO; it's only used on GNU/Linux currently. CPython commit 32119e10b792ad7ee4e5f951a2d89ddbaf111cc5 "bpo-35947: Update Windows to the current version of libffi (GH-11797)" also removes the libffi for MSVC, so in a future python upgrade we will have to build libffi for MSVC too. The libffi fork for MacOSX is still in CPython git master. (regression from b10be5d48433076f0b7238d818020f708553e114) Change-Id: Ibc20cf8cd3614cf9941b6970662bd930496776b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86493 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 79084665f0e351a3f83fdee88071919f05ec9cc3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86500 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2019-10-22Missing test dependencyStephan Bergmann1-1/+1
Noticed when executing CppunitTest_sccomp_solver that it apparently depended on ExternalProject_lpsolve but not on ExternalPackage_lpsolve. (LpSolverTest::testLpSolver in sccomp/qa/unit/solver.cxx instantiates UNO service com.sun.star.comp.Calc.LpsolveSolver in Library_solver, which uses lpsolve as an external.) Thanks to mst for showing me the right place to fix. Change-Id: I71a1c3552473ff6fea616805eea1fb68143d255b Reviewed-on: https://gerrit.libreoffice.org/81133 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-10-01gbuild: treat $(DCONF_CFLAGS) as includes, not definesMichael Weghorn1-1/+5
Since that variable holds the relevant includes, using 'gb_LinkTarget_set_include' makes sure that those flags end up in the correct section, e.g. when generating IDE integration using 'gbuild-to-ide', and thus prevents issues like that described in 4aa60490622cc10f8d3a31489c62a5622d240c83 ("gbuild: treat $({QT,KF}5_CFLAGS) as cxxflags, not defines"). (Value of 'DCONF_CFLAGS' variable on Debian testing with 'libdconf-dev' 0.34.0-1 is: DCONF_CFLAGS=-pthread -I/usr/include/dconf -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include ) Change-Id: I74c5194d88838bffa2b8515372266336627f235c Reviewed-on: https://gerrit.libreoffice.org/79874 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2019-09-30drop gtk2 supportCaolán McNamara1-28/+0
Change-Id: Ie838cabfecfef7e3225c1555536d5c9cf3b43f15 Reviewed-on: https://gerrit.libreoffice.org/77405 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-08-15Switch mdds to 1.5.0 and liborcus to 0.15.0.Kohei Yoshida1-2/+2
Change-Id: Ibff9a5e0f0771e4cf12b4dc3985661a01195e265 Reviewed-on: https://gerrit.libreoffice.org/77482 Tested-by: Jenkins Reviewed-by: Kohei Yoshida <kohei@libreoffice.org>
2019-07-25external qrcodegen looks under qrcodegenCaolán McNamara1-2/+3
Change-Id: I01f06c30a52f5e4cdb5b4b6304072aa0f3a63aa8 Reviewed-on: https://gerrit.libreoffice.org/76291 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-25QRCode Dialog Box featureShubham Goyal1-1/+1
The patch handles the created QR code as a Customized Shape (Graphic Object) Change-Id: I1cee6f0e7fac585de880a9ac34e3bc441a4b7390 Reviewed-on: https://gerrit.libreoffice.org/74167 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-07-21tdf#125922 rename kde5 to kf5 + plasma5Jan-Marek Glogowski1-5/+5
Just as the gtk3 plugin isn't named GNOME, rename kde5 to kf5, as it is based on the KDE frameworks 5 libraries. This also includes: * a convenience alias to load the kf5 VCL plugin in case someone requests the kde5 plugin. * keep convenience kde5 configure switch, but warn about it * rename detected desktop from kde5 to plasma5 Change-Id: I6764a05b81a5edbf284484c234fee2649aacf735 Reviewed-on: https://gerrit.libreoffice.org/75313 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2019-07-02bundle external: qrcodegenShubham Goyal1-0/+34
The bundle helps to generate QR code in LO. Change-Id: Iaa9225a72d15806c929d30951cefd3f3fee8960e Reviewed-on: https://gerrit.libreoffice.org/73302 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-13Drop '-Wno-shadow' previously set for qt5/kde5Michael Weghorn1-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>
2019-06-08gbuild: treat $({QT,KF}5_CFLAGS) as cxxflags, not definesMichael Weghorn1-1/+1
Treat all of QT5_CFLAGS, QT5_GLIB_CFLAGS and KF5_CFLAGS as C++ flags, since those contain C++ flags in the first place. Therefore, set them using 'gb_Library_add_cxxflags', not 'gb_Library_add_defs'. (Strictly speaking, those variables contain includes as well, but handling that properly would require splitting this up further, either in 'configure.ac' or see e.g. how it's done in 'RepositoryExternal.mk'.) This also prevents the values of those variables from ending up in the wrong section in IDE integration generated by gbuild-to-ide. Handling them as includes previously resulted e.g. in 'vcl/vcl.pro' (generated by 'make qtcreator-ide-integration') containing DEFINES += BOOST_ALL_NO_LIB \ ... \ VCLPLUG_GTK3_KDE5_IMPLEMENTATION -isystem /usr/include//KF5 -isystem /usr/include//KF5/KCoreAddons [...] and Qt Creator would show a (rather unhelpful) warning like the following when opening a header file inside 'vcl/inc/': > Warning: The code model could not parse an included file, > which might lead to incorrect code completion and highlighting, > for, example. > > 4:9: error: macro name must be an identifier Change-Id: I2bb0c37fdf1112650e8adc712f60737888a8169b Reviewed-on: https://gerrit.libreoffice.org/73699 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2019-03-07build: support disabling popplerAshod Nakashian1-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
2019-02-10Make LDAP support optionalAndrew Udvare1-1/+2
Change-Id: Ifbd3903494a81e7b155bf6468f6ca2c50b3370a4 Reviewed-on: https://gerrit.libreoffice.org/65958 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2018-12-28upload libcmis 0.5.2David Tardon1-1/+1
Change-Id: I0a7e888af770a332e2fec057507eecebf83621c4 Reviewed-on: https://gerrit.libreoffice.org/65646 Tested-by: Jenkins Reviewed-by: David Tardon <dtardon@redhat.com>
2018-12-17kde5: remove older kde/tde plugins, and references to thatThorsten Behrens1-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>
2018-12-09Fix typo in codeAndrea Gelmini1-1/+1
Change-Id: I766d68b8e79c500aedc1741dedf662663851ffc9 Reviewed-on: https://gerrit.libreoffice.org/64742 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2018-09-22external/harfbuzz's libharfbuzz.a links against icuuc libraryStephan Bergmann1-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>
2018-09-01Update orcus to 0.14.0.Kohei Yoshida1-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>
2018-08-30RepositoryExternal: mariadb needs iconv on MacOSMichael Stahl1-0/+5
Change-Id: I78928baab2ea3accfdd7db62240e39e486c2f52c
2018-08-27rename ENABLE_HEADLESS option to DISABLE_GUINoel Grandin1-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>
2018-08-26drop unnecessary SYSTEM_MYSQL_CONNECTOR_CPPCaolán McNamara1-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>
2018-08-24Moving mysqlc into connectivity as a libraryTamas Bunth1-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>
2018-08-22tdf#118261 package libnumbertext data files into installation setsChristian Lohmaier1-0/+4
Change-Id: I1d4bfc9de274df2b467614fba7639e7f5a653377 Reviewed-on: https://gerrit.libreoffice.org/59421 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-08-08tdf#112343 Change dependency from dbus-glib to dbusArkadiy Illarionov1-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>
2018-06-21poppler: upgrade to release 0.66.0Michael Stahl1-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>
2018-05-17Fix dependencies for CppunitTest_svl_qa_cppunit.mkMike Kaganski1-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>
2018-05-04workdir/UnpackedTarball/libnumbertext/src/config.h is generatedStephan Bergmann1-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
2018-05-03tdf#117171 support localized number name numbering stylesLászló Németh1-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>
2018-04-25Install UCRT from MSUs, not using nested VC Redist installMike Kaganski1-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>
2018-04-12Revert "Remove dead HSQLDB driver"Sophia Schröder1-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>
2018-04-10Remove dead HSQLDB driverTamas Bunth1-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>
2018-03-08Improve gpgmepp -> libassuan/libgpg-error lib dependenciesStephan Bergmann1-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>
2018-03-08Probably better to comment on these dependenciesStephan Bergmann1-0/+3
...added with f23651ff10da2d4bbbc47d0152b5cc321c29f0d1 "Missing dependencies" Change-Id: I4cd02fc8b242b3a3737305546bf3155425614d65
2018-03-07Missing dependenciesStephan Bergmann1-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>
2018-02-28Build external lxml if not provided by systemSamuel Thibault1-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>
2018-02-03tdf#114635: Add TWAINDSM.DLL to 64-bit Windows packageMike Kaganski1-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>
2018-01-23Extend build system to support linking against KDE Frameworks 5Milian Wolff1-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>
2018-01-19fix libxml2 dependency on icuMichael Stahl1-1/+1
liblangtag build runs a "reg2xml.exe" which requires the ICU dlls in instdir. Change-Id: Icf44c51e802636de613f76a25fb16a567a8d982d
2017-12-18tdf#108580: integrate vc_redist.exe into MSIMike Kaganski1-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>
2017-12-14external: upload libepubgen-0.1.0Miklos Vajna1-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>
2017-12-08fix fuzzer buildCaolán McNamara1-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>
2017-11-26move conditional stuff to RepositoryExternal.mkDavid Tardon1-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>
2017-11-24gpgme: fix buildThorsten Behrens1-1/+1
Change-Id: I89170e90ea7fdd5b159a952fb0b2b1b4d0ae9204
2017-11-23fix build: use same conditional as in configureThorsten Behrens1-1/+1
Change-Id: I2383baaafbb5f79e1469a6296f3d65f1eadfa5eb
2017-11-23gpg4libre: package gpgme spawn helper for WindowsThorsten Behrens1-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>
2017-11-22gpg4libre: cleanup gpgme & add gbuild lib for gpgmeppThorsten Behrens1-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>
2017-11-18Updated liborcus to 0.13.1.Kohei Yoshida1-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>
2017-11-06QT5 rename from KF5Jan-Marek Glogowski1-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
2017-11-06KF5 initial VCL pluginJan-Marek Glogowski1-0/+31
Something that compiles, basically just interface stubs. All used Svp classes don't use any cairo. Change-Id: I9a8858c930989438cc2a3f3346c01a7abc579d62
2017-10-30related: tdf#103884 remove gltf/collada featureThorsten Behrens1-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>