summaryrefslogtreecommitdiffstats
path: root/RepositoryExternal.mk
Commit message (Collapse)AuthorAgeFilesLines
* curl: upgrade to release 7.78.0Michael Stahl2021-07-231-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 Change-Id: I12d5f87f4d503a5f9859226a05cfe2a07e46d993 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>
* tdf#140236 WIN install libffi with PythonJan-Marek Glogowski2021-02-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | Regression from commit b4dfba947768834ffecc09056992019878711c8b ("python3: update to 3.8.4"). Previous Python versions included the source for libffi on all platforms, but now just for MacOS. So now LO must build that DLL on Windows, which was done in commit 883068462fe5bcbb01a8e14736fc06d0c3695c62 ("libffi: build DLL on Windows"). Since OpenSSL is installed in the program directory and the LO Python directory, this currently works "accidentially". Not sure the Python OpenSSL DLLs should be handled via some extra gbuild package to separate both, but that can be done in an additional change. Change-Id: I4a42e39cc2f4434a9944aad32836f66ec2819931 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110537 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit fad7e203a25963128b9ce786d3fc465a32c238ce) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110553 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* postgresql: fix mistake in RepositoryExternal.mkMichael Stahl2021-01-221-4/+6
| | | | | | | | | | | | | | Apparently causes "ERROR: Source for postgresql.filelist not found!" on non-WNT. Change-Id: I79cf9074bc8e4948febe76fc963231c916a274cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109760 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins (cherry picked from commit 5e6e87f1556e484c4d4be7e3b01ef668ab602f3c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109745 Reviewed-by: Jean-Baptiste Faure <jbfaure@libreoffice.org> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* postgresql: upgrade to release 13.1Michael Stahl2021-01-211-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | 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 Change-Id: Ic0232a28801b2f604d9f4e33d5621ae3362defaa 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/+/109677 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* openssl_headers depends on generated opensslconf.hStephan Bergmann2021-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | ...at workdir/UnpackedTarball/openssl/include/openssl/opensslconf.h, as can be seen with failed builds like <https://ci.libreoffice.org//job/lo_tb_master_mac/35209>: [...] > [build PAT] openssl > [build C ] UnpackedTarball/mariadb-connector-c/plugins/auth/caching_sha2_pw.c > [build C ] UnpackedTarball/mariadb-connector-c/libmariadb/secure/openssl_crypt.c > [build DEP] LNK:Library/libclucene.dylib > [build LNK] Library/libclucene.dylib > In file included from /Users/tdf/lode/jenkins/workspace/lo_tb_master_mac/workdir/UnpackedTarball/mariadb-connector-c/libmariadb/secure/openssl_crypt.c:21: > /Users/tdf/lode/jenkins/workspace/lo_tb_master_mac/workdir/UnpackedTarball/openssl/include/openssl/evp.h:13:11: fatal error: 'openssl/opensslconf.h' file not found > # include <openssl/opensslconf.h> > ^~~~~~~~~~~~~~~~~~~~~~~ > 1 error generated. Change-Id: Ied1dcdd0afb6099e9218671c6a06c0edaafc931e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108928 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 0f7008e91f45cf8e3cee6f372ce012b38a795e26) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108911 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* pdfium: remove non-public headers from include pathMiklos Vajna2020-10-081-1/+0
| | | | | | | | | | This was only needed to use upstream scopers, but we don't use those anymore. Change-Id: Idac60119d4d4e8587170fe3e5c69b3ec069e6a6b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104069 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
* add an explicit --disable-qrcodegen configure optionCaolán McNamara2020-09-211-0/+9
| | | | | | | Change-Id: If8e965fa955aecdb9e7011bdddc690de9cad0c4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103120 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* python3: fix Windows Arm64 buildJan-Marek Glogowski2020-09-171-1/+8
| | | | | | | Change-Id: I2e9f9ca5fcf40a3ff53c036ebc51a75b882d91f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102854 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
* WIN add and apply default msbuild platform+configJan-Marek Glogowski2020-09-151-1/+1
| | | | | | | | | | | | | | | Adds three Windows gb_* variables: - gb_MSBUILD_CONFIG_AND_PLATFORM can be passed as msbuild flags - gb_MSBUILD_PLATFORM maps debug / release settings - gb_MSBUILD_CONFIG maps the CPUTYPE to the default msbuild names and converts the users in external projects. Change-Id: Ie9b817721180d78d104db11c44241e4b3e46bba9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102701 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
* Upgrade liborcus to 0.16.0.Kohei Yoshida2020-09-121-2/+2
| | | | | | | Change-Id: Iae29fb26417dfc161698a81bee84e81545969065 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102502 Tested-by: Jenkins Reviewed-by: Kohei Yoshida <kohei@libreoffice.org>
* Fix the minimal build-tools targetJan-Marek Glogowski2020-09-111-1/+1
| | | | | | | | | | | | | | | | | | The revert commits change the build-tools target for a DESKTOP build to build the complete LO. This restores the original, minimal one and also adds a whitelist of allowd build types. OpenCL needs a configure switch, as it's status is also stored in a config header, so preventing the build is not enough. This also reverts: - commit 802161a505272732566210e9ebbd8fe1b23fb86d - commit 02d931a59e2966d0c2736db8dee7be3e3dcd6bae Change-Id: Ibfcb0c54e72da1b7c2e63c082ea6586520a787fa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102480 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
* WIN drop --enable-64bit to select Windows targetJan-Marek Glogowski2020-09-111-1/+1
| | | | | | | | | | | | | | | | | | | This changes the Windows build to use the default configure switch to select the target / host of the compiled binaries to get the possibility to cross compile on Windows the "default" way. Note that selecting i686-pc-cygwin on x86_64 doesn't do a cross- compilation, as no special build tools are needed, because x86_64 can run x86 binaries just fine. A consequence of the change is the default target host, which is now the same then the build system, instead of the previous x86 default. Change-Id: I5584f34f665573ebac40d5d7753d96addeb84dbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102479 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
* gpgpmepp: fix creative abuse of gbuildMichael Stahl2020-08-051-4/+1
| | | | | | | | | | | | | | | | | | | The problem was that (cd sw && make CppunitTest_sw_ooxmlexport4) fails with an error that the gpgmepp package doesn't exist, but only on WNT. Nonobviously, this is due to the override of the rule for the gpgmepp package in ExternalPackage_gpgmepp.mk, which copies the same file that the package already depends on for no obvious reason. Furthermore, RepositoryExternal.mk uses gb_Helper_register_executables_for_install with gpgme-w32spawn, when it should just register the package instead, because that is not a gbuild Executable. Change-Id: I8cb8b7a68c9681844a39de1390aa736a1ec53449 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100159 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
* python3: update to 3.8.4Jan-Marek Glogowski2020-07-171-1/+1
| | | | | | | | | | | | | | | | | | | With all the prerequisites in place, LO can be updated to the current Python release. Interestingly I found that Cygwin always seems to use LC_COLLATE=C, probably because the default collation rules are missing. Then there are the changes introduced in "PEP 587 -- Python Initialization Configuration", which appearingly have modified the DLL search path behaviour on Windows, so the OpenSLL DLLs aren't found anymore in the program directory. As a workaround, the OpenSLL and libffi DLLs are now (also) installed into the Python lib dir on Windows. Change-Id: Ib82f7b77213da9c525f8c79a13d128d9eec9ca64 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98437 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
* openssl: update to 1.1.1gJan-Marek Glogowski2020-07-171-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>
* log properly the compiler used to compile SkiaLuboš Luňák2020-06-251-0/+1
| | | | | | | | | | | Using #define's directly from VCL will report the compiler used to compile VCL, which may be different from the one used for Skia. Also truncate the log file on opening. Change-Id: Iddf613613df20505f1abe1dd5468dcc8c7041410 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97090 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
* sd signature line: add testcaseMiklos Vajna2020-06-191-0/+1
| | | | | | | | | | Fails with commit 9b7a890fd59744459692d7f66402c6bdd25acec4 (sd signature line: include shape in the appearance widget, 2020-06-19) reverted. Change-Id: Ib237774374553af5d37c9deaffdea6fae65a28f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96737 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
* mariadb: upgrade to release 3.1.8Michael Stahl2020-06-161-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. Change-Id: I1c8633866b7108a8bb22dae0e0dd5f4a44bf5150 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96466 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* Drop configurability of libnumbertext useTor Lillqvist2020-06-111-12/+0
| | | | | | | | | | | | It was fairly pointless to be able to --disable-libnumbertext. Besides, disabling it broke the ordinal page (etc) numbering feature: "1st", "2nd", "3rd", etc showed up as "Ordinal-number 1", "Ordinal-number 2", "Ordinal-number 3" etc. Change-Id: I645169054a8fdc8dac89cd48b6c369fd61749467 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96119 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
* external: bundle box2dSarper Akdemir2020-05-171-0/+35
| | | | | | | | | | | Bundled box2d with the build system of LO as a static library. If --with-system-box2d was specified checks for instance box2d in the system, defines SYSTEM_BOX2D and uses the library from the system. Change-Id: Ifb05912f2acaff273b25abebafc5af1cac3afec4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94103 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* Missing gengal vclplug dependencies for macOS and WindowsStephan Bergmann2020-05-041-0/+2
| | | | | | | | | | | Building e.g. Gallery_backgrounds from scratch failed there with no suitable windowing system found, exiting. Change-Id: Icf2dd26441554e573914f371d0d5eb21e99f5f0f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93429 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* lxml: try to remove some quirky PYPATH stuffMichael Stahl2020-04-061-1/+0
| | | | | | | | | | | | | | | | | In RepositoryExternal.mk, a system python automatically gets $PYPATH added to $PYTHONPATH, but the internal one does not - this doesn't make sense. Try to remove it for system-case by fixing the one case that relies on it and for which it was introduced in commit 84ef6d82546b044990f4efd57e51e29c6c6565c8 to directly extend $PYTHONPATH instead, which ought to work as long as it's not evaluated at global scope and thereby avoids affecting all python invocations. Change-Id: I4534f2be92b850dc01193cb1bb2e0a299a5152be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91748 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
* implement text rendering using directly Skia (X11)Luboš Luňák2020-03-181-0/+1
| | | | | | | | | | | | | | | | The Cairo-based way reuses code that is used for OpenGL, but it's needlessly complicated, given that Skia itself is capable of text rendering as well. This requires a small patch for Skia so that it uses the FcPattern* we use for selecting a font. The rendering with this commit is usable, but visually the result is noticeably different, so this will need tweaks to the font rendering (TBD). Change-Id: I058c282307106c929ccc9faa7b2bddfabf0f0a2c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90580 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
* tdf#130725: use strtod by David M. Gay to make sure we get the nearestMike Kaganski2020-02-271-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... representation of given decimal. Use dtoa.c from https://www.netlib.org/fp/dtoa.c to build a custom static library that doesn't use current locale (unlike strtod from stdlib.h). This is the implementation used by e.g. python and nss (search for "dtoa.c" under UnpackedTarball). To avoid name clash with the standard strtod, rename the function to strtod_nolocale. Size of buffer on stack in ImpSvNumberInputScan::StringToDouble is 256 characters. Logging function usage in make check, of ~124 600 invocations, the longest string was 14 characters, average being 2.1 characters. So heap allocation is unlikely in scenarios with intensive function usage. After std::from_chars is available in baseline compilers, external library can be dropped, and call to strtod_nolocale replaced with the standard function. The artifact at https://dev-www.libreoffice.org/src/dtoa-20180411.tgz is created with mkdir dtoa && mkdir dtoa/src && wget https://www.netlib.org/fp/dtoa.c -O dtoa/src/dtoa.c && \ printf 'd8bab255476f39ea495c8c8ed164f9077da926e6ca7afb9ad3c56d337c4484fe dtoa/src/dtoa.c' | sha256sum -c && \ tar -c --owner=0 --group=0 --mode=go=r,u=rw --mtime='Wed, 11 Apr 2018 15:59:39 GMT' dtoa/src/dtoa.c | gzip -n > dtoa-20180411.tgz && \ printf '0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 dtoa-20180411.tgz' | sha256sum -c (where the date "Wed, 11 Apr 2018 15:59:39 GMT" is from `wget -S https://www.netlib.org/fp/dtoa.c` "Last-Modified: Wed, 11 Apr 2018 15:59:39 GMT" header). Change-Id: Ia61b7678e257c4bc1ff193f3f856d611aa5c1a21 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88854 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
* always define GLM_FORCE_CTOR_INIT when using glmCaolán McNamara2020-02-061-1/+10
| | | | | | | Change-Id: I2a4ed756c6d18937d2c720243652df7a2d629959 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88121 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* pdfium: don't patch out the COMPONENT_BUILD check, define itMiklos Vajna2020-01-231-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>
* python3: bundle libffi for GNU/Linux buildsMichael Stahl2020-01-091-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>
* make SkiaSalGraphicsImpl use GPU-backed SkSurface also for offscreenLuboš Luňák2019-11-271-0/+1
| | | | | | | | | | | | Skia's sk_app::WindowContext can create GPU-backed SkSurface only for windows, but we also use virtual devices that are not windows. Fortunately, SkSurface can be created GPU-backed from GrContext* and sk_gpu_test::GrContextFactory seems to provide it easily. It is not completely clear to me what the rules are on mixing SkSurface's with different GrContext* (see the comment in SkiaSalGraphicsImpl::copyBits()), but it seems to work fine. Change-Id: I8110b67c41ab092e0c4b6a0973d6bed8a408c4c1
* add SAL log group vcl.skia for tracing Skia usageLuboš Luňák2019-11-271-0/+1
| | | | Change-Id: Ife21bbe0b86c3edd20e657da09c6e218fa4fced3
* skia: implement invert operationTomaž Vajngerl2019-11-271-0/+1
| | | | Change-Id: I248518283ee6a4604bc45f36f2af3804a15f5652
* use the same config file for skia build and using itLuboš Luňák2019-11-271-5/+10
| | | | | | So that the setup is consistent. Change-Id: Ia113c7bf79036e3ec7585263ed70da68e461fbac
* initial empty Skia VCL implementationLuboš Luňák2019-11-271-0/+1
| | | | | | | This mostly duplicates OpenGL cases. Pretty much all implementation methods are empty. Change-Id: I333506f56dcc46c3e9405fe8194c172de17c54fd
* initial build of the Skia libraryLuboš Luňák2019-11-271-0/+14
| | | | | | | Not quite complete yet, missing e.g. Vulkan sources, and the setup is not completely correct either. Change-Id: I2283bf12f0d226ff8a34554deae5a7bd69045971
* Missing test dependencyStephan Bergmann2019-10-221-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>
* gbuild: treat $(DCONF_CFLAGS) as includes, not definesMichael Weghorn2019-10-011-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>
* drop gtk2 supportCaolán McNamara2019-09-301-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>
* Switch mdds to 1.5.0 and liborcus to 0.15.0.Kohei Yoshida2019-08-151-2/+2
| | | | | | | Change-Id: Ibff9a5e0f0771e4cf12b4dc3985661a01195e265 Reviewed-on: https://gerrit.libreoffice.org/77482 Tested-by: Jenkins Reviewed-by: Kohei Yoshida <kohei@libreoffice.org>
* external qrcodegen looks under qrcodegenCaolán McNamara2019-07-251-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>
* QRCode Dialog Box featureShubham Goyal2019-07-251-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>
* tdf#125922 rename kde5 to kf5 + plasma5Jan-Marek Glogowski2019-07-211-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>
* bundle external: qrcodegenShubham Goyal2019-07-021-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>
* Drop '-Wno-shadow' previously set for qt5/kde5Michael Weghorn2019-06-131-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>
* gbuild: treat $({QT,KF}5_CFLAGS) as cxxflags, not definesMichael Weghorn2019-06-081-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>
* 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>