summaryrefslogtreecommitdiff
path: root/external/liborcus
AgeCommit message (Collapse)Author
2018-12-13Switch Android armeabi-v7a to libc++/libc++abi/libunwind tooStephan Bergmann
It had been left out in 4082a18406c18af7b4fcef7bd501c3679c3be56b "android: use unified headers and llvm-c++ STL (x86) with NDK 16" because "arm unfortunately crashes with llvm-c++, so keep with gnustl for now/fix that later". Making armeabi-v7a work with libc++ etc. required a number of changes, listed below, in this commit and in preceding ones. At least 32-bit x86 already worked with libc++ etc. prior to these changes in view mode, though it crashed in the experimental editing mode (enabled with strippedUIEditing in android/soruce/Makefile) as soon as one types in something, But it is not entirely clear to me why 32-bit x86 view mode didn't also fail similar to how I saw armeabi-v7a fail. (On 32-bit x86, these changes appear to neither improve nor worsen the current state, view mode still appears to work fine while editing still crashes upon typing anything. With these changes, editing mode on armeabi-v7a appears to work fine. But I tested armeabi-v7a only with a real device and 32-bit x86 only with an emulator, in case that might make a difference.) * Preceding <https://gerrit.libreoffice.org/#/c/64964/> "Move NSSLIBS to a more sensible place on the linker command line" plus this change's addition of -lunwind to the liblo-native-code.so linker command line make sure that liblo-native-code.so uses _Unwind_* functions from libunwind.a, instead of erroneously picking up the ones from libgcc.a that happen to be included in NSSLIB's nspr4 (-lgcc is automatically added to the end of the linker command line by the invoking compiler, that's how libgcc.a's _Unwind_* end up in NSSLIB's nspr4; it is neither clear to me why NSSLIB's nspr4, being a pure C library, uses _Unwind_* functions, nor why exception handling in liblo-native-code.so fails when using _Unwind_* functions from libgcc.a instead of from libunwind on armeabi-v7a, nor why that would work on 32-bit x86, but that's what I observed: ModuleManager::identify (framework/source/services/modulemanager.cxx) throws a css::lang::IllegalArgumentException, which calls __cxa_throw -> _Unwind_RaiseException, which ultimately lead to odd misbehavior and std::abort during stack unwinding when using _Unwind_RaiseException from libgcc.a instead of from libunwind). (There is no libunwind.* in android-ndk-r16b for 32-bit x86 at least, so is presumably using _Unwind_* functions from libgcc.a. It doesn't appear to make a difference if it indirectly uses those _Unwind_* functions from NSSLIB's nspr4, or directly from libgcc.a included in liblo-native-code.so if the $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind) had a ",-lgcc" else branch.) * Preceding <https://gerrit.libreoffice.org/#/c/64965/> "Export RTTI symbols from liblo-native-code.so, for binary UNO bridge" makes sure that excpetions thrown from the binary UNO bridge can be caught by compiled catch clauses. Not sure why the corresponding state of bridges/source/cpp_uno/gcc3_linux_intel shouldn't have run into the same issue. * Preceding <https://gerrit.libreoffice.org/#/c/64966/> "Adapt gcc3_linux_arm __cxa_exception to NDK 18 libc++abi" makes sure that our version of __cxa_exception matches the version from libc++abi. This is clearly not relevant for 32-bit x86. (The comment there android-ndk-r18b, but the additional member is already present in android-ndk-r16b/sources/cxx-stl/llvm-libc++abi/src/cxa_exception.hpp, too.) The remainder of this change just drops old armeabi-v7a--specific workarounds that are no longer needed/no longer work. Change-Id: Ief4c2d562c5032abe6c3b94ca3b3394be6fcd4d3 Reviewed-on: https://gerrit.libreoffice.org/64973 Tested-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-11-08Prevent crash on assert error coming from orcus::css_parser::parse().Kohei Yoshida
It was caused by an unsigned integer underflow i.e. 0 - 1 on size_t. Change-Id: I579aefa8ffc9e320fadf7180f51711e535fdb778 Reviewed-on: https://gerrit.libreoffice.org/63057 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2018-11-01gbuild: rename value OS=IOS to OS=iOSMichael Stahl
This gets rid of the horrible hack in gbuild.mk to accomodate the case-incorrect iOS platform makefiles that cannot be renamed without upsetting git on file systems that sadly lack the case sensitivity feature. Keep the macro defined to IOS though. Change-Id: I1022bfef4900da00e75fc1ccce786b20f8673234 Reviewed-on: https://gerrit.libreoffice.org/62705 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2018-10-04Record external/liborcus/version.patch.0 as covered upstreamStephan Bergmann
Change-Id: I006a16cfc83e5b03408a2e772e752bb210901686 Reviewed-on: https://gerrit.libreoffice.org/61380 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-10-04Add external/liborcus/README, containing link to upstream projectStephan Bergmann
Change-Id: Iea609a8e90d8b2bf8bcac2b537699b08073f25ae Reviewed-on: https://gerrit.libreoffice.org/61379 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-10-04external/liborcus: Clash between VERSION and trunk libc++ <version>Stephan Bergmann
...on macOS with case-insensitive file systems. When compiling e.g. workdir/UnpackedTarball/liborcus/src/parser/base64.cpp, libtool adds -I../.. (presumably to find files like workdir/UnpackedTarball/liborcus/config.h), and including e.g. <vector> internally includes <version> now, and workdir/UnpackedTarball/liborcus/VERSION (generated from VERSION.in) happens to win. So disable generation of VERSION from VERSION.in (Kohei confirmed in private communication that that file isn't actually used for anything, so not generating it is fine). (An alternative approach might have been to use -iquote../.. instead of -I../.., but that's probably hard to shoehorn into the libtool-generated compiler invocation.) Change-Id: Id9a6778368796dc2494df3499b5e1ca560df1e56 Reviewed-on: https://gerrit.libreoffice.org/61358 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Jenkins
2018-09-19Update orcus to 0.14.1.Kohei Yoshida
Change-Id: I345d2655c1999ab319b92c6e8719c0eb9572000b Reviewed-on: https://gerrit.libreoffice.org/60731 Tested-by: Jenkins Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2018-09-01Update orcus to 0.14.0.Kohei Yoshida
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>
2018-07-26external/liborcus: silence -Werror=deprecated-copy (GCC trunk towards GCC 9)Stephan Bergmann
Change-Id: I520b19e2486bf1622206c74649f7105148b7bd87 Reviewed-on: https://gerrit.libreoffice.org/58047 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-06-24Changes to orcus for implementing XML data providerVikas Mahato
Change-Id: I70075f4240c75f0f46260bb77b160f0b75d6ae94 Reviewed-on: https://gerrit.libreoffice.org/56354 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2018-02-15Update orcus to 0.13.3.Kohei Yoshida
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-14Pick up hidden row and column flags when importing via orcus.Kohei Yoshida
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-09Pick up cell border colors when importing via orcus.Kohei Yoshida
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-02Correctly import solid fill color.Kohei Yoshida
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-01-30Update liborcus to 0.13.2.Kohei Yoshida
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-18android: use unified headers and llvm-c++ STL (x86) with NDK 16Christian Lohmaier
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>
2017-12-15Enable C++17 for clang-cl, tooStephan Bergmann
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-11-23crashtesting: assert from liborcusCaolán McNamara
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-18Updated liborcus to 0.13.1.Kohei Yoshida
Change-Id: Id5aa07f87603879fe7a21dc96cad207f1b168286 Reviewed-on: https://gerrit.libreoffice.org/44850 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2017-10-28use predefined workdir pathDavid Tardon
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-04use the new gbuild way to update config.*David Tardon
Change-Id: I43805ac8c3d5c1b65519da02c3cc50fdb9729ea6 Reviewed-on: https://gerrit.libreoffice.org/42941 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2017-08-12orcus: underscores are allowed as starting character in xml namesMarkus Mohrhard
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-12orcus: xml header is only mandatory in xml 1.1+Markus Mohrhard
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-06-30fix crash on windows with nullptr in operator<<Markus Mohrhard
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-12iOS patch liborcusjan Iversen
Support for arm64 Change-Id: Ie2289e4df9f90b7c31357ecfe859f087a7df9c5a
2016-11-17chmod -xTor Lillqvist
Change-Id: Ie07ef2f9e9f6d0b31b513afa913b79d9c641e4f1
2016-09-27don't dynamically link to system boost in internal boost caseMarkus Mohrhard
Change-Id: If1cc03b3861ac89b14d8d726fa4ce042f0086b24
2016-09-20external/liborcus: Mark patch as upstreamedStephan Bergmann
Change-Id: Id830c74cbdfb759300ae278df2ece642eb3579bb
2016-09-20external/liborcus: Let us override -fvisiblity=hiddenStephan Bergmann
(needed by UBSan builds that use -fvisibility-ms-compat instead) Change-Id: Ifabaf352cf2b9e77f9458eff46e240141f9e729d
2016-09-19liborcus: fix Android buildMiklos Vajna
stoi() is missing in the std namespace on the broken Android toolchain, work it around. Change-Id: I9ea4f89bea346a4383fbb99e03b09ebae43d21e5
2016-09-18Switch from orcus-0.11 to orcus-0.12Jaskaran Singh
Change-Id: I837ed3a30fae6fbe6cb658f1feecce1e88279ae0
2016-08-26tdf#94834 enable liborcus format detection on WindowsDavid Tardon
Change-Id: Ia6b353ed800eabd5766cc76e799f6151b71f865e
2016-05-30configure: set BOOST_CPPFLAGS also in --without-system-boost caseMichael Stahl
Simplify the makefiles. Change-Id: Ia695961e936e4a1ffdaff73eb56adc3c3905ed0c
2016-03-12Update liborcus to 0.11.1.Kohei Yoshida
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-08Update liborcus to 0.11.0.Kohei Yoshida
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>
2015-12-02Revert "external/liborcus: Silence clang-cl errors about redeclared Windows ↵Stephan Bergmann
functions" This reverts commit be0bf120299cff1ec14af1b578d4ea89976cea08, which is no longer needed after 12fc5b85ddc3b90b385ad0fc2ab0144a32bf9a4b "unnecessary include brings in boost headers that are broken under rhel-7"
2015-12-02unnecessary include brings in boost headers that are broken under rhel-7Caolán McNamara
Change-Id: I1ad477b9db9ba960ae2c417799e5d91b63538d57
2015-12-02external/liborcus: Silence clang-cl errors about redeclared Windows functionsStephan Bergmann
...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-10-11fix crash on examining ooo55043-1.odt etcCaolán McNamara
Change-Id: I3b57f50b09d491bd1b021eb95587becbd3f169a2
2015-09-01core: fix build with system boost 1.59David Ostrovsky
9a6cdce37e601b1406c71fef16ad9b315045c9da 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-08-11gbuild/config stop using VERBOSE, use only verbose=tNorbert Thiebaud
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-07-03Fix typosAndrea Gelmini
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-06-20force liborcus to use internal boost if neededDavid Tardon
... in a different way. Because my patch to boost.m4 has been rejected. Change-Id: I524eee367d5e295f8177e1f50dfdf1d0893ca0c6
2015-06-20upload liborcus 0.9.2David Tardon
Change-Id: Id551e1c3e60a0426bcd636642a9a0e02eb1e2612
2015-06-11force liborcus to use internal boost if neededDavid Tardon
Change-Id: I96b23262edf05d2589590f5e29a5b7a11b49e7aa
2015-06-10external/liborcus: Fix Linux RPATHStephan Bergmann
This has become necessary after edb38d702dd5a058ae0702b73a43328318b94649 "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-09Fix Mac OS X install names of external liborcusStephan Bergmann
Change-Id: I0304b13b441654636f633a97012ac91863d0b4d9
2015-06-05use $(DISABLE_DYNLOADING) consistentlyDavid Tardon
Change-Id: Iec611290770ae0393eb787a3883bb22a12340b0a
2015-06-05better way to do thisDavid Tardon
Change-Id: I4a18927f2c9b6414134e5ea016121693ac47ecf9
2015-06-05liborcus: still build statically on AndroidMiklos Vajna
Change-Id: Ieeb5180ea7f96cb08d06bf895bd2a6ffc6c1cef0
generated by cgit (git 2.34.1) at 2025-02-09 05:20:48 +0000