Commit Graph

716 Commits

Author SHA1 Message Date
a4034d5681 Package gpgme only for Linux currently
Change-Id: Ie7323c59f0183c8e132127694e9e865de494c7a3
2017-03-26 05:57:39 +02:00
8724bcff1e Fix gpgme packaging
Change-Id: I26ef55b8a7a210f9d86becd4f0aa10c2598681fd
2017-03-26 04:02:14 +02:00
cc71c6adfd gpg4libre: actually package the gpgme libs
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-25 13:31:02 +00:00
ae96754446 just use turbo-jpeg as sole internal solution
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-15 11:47:02 +00:00
ee9cb85e9a gpgme: change gb_LinkTarget__use_gpgmepp to depend on package
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-10 17:13:47 +01:00
3e23beda17 RepositoryExternal: fix MSVC 2017 python3 library directory
Change-Id: I74514993ca1cbeb1a7e7bf1ba121b28ce9dab2f3
2017-03-09 22:07:58 +01:00
f05d8e3fa3 don't try to install pdfium lib in --disable-pdfium
Change-Id: I77f2ab2b627ceee2d6b0d44e530b4ac691510bf3
2017-03-06 18:52:33 +01:00
4149a30e7b workdir/UnpackedTarball/gpgme/src/gpgme.h is generated
...from workdir/UnpackedTarball/gpgme/src/gpgme.h.in

Change-Id: I1fc1871f9fa1da14f209b3b2902eb2be3a680d56
2017-03-05 12:02:58 +01:00
65866961cf gpg4libre: Add libgpg-error to include path
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-27 11:22:38 +00:00
8dc27a0bbf Always enable liblangtag
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-24 15:46:41 +00:00
6017732e0b gpg4libre: include also plain C headers from internal gpgme
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-24 13:31:53 +00:00
f41fa22311 gpg4libre: Fix build by s/gpgme/gpgmepp/ on multiple places
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>
2017-02-23 14:25:02 +00:00
aceba1e1af gpg4libre: We want to use C++ library instead
in particular, the one from gpgme project. configure check is set
up in such a way that it will fail with older gpgmepp that depends
on KDE development packages.

This means Linux distros released before 2016 have to rely upon
in-tree version, but such is life ...

Change-Id: I5cdceffad6e81643603fcdee57a7656218f76834
Reviewed-on: https://gerrit.libreoffice.org/34130
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-02-23 09:23:37 +00:00
684b9de16f gpg4libre: Fix linking against internal gpgmepp
including headers still broken

Change-Id: Id631c978d820046db880ff8035158200dcb8951b
Reviewed-on: https://gerrit.libreoffice.org/34343
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
2017-02-17 13:13:51 +00:00
dc003d59ea gpg4libre: fix gpgme build dependencies
Change-Id: If71b144f008e35ee248421d922ab2a1a4463d093
Reviewed-on: https://gerrit.libreoffice.org/34361
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-02-17 09:58:14 +00:00
55519a18be gpg4libre: gbuild funcs for building with internal gpgme(pp)
Change-Id: I12b57b8925c263ec904549ea38a2c581f20b9d14
Reviewed-on: https://gerrit.libreoffice.org/34301
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-02-16 12:51:56 +00:00
8646ab97dc Remove MinGW support
In OOo times, there'd originally been efforts to allow building on Windows with
MinGW.  Later, in LO times, this has been shifted to an attempt of cross-
compiling for Windows on Linux.  That attempt can be considered abandoned, and
the relevant code rotting.

Due to this heritage, there are now three kinds of MinGW-specific code in LO:

* Code from the original OOo native Windows effort that is no longer relevant
  for the LO cross-compilation effort, but has never been removed properly.

* Code from the original OOo native Windows effort that is re-purposed for the
  LO cross-compilation effort.

* Code that has been added specifially for the LO cross-compilation effort.

All three kinds of code are removed.

(An unrelated, remaining use of MinGW is for --enable-build-unowinreg, utilizing
--with-mingw-cross-compiler, MINGWCXX, and MINGWSTRIP.)

Change-Id: I49daad8669b4cbe49fa923050c4a4a6ff7dda568
Reviewed-on: https://gerrit.libreoffice.org/34127
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-02-10 18:01:27 +00:00
b6f9eeb9b5 external: bundle pdfium
Initial use case is to avoid creating a whole Draw document + a poppler
process for each and every PDF image we load in a document.

The MSVC patch is only to support MSVC 2013, as upstream already moved
to MSVC 2015.

Change-Id: I3c9dbac3e3de9f2e874ca4cfec0a9dd8a388b87c
Reviewed-on: https://gerrit.libreoffice.org/34022
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-02-08 12:33:11 +00:00
2ec697a77f Remove DBUSMENUGTK left-overs
...after 4e7f9650e2a32b648cbd50ab113955920f960354 "remove ancient lo-menubar
implementation now that we have the shiny new one"

Change-Id: I49e7a5489279aaf3469d14c4e9d75245203c5937
2017-02-07 17:06:37 +01:00
e060317a7a fontconfig uses pkg-config to detect freetype now
Change-Id: I12cc3a8a36aeafd5184eee4051bc798c22769d8c
2017-02-02 16:22:41 +01:00
cc96f0c841 upload freetype 2.7.1
Change-Id: I8da4395cefe6bb542ab7cac2a849ec587a63f37c
Reviewed-on: https://gerrit.libreoffice.org/33814
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
2017-02-02 07:37:25 +00:00
595848c85a gpg4libre: Support building --with-system-gpgme (Linux only so far)
Change-Id: I22af89b920d43f3fc5f0fff02070f288bfa59fb4
Reviewed-on: https://gerrit.libreoffice.org/33702
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-02-01 12:11:22 +00:00
2c78d4965a tdf#90753 scp2: move firebirdsdbc packages to AutoInstall
Change-Id: Ifabb9fa65115fcc1728fa16e142ef008834eedda
2017-01-09 16:43:29 +01:00
1ad871ce0d link to our own static fontconfig and freetype when we build them
Change-Id: I143256ba37acf948931350443b2acf30c34f50a8
Reviewed-on: https://gerrit.libreoffice.org/32226
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-12-20 13:54:35 +00:00
87114367d7 some raptor tweaks for --disable-dynload
Change-Id: I63229ea57acc36b377f430d2305530cfe5617a35
Reviewed-on: https://gerrit.libreoffice.org/32203
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-12-20 09:29:14 +00:00
002a83fca9 this textenc hack is for android and disable-dynamic-loading
Change-Id: If2191161e82fc1e05b1442ae4b3b729cc1b8994d
Reviewed-on: https://gerrit.libreoffice.org/32038
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-12-19 12:35:41 +00:00
6cb661fba4 Revert "Revert "build our own fontconfig and freetype under oss-fuzz""
This reverts commit d3c06fb90485543f6ca4b1f833e6c4f82b28ba14.

which seems innocent after all
2016-12-19 08:59:02 +00:00
d3c06fb904 Revert "build our own fontconfig and freetype under oss-fuzz"
did I break android here mysteriously

This reverts commit f2fae3684f35bfb03c4921adc4ecbddcff36374b.

Change-Id: I0d941d3e474c6693cd15e1b55baab83a3da48488
2016-12-16 17:20:12 +00:00
f2fae3684f build our own fontconfig and freetype under oss-fuzz
Change-Id: I7141aabd64c3f42545176fa8c907d8326e25e9ff
2016-12-15 09:28:03 +00:00
482d7ce61b change from glew to epoxy
because that works under wayland out of the box and gtk3 uses it already

Change-Id: Iefaac31e325534a81a5389f752804af917c1baef
Reviewed-on: https://gerrit.libreoffice.org/31213
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-12-13 11:33:18 +00:00
f4732872aa fix lpsolve dependency
It currently only requires unpacking the tarball so linking can fail
with "cannot open input file ... lpsolve55.lib"

Change-Id: I6ab99d7ecfd08b1b934f5c189d8fe74b7ee517e5
Reviewed-on: https://gerrit.libreoffice.org/31805
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2016-12-10 23:49:42 +00:00
039261b3f6 orcus is mandatory now
We use it as a json parser, for calc cell styles and tests. Making it
optional is just making the code more complex and introduces more
sources for errors.

Change-Id: I8769628a4ab9519cafc3d43db7c0007e0aa265dc
Reviewed-on: https://gerrit.libreoffice.org/31307
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-11-28 15:52:20 +00:00
73302ce8b8 Exit GLyphy
Change-Id: Ib84e703d4c1528d022435c7695c97a3fc284563a
2016-11-16 21:32:03 +02:00
b5c566fd10 fix external def for graphite
Change-Id: I474a7852647fc17597ec3d5a44e1e8dfdc78c0c3
2016-11-04 16:22:23 +01:00
43532a0944 RepositoryExternal.mk: fix poppler linking on Ubuntu
need to link poppler static library *before* jpeg

Change-Id: I0fd2abc12c93432715a02a3a567349abda4f990b
2016-11-03 15:58:08 +01:00
5955e7bf5e update deps for libzmf
Change-Id: I627b3037d7e2dcecfed496068abf697c3258480d
2016-11-03 14:02:20 +01:00
8d1c80e263 RepositoryExternal.mk: really fix jpeg build
Change-Id: I1969db554d156e6af0975d03013ea4f7c10d839f
2016-11-03 13:24:39 +01:00
f144d319d5 Fix external libjpeg build
Change-Id: I952dd39559cff18dc7850b62915405954eac2fd7
2016-11-03 13:14:42 +01:00
eea709f67d poppler: build against libjpeg
Albert Astals Cid points out that --disable-libjpeg causes poppler to
use internal JPEG code instead, which is not actively maintained.

Add LIBJPEG_CFLAGS / LIBJPEG_LIBS to config_host.mk and patch poppler to
respect LIBJPEG_LIBS.

Change-Id: Id19a62a9bd9dc41fee5e8e43e2798e515aacc299
Reviewed-on: https://gerrit.libreoffice.org/30496
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-11-02 20:04:23 +00:00
bc3f952e66 avoid odd make warning on WNT
Library_vcl.mk:753: extraneous text after 'endif' directive

Change-Id: Iec487705b762880dd463acaba2d3590ff2587562
2016-10-27 22:25:34 +02:00
475e4b477c Move i18nlangtag lib to URELIB
...as stoc/Library_javavm.mk depends on it since
9b09a217c79e8a35fc4de54c89ef49fbf8f72752 "Resolves: #i86470# Wrong Java locale
when using 'nl' and 'fr'".  The i18nlangtag lib in turn depends on libs from
external/liblangtag and external/icu, so those needed to be moved to URELIB,
too.

On Windows, the external icu package was already split into icu and icu_ure
(because "libxml2 is in URE and depends on icuuc*.dll on Windows"), so use that
splitting on all platforms.  (However, the corresponding changes that were
necessary in RepositoryExternal.mk suggest that they had been missing for the
split Windows case until now, and things had happened to work by accident?)

On macOS, a library's install name reflects its (URELIB, OOO, ...) layer, and in
external/icu/icu4c-build.patch there is only a single place to set that for all
libs from external/icu.  This patch changes that from OOO to URELIB, but for the
icui18n lib that should stay at OOO.  The hack to make it URELIB nonetheless
works for now.  To clean this up again, either the whole of icu could go into
URE (dropping the icu vs. icu_ure package split completely), or the macOS layers
URELIB and OOO could be combined into one (as the libs end up in the same
directory anyway).

Change-Id: Idc262fa41481d06ba2cae86ad7629cdccb392c07
Reviewed-on: https://gerrit.libreoffice.org/30272
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-10-25 17:55:45 +00:00
9de76cb136 Make sure HarfBuzz module depends on Graphite
Change-Id: I9c1cc9c679ceebeb4e5cd898876aaa7b61c18f17
2016-10-18 20:41:32 +02:00
b285eaf5f8 Always build Graphite everywhere
It is no longer an optional feature on any platform. The
--enable-graphite stuff is kept as it controls the old Graphite
integration code and it should be removed without.

Change-Id: Ib4d76bba782a1439f02f93411b22d237a1987ea5
2016-10-18 20:41:31 +02:00
610eceb035 Always build HarfBuzz everywhere
It is no longer an optional feature on any platform.

Change-Id: I70cdcd2c0df69d961ecc5f36b4e8d035d251ef16
2016-10-18 20:41:31 +02:00
416c552066 external/firebird doesn't know --enable-debug, but make target "Debug"
* There's an --enable-developer configure option, but it probably does more than
  just default to the "Debug" target, things we potentially don't want here.

* Disabling --enable-debug for MSC was apparently a leftover from firebird 2
  times, f58f10fc89e19d182b5a415bb69af5ecc7de080a "firebird: --enable-debug
  breaks the build with MSVC".

Change-Id: Id9f7b6aa0cdfcea0b07f94814a8dab43488879bb
2016-10-17 08:43:15 +02:00
92be10ca06 Switch from orcus-0.11 to orcus-0.12
Change-Id: I837ed3a30fae6fbe6cb658f1feecce1e88279ae0
2016-09-18 00:15:08 +02:00
cb87239694 Use correct path to the build platform's services.rdb when cross-compiling
Requires introducing LIBO_URE_MISC_FOLDER_FOR_BUILD.

Change-Id: I133a7f73e48090f67764838b45de4fe8b7580efe
2016-08-17 18:16:10 +03:00
45f42681f4 GSoC Upgrade firebird to 3.0
Embedded firebird is now version 3.0.

Supports MSVC 14.0.

Instead of fbembed, there are now two libraries: fbclient and
Engine12. fbclient is linked as fbembed before, Engine12 is loaded
at runtime from fbclient.

fb now needs system libtommath, which is supplied
as a new ExternalProject of LO.

Change-Id: I132939bdee745795b22f675e4265e9590079c45f
Reviewed-on: https://gerrit.libreoffice.org/27642
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
2016-08-17 13:05:40 +00:00
1faae1f375 integrate libstaroffice
Change-Id: I85913f1bd1af5d102573040588cca9d8ddeebb5d
2016-08-11 08:13:27 +02:00
66a117c847 ENABLE_OPENGL does not mean whether to enable OpenGL use in general
It refers to only the (old) OpenGL slideshow transition code. So no
reason to have glew conditional on it.

Change-Id: I13bc3e3c25fd7a33e05b39b405af0c85ab6a8e96
2016-08-03 21:33:52 +03:00