Commit Graph
67 Commits
Author SHA1 Message Date
Kohei Yoshida 45a4e70484 Update orcus to 0.13.3.
This will be the new baseline for master, since, though this change
is a fully API-compatible, one bug fix wrt the alpha value handling
unfortunately would break some unit tests when using an earlier
version.

Change-Id: I5a17ce4085d3311a165748154d107d12b95e2c71
Reviewed-on: https://gerrit.libreoffice.org/49784
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2018-02-15 04:27:37 +01:00
Kohei Yoshida 9dbc3ffec0 Pick up hidden row and column flags when importing via orcus.
Change-Id: Idf2530935eb93339602ac5f6a5d0547aa56b453a
Reviewed-on: https://gerrit.libreoffice.org/49695
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2018-02-14 05:48:47 +01:00
Kohei Yoshida 1af6354b46 Pick up cell border colors when importing via orcus.
Change-Id: Iee2d79930d0c917518b180fdd63fe30c6860b9b1
Reviewed-on: https://gerrit.libreoffice.org/49466
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2018-02-09 12:45:04 +01:00
Kohei Yoshida 20945a9a4d Correctly import solid fill color.
In orcus, a solid fill type uses the foreground color only and ignores
the background color.  Also, let's not use the alpha component as it
would cause the color to not get rendered at all.

Some patches are applied against liborcus in order to adjust the ODF
styles import code for this change.  These changes will be incorporated
in 0.13.3.

Change-Id: I9e8c243cc6a7f366de2393e7b7ecf77366f5f9ea
Reviewed-on: https://gerrit.libreoffice.org/49071
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2018-02-02 03:41:15 +01:00
Kohei Yoshida e13acfcac9 Update liborcus to 0.13.2.
Change-Id: I485757eb743e066730509202a3c077e5d822a311
Reviewed-on: https://gerrit.libreoffice.org/48863
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2018-01-30 14:06:55 +01:00
Christian Lohmaier 4082a18406 android: use unified headers and llvm-c++ STL (x86) with NDK 16
gnustl (and others) are to be removed in future versions of the ndk
also bump gradle and build-tools to current versions along with it

arm unfortunately crashes with llvm-c++, so keep with gnustl for now/fix
that later

Change-Id: Ic794c3293b599b77ec48096bf3283a99c09cbb79
Reviewed-on: https://gerrit.libreoffice.org/45163
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-01-18 14:44:25 +01:00
Stephan Bergmann c5f6043b0f Enable C++17 for clang-cl, too
Similar to libc++ in C++17 mode, some types like std::auto_ptr are indeed
removed in C++17 mode by default, and need _HAS_AUTO_PTR_ETC=1 to be enabled
(see <https://blogs.msdn.microsoft.com/vcblog/2017/12/08/c17-feature-removals-
and-deprecations/>).

Unlike libc++, also std::binary_function and std::unary_function are removed
(and need the same _HAS_AUTO_PTR_ETC=1 to enable).  So either set that flag to
make external code build, or use patches (for external/mdds) to make externals'
files included in LO proper still work there.

Change-Id: I886cc0de8196255334ee03ec48cb4bc54d460afd
Reviewed-on: https://gerrit.libreoffice.org/46514
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-12-15 22:23:31 +01:00
Caolán McNamara e5e8181161 crashtesting: assert from liborcus
Change-Id: I3b148354745fa419b6299b6456d24925ea4fb980
Reviewed-on: https://gerrit.libreoffice.org/45160
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-23 18:02:21 +01:00
Kohei Yoshida 38c4f46325 Updated liborcus to 0.13.1.
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-18 13:32:52 +01:00
David Tardon 193b6c2287 use predefined workdir path
Change-Id: Ia14aaba92e5d36064bc6a77dbc63463a833d8745
Reviewed-on: https://gerrit.libreoffice.org/43969
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2017-10-28 16:49:17 +02:00
David Tardon f2db08b28e use the new gbuild way to update config.*
Change-Id: I43805ac8c3d5c1b65519da02c3cc50fdb9729ea6
Reviewed-on: https://gerrit.libreoffice.org/42941
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
2017-10-04 08:12:43 +02:00
Markus Mohrhard 18b3edcfbd orcus: underscores are allowed as starting character in xml names
Change-Id: Ib379831bb0725d97bc79681af7a2052ccd553c79
Reviewed-on: https://gerrit.libreoffice.org/41081
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-08-12 17:37:31 +02:00
Markus Mohrhard d1195c0971 orcus: xml header is only mandatory in xml 1.1+
Change-Id: I28aa8a2f340cb1a100dfa5d10d8d6e9b8dac2479
Reviewed-on: https://gerrit.libreoffice.org/41080
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-08-12 12:12:57 +02:00
Markus Mohrhard ec822b7b71 fix crash on windows with nullptr in operator<<
E.g. http://crashreport.libreoffice.org/stats/crash_details/8962b764-6550-45c9-b08b-e99f5c968d61

Change-Id: I1153c0ab35266006ada10611e79b770ef1c0cd4f
Reviewed-on: https://gerrit.libreoffice.org/39413
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-06-30 18:12:20 +02:00
jan Iversen 6685631ed9 iOS patch liborcus
Support for arm64

Change-Id: Ie2289e4df9f90b7c31357ecfe859f087a7df9c5a
2017-06-12 18:04:57 +02:00
Tor Lillqvist c6ec65395c chmod -x
Change-Id: Ie07ef2f9e9f6d0b31b513afa913b79d9c641e4f1
2016-11-17 12:35:52 +02:00
Markus Mohrhard a4c974293e don't dynamically link to system boost in internal boost case
Change-Id: If1cc03b3861ac89b14d8d726fa4ce042f0086b24
2016-09-27 03:00:44 +02:00
Stephan Bergmann 480edfceca external/liborcus: Mark patch as upstreamed
Change-Id: Id830c74cbdfb759300ae278df2ece642eb3579bb
2016-09-20 11:01:29 +02:00
Stephan Bergmann ee0a0b8407 external/liborcus: Let us override -fvisiblity=hidden
(needed by UBSan builds that use -fvisibility-ms-compat instead)

Change-Id: Ifabaf352cf2b9e77f9458eff46e240141f9e729d
2016-09-20 09:57:01 +02:00
Miklos Vajna c2673a358c liborcus: fix Android build
stoi() is missing in the std namespace on the broken Android toolchain,
work it around.

Change-Id: I9ea4f89bea346a4383fbb99e03b09ebae43d21e5
2016-09-19 10:15:52 +02:00
Jaskaran Singh 92be10ca06 Switch from orcus-0.11 to orcus-0.12
Change-Id: I837ed3a30fae6fbe6cb658f1feecce1e88279ae0
2016-09-18 00:15:08 +02:00
David Tardon 4462447b8a tdf#94834 enable liborcus format detection on Windows
Change-Id: Ia6b353ed800eabd5766cc76e799f6151b71f865e
2016-08-26 12:58:43 +02:00
Michael Stahl 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
Kohei Yoshida 0cead356b8 Update liborcus to 0.11.1.
This is mostly a build-fix release, to absorb patches previously applied
locally.

Change-Id: I1d1808c3ca27f04f89f4df6c0b40a646ca07d242
Reviewed-on: https://gerrit.libreoffice.org/23180
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2016-03-12 20:46:49 +00:00
Kohei Yoshida b325b4c286 Update liborcus to 0.11.0.
Markus did half of this, and I simply carried the torch.

Change-Id: Icd3ee1e4b5bd562faee06dfd9dce52a4bed49a71
Reviewed-on: https://gerrit.libreoffice.org/22943
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2016-03-08 04:43:24 +00:00
Stephan Bergmann 6054cfcb6e Revert "external/liborcus: Silence clang-cl errors about redeclared Windows functions"
This reverts commit be0bf12029, which is no longer
needed after 12fc5b85dd "unnecessary include
brings in boost headers that are broken under rhel-7"
2015-12-02 16:10:53 +01:00
Caolán McNamara 12fc5b85dd unnecessary include brings in boost headers that are broken under rhel-7
Change-Id: I1ad477b9db9ba960ae2c417799e5d91b63538d57
2015-12-02 14:43:05 +00:00
Stephan Bergmann be0bf12029 external/liborcus: Silence clang-cl errors about redeclared Windows functions
...like CreateMutexA redeclared in
workdir/UnpackedTarball/boost\boost/thread/win32/thread_primitives.hpp.  As such
problematic Boost include files are apparently not included from LO-proper
source files, only from external, it looks easiest to just silence that with
BOOST_USE_WINDOWS_H here.

Change-Id: Ia5ec2325934e6d7fdcf91e6faa2e671aee2091ae
2015-12-02 08:02:25 +01:00
Caolán McNamara 50529b7132 fix crash on examining ooo55043-1.odt etc
Change-Id: I3b57f50b09d491bd1b021eb95587becbd3f169a2
2015-10-11 21:22:54 +01:00
David Ostrovsky e00a3a684e core: fix build with system boost 1.59
9a6cdce37e was trying to fix the problem
with exposing deprecated vars and functions in system's error_code.hpp
include file by patching bundled boost version.  This approach would
only make sense, when upstream version is going to be fixed ASAP. Apply
another approach, and follow the same pattern as applied in external
libraries, by defining

  -DBOOST_ERROR_CODE_HEADER_ONLY \
  -DBOOST_SYSTEM_NO_DEPRECATED

instead of patching bundled boost version.  This way, the code would
work with unpatched system boost 1.59 final as well.

Change-Id: I8684ca458ea4a5b7d7c3c3acfe7c14a6d19bc665
Reviewed-on: https://gerrit.libreoffice.org/18201
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
2015-09-01 07:51:43 +00:00
Norbert Thiebaud a8db357874 gbuild/config stop using VERBOSE, use only verbose=t
configure.ac was setting VERBOSE=YES/NO when really
we use verbose=t or verbose=

Change-Id: I47aee8d177cb2d788a62ecdbbb9cc3695c2bb299
Reviewed-on: https://gerrit.libreoffice.org/17634
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-08-11 04:34:45 +00:00
Andrea Gelmini 465489d97a Fix typos
Change-Id: Id884946cae0687d0b71c967e236e58df17567884
Reviewed-on: https://gerrit.libreoffice.org/16707
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2015-07-03 09:43:46 +00:00
David Tardon 994bb22c8f force liborcus to use internal boost if needed
... in a different way. Because my patch to boost.m4 has been rejected.

Change-Id: I524eee367d5e295f8177e1f50dfdf1d0893ca0c6
2015-06-20 19:14:26 +02:00
David Tardon 7771703362 upload liborcus 0.9.2
Change-Id: Id551e1c3e60a0426bcd636642a9a0e02eb1e2612
2015-06-20 08:25:44 +02:00
David Tardon fe51d68f9a force liborcus to use internal boost if needed
Change-Id: I96b23262edf05d2589590f5e29a5b7a11b49e7aa
2015-06-11 14:06:44 +02:00
Stephan Bergmann 371cc81bd9 external/liborcus: Fix Linux RPATH
This has become necessary after edb38d702d "update
to liborcus 0.9.1; Includes switching to dynamic libs."

For one, pass -Wl,-rpath,$ORIGIN in via LDFLAGS, as is done for various external
projects.

For another, libtool (as internally used by liborcus) unhelpfully adds further
-Wl,-rpath arguments of its own, to make the resulting lib in its presumed
location find its dependent libs in their presumed locations.  But we override
all that to the single instdir/program/ directory and corresponding RPATH
$ORIGIN anyway, so the simplest fix to get a clean RPATH appears to outsmart
libtool's attempt add adding further -Wl,-rpath arguments by setting
hardcode_libdir_flag_spec_CXX to empty (see the internals of libtool for why
that works).  Other external projects (like redland) suffer from this problem
too and currently have a "dirty" RPATH; fix pending.  Until libreoffice-4-1 that
was generally not an issue, presumably because having all libs in solver
happened to cause libtool not to emit any additional -Wl,-rpath arguments.

Change-Id: I80dff5141a33c198f30aecb7c51b41bc06145f1c
2015-06-10 11:30:39 +02:00
Stephan Bergmann 2b121ad11a Fix Mac OS X install names of external liborcus
Change-Id: I0304b13b441654636f633a97012ac91863d0b4d9
2015-06-09 21:27:54 +02:00
David Tardon 05c1a94a54 use $(DISABLE_DYNLOADING) consistently
Change-Id: Iec611290770ae0393eb787a3883bb22a12340b0a
2015-06-05 14:50:03 +02:00
David Tardon b46276e6c0 better way to do this
Change-Id: I4a18927f2c9b6414134e5ea016121693ac47ecf9
2015-06-05 14:35:37 +02:00
Miklos Vajna 0aed9cbb6c liborcus: still build statically on Android
Change-Id: Ieeb5180ea7f96cb08d06bf895bd2a6ffc6c1cef0
2015-06-05 14:06:58 +02:00
Tor Lillqvist e48bb73b81 Fix weird compilation problem with __float128
Change-Id: I4a7ac5ee7f2f2c9d9d87517c826c1e80bd23477d
2015-06-05 00:44:12 +03:00
David Tardon edb38d702d update to liborcus 0.9.1
Includes switching to dynamic libs.

Change-Id: I959c4e9430f8cf95f50d48e1b01d8323dba4af81
2015-06-04 21:45:12 +02:00
Markus Mohrhard 861a86dfca Revert "update to liborcus 0.9.0"
This reverts commit a1280bd47f.

Change-Id: I2ad873f012ebae6858c8895c14ed695dbd881fc4
Reviewed-on: https://gerrit.libreoffice.org/15586
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-05-01 20:14:27 +00:00
Markus Mohrhard a1280bd47f update to liborcus 0.9.0
Includes a lot of help from Norbert for finding the boost MSVC problem.

Change-Id: I5184bc40e2c3861883b8587784117b1c4558fa5f
Reviewed-on: https://gerrit.libreoffice.org/15453
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-05-01 18:12:20 +00:00
Stephan Bergmann f6977bb87a Further reduce amount of symbols exported from static orcus library
Following up on 7a4cc19791 "Also on Linux do not
export symbols from static orcus libraries" that turned out to not be enough to
prevent ASan ODR violation reports after
f0aa1a78fb "For Clang -fsanitize=vptr use
-fvisibility-ms-compat, not -fvisibility=hidden."  Given that liborcus is only
ever linked in as a static archive, it is hopefully OK (intended, even?) to not
export any of its symbols.

Change-Id: Ib8eb084def1725374747a389065bf8186218786e
2015-03-03 12:23:05 +01:00
Stephan Bergmann fc6f894d22 Pass -fvisibility-inlines-hidden into external modules
Change-Id: Icf872e269c7e427ba1287ccd0082974c9426449e
2015-02-27 09:55:02 +01:00
David Ostrovsky 38671c869d liborcus: Remove BOOST_ALL_NO_LIB, it's already included upstream
Change-Id: I39e65a9ee3ede5217d9d6d8499297e449af798fe
Reviewed-on: https://gerrit.libreoffice.org/14559
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-19 22:08:04 +00:00
Stephan Bergmann cdd8ab7e0c ...next attempt at getting this through both GCC 5 and MSVC
Change-Id: Id367dee6c4fe55fe039ebf28603c883014194832
2015-02-10 17:58:18 +01:00
Stephan Bergmann a5ec343f6c How is that supposed to ever work?
Change-Id: Ieb13095abb399662e449fad5a056999343165025
2015-02-10 17:25:41 +01:00
David Tardon 8b68841c14 fix liborcus build with gcc 5
Change-Id: I38b2ecf86d4334d0179362079a216df4301bf184
2015-02-09 23:50:39 +01:00