summaryrefslogtreecommitdiff
path: root/RepositoryExternal.mk
AgeCommit message (Collapse)AuthorFilesLines
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>
2017-10-26RepositoryExternal.mk: fix inverted gpg conditionMichael Stahl1-1/+1
(regression from 16598d526e9cc79698152daa5acc1e2718da933c) Change-Id: Ic621979926a9629aa8d8fb95a80957850ae0661b
2017-10-26gpg4libre: enable OpenPGP support for MacThorsten Behrens1-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>
2017-10-24curl: upgrade to release 7.56.1Michael Stahl1-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>
2017-09-15consistent naming of externals: mysqlcppconn -> mysql-connector-cppMichael Stahl1-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>
2017-09-15consistent naming of externals: xslt -> libxsltMichael Stahl1-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>
2017-09-15consistent naming of externals: xml2 -> libxml2Michael Stahl1-6/+6
Change-Id: Ia1164c70d02dce70cb346c1fd4033f12d91c6e5d Reviewed-on: https://gerrit.libreoffice.org/42297 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-09-15consistent naming of externals: png -> libpngMichael Stahl1-6/+6
Change-Id: I82d95e74318600b390d5add716773c658817e504 Reviewed-on: https://gerrit.libreoffice.org/42296 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-09-15consistent naming of externals: libmariadb -> mariadb-connector-cMichael Stahl1-10/+10
The used version is actually named mariadb_client but since 2.1.0 upstream calls it MariaDB Connector/C. Change-Id: I51b12a9be55151919585dec91a5fc802ff4fc86b Reviewed-on: https://gerrit.libreoffice.org/42295 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-09-15consistent naming of externals: langtag -> liblangtagMichael Stahl1-2/+2
Change-Id: Iba391f4f0e3c496442b8acaff443319fcb8fb3d7 Reviewed-on: https://gerrit.libreoffice.org/42294 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-09-15consistent naming of externals: exttextcat -> libexttextcatMichael Stahl1-4/+4
Change-Id: Ia70782713fee251deeea5580961219938cfe8b89 Reviewed-on: https://gerrit.libreoffice.org/42293 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-09-15consistent naming of externals: cmis -> libcmisMichael Stahl1-9/+9
Change-Id: If710b416111dd26a67693d9f6d7d194ea607069b Reviewed-on: https://gerrit.libreoffice.org/42292 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-09-15consistent naming of externals: jpeg-turbo->libjpeg-turboMichael Stahl1-9/+9
Change-Id: I63fcebc36559c2698bbedd3501285a388ce8c257 Reviewed-on: https://gerrit.libreoffice.org/42291 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-08-28integrate libqxpAleksas Pantechovskis1-0/+33
Change-Id: Ic7479b82d09c1e36d28267434a77bf4bc158adfa Reviewed-on: https://gerrit.libreoffice.org/41612 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2017-08-23Android: Enable HAVE_FEATURE_NSS and package the NSS libraries with apkGautam Prajapati1-8/+0
This commit enables HAVE_FEATURE_NSS for Android and fixes the svl/ vcl/ and xmlsecurity/ module to use NSS. xmlsecurity/ wasn't built for Android previously, this commit enables building xmlsecurity/ for Android and disables the support of gpgme in the same module(Only for Android). It also enables the linking of NSS shared libraries with liblo-native-code.so and adds a rule to package them along with the apk. Change-Id: I7d0341688ac979ae92e9145c37dd107670417fe1 Reviewed-on: https://gerrit.libreoffice.org/41308 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-08-11Revert "Build with kde5, first stab"Katarina Behrens1-33/+0
this was meant to go to a feature branch *sigh it must be Friday
2017-08-11Build with kde5, first stabKatarina Behrens1-0/+33
this is largely based on jmux's work Change-Id: I5897f3ecb90f83a29e0824bfe7a0ea875347e360
2017-08-02external: bundle libepubgenMiklos Vajna1-0/+31
And backport a post-release fix that fixes the Windows build. EPUBExportFilter in writerperfect will want to use this. Change-Id: I020cd2abfd0daa731f4079320b18a6d857874278 Reviewed-on: https://gerrit.libreoffice.org/40679 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-07-21migrate to boost::gettextCaolán McNamara1-2/+1
* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl * all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string") * ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching MODULE .mo files * UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui goes from l10n target to normal one, so the res/lang.zips of UI files go away * translation via Translation::get(hrc-define-key, imbued-std::locale) * python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there to keep finding the .hrc file uniform) so magic numbers can go away there * java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation mechanism * en-US res files go away, their strings are now the .hrc keys in the source code * remaining .res files are replaced by .mo files * in .res/.ui-lang-zip files, the old scheme missing translations of strings results in inserting the english original so something can be found, now the standard fallback of using the english original from the source key is used, so partial translations shrink dramatically in size * extract .hrc strings with hrcex which backs onto xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap * extract .ui strings with uiex which backs onto xgettext --add-comments --no-wrap * qtz for gettext translations is generated at runtime as ascii-ified crc32 of content + "|" + msgid * [API CHANGE] remove deprecated binary .res resouce loader related uno apis com::sun::star::resource::OfficeResourceLoader com::sun::star::resource::XResourceBundleLoader com::sun::star::resource::XResourceBundle when translating strings via uno apis com.sun.star.resource.StringResourceWithLocation can continue to be used Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
2017-06-22xmlsecurity: implement support for building against system-xmlsecMiklos Vajna1-0/+28
The only remaining difference is that in the system-xmlsec case we work with the default key manager, not with the one that's only added by our xmlsec patches. This works for me for the uses I know of (see <https://lists.freedesktop.org/archives/libreoffice/2017-February/076947.html> for the motivation): signing and verifying of different signatures (bad signature, good with non-trusted CA, good with trusted CA) with software-based certificates all behave as expected. Change-Id: If3f3e2b8373ab7397db3f98070a5a2ce51fa7c06 Reviewed-on: https://gerrit.libreoffice.org/39075 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-06-13remove TDE integration (vclplug, address book, config backend)Michael Stahl1-22/+0
It has ~no users, can't even be built on modern Linuxes, and it annoys folks who want to refactor VCL. Per ESC decision from 2017-06-08, remove --enable-tde and --enable-tdeab. Change-Id: I51ce4786f29f8fcac2e2bb2a654c41fbfbbd8afd Reviewed-on: https://gerrit.libreoffice.org/38718 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-04-28build boost::locale libraryCaolán McNamara1-0/+13
Change-Id: I40b89a0df483645fc743fb092d3d39ea682c510c Reviewed-on: https://gerrit.libreoffice.org/37060 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-04-21gbuild: Remove MSVC 2013 legacy codeDavid Ostrovsky1-1/+1
Uwinapi is discontinued. Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01 Reviewed-on: https://gerrit.libreoffice.org/23198 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: David Ostrovsky <david@ostrovsky.org>
2017-04-14remove the old collaboration feature based on telepathyMarkus Mohrhard1-20/+0
Change-Id: I1f08d6ef43b76e7bae41ac33bb954f506ae7c485 Reviewed-on: https://gerrit.libreoffice.org/36542 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-03-26Package gpgme only for Linux currentlyThorsten Behrens1-0/+4
Change-Id: Ie7323c59f0183c8e132127694e9e865de494c7a3
2017-03-26Fix gpgme packagingThorsten Behrens1-1/+1
Change-Id: I26ef55b8a7a210f9d86becd4f0aa10c2598681fd
2017-03-25gpg4libre: actually package the gpgme libsThorsten Behrens1-0/+6
Change-Id: Ibcfc7946210d64450e8d0ce3b53461c6270cc473 Reviewed-on: https://gerrit.libreoffice.org/35674 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-03-15just use turbo-jpeg as sole internal solutionCaolán McNamara1-20/+1
prefer having nasm/yasm but if its not there warn and fallback to disabling assembler optional goodness Change-Id: Ib31ad81717842f743c2910d575a9ebbc279a9c79 Reviewed-on: https://gerrit.libreoffice.org/35189 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-03-10gpgme: change gb_LinkTarget__use_gpgmepp to depend on packageMichael Stahl1-1/+1
This replaces f764d67da42caa71fd5e02146b1ca32680ae2f6e with a better fix, no point in littering the makefiles with manual dependencies when we can just avoid the problem in one place with a tiny performance cost. Change-Id: Ic7e91ee4c99deb12a9544cf691c0995de6ae2bad
2017-03-09RepositoryExternal: fix MSVC 2017 python3 library directoryMichael Stahl1-1/+1
Change-Id: I74514993ca1cbeb1a7e7bf1ba121b28ce9dab2f3
2017-03-06don't try to install pdfium lib in --disable-pdfiumRene Engelhard1-0/+2
Change-Id: I77f2ab2b627ceee2d6b0d44e530b4ac691510bf3
2017-03-05workdir/UnpackedTarball/gpgme/src/gpgme.h is generatedStephan Bergmann1-1/+1
...from workdir/UnpackedTarball/gpgme/src/gpgme.h.in Change-Id: I1fc1871f9fa1da14f209b3b2902eb2be3a680d56
2017-02-27gpg4libre: Add libgpg-error to include pathSamuel Mehrbrodt1-0/+1
Change-Id: I7e87b2ecc107c91f9fcb9f385a8cace65776fc25 Reviewed-on: https://gerrit.libreoffice.org/34622 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2017-02-24Always enable liblangtagKhaled Hosny1-7/+0
The license should not be an issue any more since liblangtag now has an LGPL/MPLv2 dual licence. Change-Id: I4dfffcccf5d710bd16b21c3254c1449ae041b8ab Reviewed-on: https://gerrit.libreoffice.org/34511 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2017-02-24gpg4libre: include also plain C headers from internal gpgmeKatarina Behrens1-0/+1
Change-Id: Iddae7a3e664273b53a49450527f55814a9ef6f55 Reviewed-on: https://gerrit.libreoffice.org/34610 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2017-02-23gpg4libre: Fix build by s/gpgme/gpgmepp/ on multiple placesKatarina Behrens1-4/+4
let's see if it appeases the tinderboxes Change-Id: Icfe97381395f5554d51cfb52289b3de89abbbb68 Reviewed-on: https://gerrit.libreoffice.org/34569 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 13:17:33 +0000