Commit Graph

1419 Commits

Author SHA1 Message Date
8aa5c802e3 fix curl android patch to apply
Change-Id: I554f483ddf7bdc8b0347d7ae4d1fe7bb6aad8336
2016-07-30 19:37:42 +01:00
c772c8fd27 bump curl to 7.50.0
Change-Id: I368a18f70dfac51770afeb1f9e84ff83c19f0989
Reviewed-on: https://gerrit.libreoffice.org/27671
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-07-29 20:04:38 +00:00
73cd9c480c xmlsec: xmlsec1-keyinfo-revert.patch.1 is not needed on WNT
Change-Id: I1dbb6bf57dc78f321e6e6d69b7e573309aff8f48
Reviewed-on: https://gerrit.libreoffice.org/27658
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-07-29 07:09:26 +00:00
3efe880c3b libxmlsec: mark part of xmlsec1-vc.patch.1 as upstreamed
Change-Id: I4a8365c98eef87274ae1809047fd4ea582102f0b
Reviewed-on: https://gerrit.libreoffice.org/27556
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
2016-07-27 07:04:51 +00:00
66204ffa44 libxmlsec: switch to using upstream 'compile' script
Upstream used to provide no such one, and it's needed for the macOS
build. Latest upstream release does provide one, no need to patch it.

Change-Id: I2c2350d0e074f58d13fedb0d72888dd24ac41f44
Reviewed-on: https://gerrit.libreoffice.org/27322
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
2016-07-20 07:04:54 +00:00
ecb096841a Add Noto Emoji font for emoji support
Change-Id: I57cc123ec5e1f90967e82a60fdea792974054f86
Reviewed-on: https://gerrit.libreoffice.org/26800
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins <ci@libreoffice.org>
2016-07-19 15:54:00 +00:00
7b86ff8c8a Revert "bump nss to 3.25"
This reverts commit f10b31c2fe16bfcbb7cb278fdec65deacbe06219.
2016-07-19 10:35:06 +01:00
f10b31c2fe bump nss to 3.25
Change-Id: If99ee77bea40796cc56944724291a83068ff8198
2016-07-19 09:54:59 +01:00
742e632d8a Upgrade libxmlsec to 1.2.22
No major changes for us, except that finally we bundle the latest
upstream (but still heavily patch it).

Change-Id: I6bcfcdf48ec5d25eb3f7b14c89838942b4a11b48
Reviewed-on: https://gerrit.libreoffice.org/27196
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
2016-07-14 07:01:15 +00:00
99db9f2295 Make --enable-symbols orthogonal to --enable-debug/-dbgutil
Change-Id: I523bc1d848e40489370eefe00046e0a257ed2505
Reviewed-on: https://gerrit.libreoffice.org/27058
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-07-11 08:57:55 +00:00
bccb43027e Break gb_DEBUGINFO_FLAGS out of gb_DEBUG_CFLAGS
...in preparation of making them orthogonal

Change-Id: If75b334c954138b3aed4f8d1ac33061a2267ad52
Reviewed-on: https://gerrit.libreoffice.org/27056
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-07-11 08:57:37 +00:00
c75ff557b5 use EHs also for libcurl
Change-Id: Ibcd97e298e63074bbabb71d11af12bd3ff3266e7
Reviewed-on: https://gerrit.libreoffice.org/27070
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-07-09 11:47:55 +00:00
4c28c8051a tdf#100807 upload expat 2.2.0
Change-Id: Ic059d9cc94d4a5cf016dcf63cf5a8bf9c05d8c8a
Reviewed-on: https://gerrit.libreoffice.org/27037
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
2016-07-08 14:41:14 +00:00
9d1f51307d Upgrade libxmlsec to 1.2.21
Obsoletes xmlsec1-ooxml.patch.1 and xmlsec1-vs2015.patch.1.

Adds xmlsec1-keyinfo-revert.patch.1 till the LO side is adapted to the
new xmlsec requirements.

Change-Id: I1a46ad8fd7e9c8b4fa7a97591a1d90922969393d
Reviewed-on: https://gerrit.libreoffice.org/24403
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-07-08 07:01:58 +00:00
54f2a4184d tdf#100295: try to cover second place in curl using GetTickCount64
Change-Id: I08e51f70c7b0c92a8c1b8b06e7eb2f1437e2f3f4
Reviewed-on: https://gerrit.libreoffice.org/27025
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-07-08 00:45:36 +00:00
dc4797a79e tdf#100295 force curl to build for XP
Change-Id: Ia705704bc80a951f0da04936783dd8965bda842b
Reviewed-on: https://gerrit.libreoffice.org/26886
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Jenkins <ci@libreoffice.org>
2016-07-07 00:43:20 +00:00
3e27c43770 Avoid -fsanitize=alignment in external/nss
...in a way that might be a performance issue, so include the patch only
conditionally.

Change-Id: I483a77d0d199c2dee00139fdd4fa41223192289c
2016-07-04 15:47:08 +02:00
e31914d7f4 python3: override LINKCC properly, it needs -pthread
Build on Fedora 24 fails with "Python/thread.o: undefined
reference to symbol 'pthread_key_delete@@GLIBC_2.0'"

Change-Id: If23838722e1cd0220c509d25932ae0539e8da7a1
2016-07-01 13:09:00 +02:00
ca6592c0ae remove executable bit from .mk files
Change-Id: Id79898bb4f71103830ad7f74da71fbd5102e4fb5
2016-07-01 13:09:00 +02:00
3f22898c15 I screwed up with the breakpad minidump_stackwalk patch
This does not affect normal LibreOffice and is only important for the
server side.

Change-Id: I270262ed6e1b22c3ef41099fda19fa386f386203
2016-06-27 04:42:22 +02:00
e54b208df3 always compile breakpad with O2
Change-Id: I4cda93fee47244cf3eb7b13bb6cb2a3eab007cf0
2016-06-27 04:41:57 +02:00
74c01bb89f better use a backward compatible way to change the output
Change-Id: If5829e321db8af1f09cccafaf34a18343492f514
2016-06-27 03:37:51 +02:00
c717158a82 add code_id to the minidump_stackwalk
Change-Id: Ibcc32344780b7ad5814678cf7dd9a2167ede1661
Reviewed-on: https://gerrit.libreoffice.org/26649
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-06-25 00:15:36 +00:00
c931f3a518 libzmf: __ANDROID__, not ANDROID
The former is defined by GCC, the latter by gbuild -D$(OS)

Change-Id: I5960f8f74defcab964729c4deca5b1a988125d24
2016-06-24 22:34:17 +02:00
b72c14f68b libzmf: blind fix hack attempt to work around buggy android headers
Change-Id: Ie7b265e909389ae80d8ced3d803d7e355cda2211
2016-06-24 21:08:08 +02:00
81db0773fe Upgrade mdds to 1.2.1.
Change-Id: Ifc5b9d94bad191c0e19d5e6dada492caeb9cba76
Reviewed-on: https://gerrit.libreoffice.org/26638
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-06-24 15:05:43 +00:00
2ff98b560c upload libmwaw 0.3.8
Change-Id: I4779d538199ecccb8997e3bfdbf97d7b0ea9679b
2016-06-24 16:33:03 +02:00
f31de94b2d fix android build
Change-Id: Iecc55d0e1efd74b9895aa8f71934efa887bb6984
2016-06-24 09:28:12 +02:00
aaed6fe55a integrate libzmf
Change-Id: I0c7ea5b56ea4ed4839ff38798c0b915aaca81774
Reviewed-on: https://gerrit.libreoffice.org/26574
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
2016-06-23 15:39:52 +00:00
660e559781 uitest: we will need the python unittest module
Change-Id: Ic0589be9b3769279b201dfd314534a087c7f4309
2016-06-22 18:19:33 +02:00
9ec54e9240 Resolves: tdf#90579 swap_single_to_multi_blocks seems broken
when there is associated data in the src. Its copies those pointers
into the block that will appear in the destination. Then can destroy
the source block, which deletes the contents of those pointers, and
then inserts the new block which has dangling pointers to the deleted
data.

https://gitlab.com/mdds/mdds/merge_requests/2

Change-Id: Id9614d95652c8032b03cb5748a284917043d8d21
2016-06-17 16:43:55 +01:00
a72b705ec2 update mdds README for new home
Change-Id: I2641abe8e049361d5eb92e19b9ed57b8e7209386
2016-06-17 15:10:57 +01:00
4b2b496901 we are using our own minidump_upload executable
Change-Id: Icee770ff8e2db019031d618528a9aab83041389d
Reviewed-on: https://gerrit.libreoffice.org/26244
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-06-14 12:04:22 +00:00
aea4fdb65a tdf#87938 google 2FA fix, new pin code page
Updated libcmis 2FA patch:
+ changed challenge page parser
+ handled abort in the auth code provider

Change-Id: I2bbb102ec735788132e094d3908ac12432e9508c
Reviewed-on: https://gerrit.libreoffice.org/25372
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2016-06-09 07:55:57 +00:00
adf7df9c02 use android app's target-sdk (22) also for owncloud lib
maybe should be set via configure, to keep them in-sync

Change-Id: I3747992bb2bbdd88f3668418280bbafc8c998a02
2016-06-02 14:04:50 +02:00
35db469326 libxslt: upgrade to release 1.1.29
* drop libxslt-freebsd.patch.1
  fixed in new upstream libtool
* drop libxslt-config-guess.patch.0
  fixed in new upstream autoconf
* drop libxslt-android.patch
  fixed in new upstream autoconf
* drop libxslt-configure.patch.1
  fixed upstream
* drop libxslt-vc15.patch
  fixed upstream
* drop second hunk of libxslt-vc10.patch
  fixed upstream
* drop 0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1
  fixed upstream

Change-Id: I7427725ed6c82da53de12c9e1676e6ce02fd6483
Reviewed-on: https://gerrit.libreoffice.org/25775
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-06-01 15:58:44 +00:00
a61063ca2c Drop warning-related parts of external/boost/clang-cl.patch.0
...which are no longer necessary after e5c6574f5df8d2a5914beb03dce604beb8d62ee8
"boost: warning-patch-ectomy"

Change-Id: I4e79a4c7b9b20f9b49dc05e6a86831837aa4bbf0
2016-05-31 17:45:58 +02:00
ac5fd13937 boost: restore boost.gcc47679.patch
One of the tinderboxes fails with mysterious warning:

include/tools/gen.hxx:418:36: error: '*((void*)& aViewportExt +16)' may
be used uninitialized in this function [-Werror=maybe-uninitialized]
     nBottom = rSize.Height() ? nTop+rSize.Height()-1 : RECT_EMPTY;

Change-Id: I62bf99d1a623ba4bd9d7db5fe049366d0f20e26f
2016-05-30 17:49:20 +02:00
e5c6574f5d boost: warning-patch-ectomy
Upstream maintainers, with few exceptions, generally don't care about
warnings in boost headers, hence we re-base our warning fix patches on
every upgrade, which is a pointless exercise in frustration.

Most of the patches are for GCC/Clang warnings, where we could use
-isystem to suppress the warnings (with corresponding hacks in the build
system, because -isystem also disables dependency generation) - but
clang-cl does not support -isystem.

So generate a bunch of wrapper headers into external/boost/include, that
disable all known warnings and use #include_next to get the real boost
header. This allows us to get rid of most of the existing patches.

There is however a bug in GCC that preprocessor warnings like -Wundef
cannot be disabled with a #pragma, so those patches cannot be removed.
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53431

Change-Id: I2992bf4a463015f1140489df867bd80757f84541
Reviewed-on: https://gerrit.libreoffice.org/25563
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-05-30 15:34:51 +00:00
aa0b05f185 boost: remove boost.std.move.patch
Apparently required only on obsolete/unsupported Mac OS X versions.

Change-Id: I68540e3ac0d6830ed42854def0367a17f15feacd
2016-05-30 09:45:43 +02:00
e355e54f2f configure: set BOOST_CPPFLAGS also in --without-system-boost case
Simplify the makefiles.

Change-Id: Ia695961e936e4a1ffdaff73eb56adc3c3905ed0c
2016-05-30 09:45:43 +02:00
423f709ad7 boost: remove patches for headers that are no longer used
The following libraries are mostly or completely unused on current
master, in MSVC 2013 and GCC builds:

* crc
* dynamic_bitset
* ptr_container
* random
* signal2

That's much less removal than we hoped, but it turns out that a lot of
boost headers include other boost headers, so removing includes in LO
code only goes this far.

Also move one property_tree hunk from a wrong patch file to more
approriate one.

Change-Id: I6ad3a5987b025a57ca92402cca9a0e1f659128e9
Reviewed-on: https://gerrit.libreoffice.org/25513
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-05-26 18:25:55 +00:00
9364a49a87 Add option to enable HarfBuzz support independent of platform
Make HarfBuzz compile on any platform using the --with-harfbuzz
option. Support is experimental only.

Change-Id: I84fb80f3f8abed8ac877a294cf7ef39cf4cb2e9e
Reviewed-on: https://gerrit.libreoffice.org/25369
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Tested-by: Khaled Hosny <khaledhosny@eglug.org>
2016-05-24 20:59:44 +00:00
e097ec339f respect verbose in external/libxmlsec/ExternalProject_xmlsec.mk
as for the other external libs

Change-Id: I3d397b3d0afde3df9032cf52dd82d59427924c20
2016-05-24 21:18:50 +02:00
469aa7fb9e libxml2: upgrade to release 2.9.4
Change-Id: Ia3109b704155b9baa28f2a5f224e55af161f4fa1
Reviewed-on: https://gerrit.libreoffice.org/25412
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-05-24 18:31:23 +00:00
b33fb0a8a0 CVE-2016-0718 and CVE-2015-1283 expat woes
Change-Id: I83691e616bf964db2cb1e708b57f65b92ea2697e
Reviewed-on: https://gerrit.libreoffice.org/25401
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-24 13:23:27 +00:00
238bb82f59 add missing file for breakpad library
Change-Id: I1e88b2c9d6ab91a43d03b3f87ba4e83842f2ac03
2016-05-21 04:15:59 +02:00
511db54e95 tdf#87938 libcmis: Google 2FA implementation
2 Factor Authentication for Google Drive, changes:
+ parsing additional page with challenge - pin code verification
+ calling the interaction dialog requesting the code
+ dialog title changed to more general: Authentication Code
+ dialog shows url field only if not empty

Change-Id: Idb3ebbad6a12849b9e50af87b46324bfbe966bab
Reviewed-on: https://gerrit.libreoffice.org/25002
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
2016-05-16 07:24:23 +00:00
db729f3b68 Update mdds to 1.2.0. Note that the API version is also up.
liborcus-0.11.2 is out only to make it buildable with mdds-1.2.

Change-Id: I9648d827b008da252c57be0ebfd2efccb008ac70
Reviewed-on: https://gerrit.libreoffice.org/24944
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2016-05-13 00:35:20 +00:00
52909035af have another stab at fixing the -Wimplicit-fallthrough in json_parser
without triggering a -Wimplicit-fallthrough in unreachable code

Change-Id: I971272ffcf87d7224265a9a3ae87fcf8129c7a7a
2016-05-12 12:37:53 +01:00