subject:"\[Libreoffice\-commits\] core.git\: external\/liborcus"

[Libreoffice-commits] core.git: external/liborcus

2023-09-29 Thread Kohei Yoshida (via logerrit)

 external/liborcus/UnpackedTarball_liborcus.mk  |1 +
 external/liborcus/gnumeric-set-grammar.patch.1 |   17 +
 2 files changed, 18 insertions(+)

New commits:
commit cba8c933d1ff2e31ec55544f46d6fff99e8a5ccd
Author: Kohei Yoshida 
AuthorDate: Fri Sep 29 17:45:14 2023 -0400
Commit: Kohei Yoshida 
CommitDate: Sat Sep 30 00:52:06 2023 +0200

Set grammar type to gnumeric before loading the content

Without this, the document model side would not know what grammer
to use to parse formula expressions.

Change-Id: I7e921f9c0f9b088fb98fe126ad4a84db006c8747
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157413
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index b8c44479765b..292435dfd00d 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/libtool.patch.0 \
external/liborcus/liborcus_newline.patch.1 \
external/liborcus/msvc-int-narrowing.patch.1 \
+   external/liborcus/gnumeric-set-grammar.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/gnumeric-set-grammar.patch.1 
b/external/liborcus/gnumeric-set-grammar.patch.1
new file mode 100644
index ..42bc46177737
--- /dev/null
+++ b/external/liborcus/gnumeric-set-grammar.patch.1
@@ -0,0 +1,17 @@
+diff --git a/src/liborcus/orcus_gnumeric.cpp b/src/liborcus/orcus_gnumeric.cpp
+index 76c13682..849759ba 100644
+--- a/src/liborcus/orcus_gnumeric.cpp
 b/src/liborcus/orcus_gnumeric.cpp
+@@ -144,6 +144,12 @@ void orcus_gnumeric::read_stream(std::string_view stream)
+ if (!decompress_gzip(stream.data(), stream.size(), file_content))
+ return;
+ 
++if (auto* gs = mp_impl->mp_factory->get_global_settings(); gs)
++{
++gs->set_origin_date(1899, 12, 30);
++
gs->set_default_formula_grammar(spreadsheet::formula_grammar_t::gnumeric);
++}
++
+ mp_impl->read_content_xml(file_content, get_config());
+ mp_impl->mp_factory->finalize();
+ }

[Libreoffice-commits] core.git: external/liborcus

2023-09-28 Thread Kohei Yoshida (via logerrit)

 external/liborcus/windows-constants-hack.patch |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e9a0c97de95688b2f86bbb4dd8c823af5442401c
Author: Kohei Yoshida 
AuthorDate: Thu Sep 28 20:29:52 2023 -0400
Commit: Kohei Yoshida 
CommitDate: Fri Sep 29 03:50:42 2023 +0200

Set the correct version number of orcus

Ideally we should fix the Windows build properly, but cmake isn't
available to us.

Change-Id: I3f612604195212ba3a699c0b76785b5aa5f7925b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157391
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida 

diff --git a/external/liborcus/windows-constants-hack.patch 
b/external/liborcus/windows-constants-hack.patch
index e86c74a722f3..68e57857826d 100644
--- a/external/liborcus/windows-constants-hack.patch
+++ b/external/liborcus/windows-constants-hack.patch
@@ -3,13 +3,13 @@ index ae571f5..539ce18 100644
 --- a/src/liborcus/info.cpp
 +++ b/src/liborcus/info.cpp
 @@ -7,7 +7,9 @@
- 
+
  #include "orcus/info.hpp"
- 
+
 -#include "constants.inl"
 +#define ORCUS_MAJOR_VERSION 0
-+#define ORCUS_MINOR_VERSION 17
-+#define ORCUS_MICRO_VERSION 2
- 
++#define ORCUS_MINOR_VERSION 19
++#define ORCUS_MICRO_VERSION 0
+
  namespace orcus {
- 
+

[Libreoffice-commits] core.git: external/liborcus

2023-01-26 Thread Kohei Yoshida (via logerrit)

 external/liborcus/UnpackedTarball_liborcus.mk |1 
 external/liborcus/std-get-busted.patch.1  |  418 --
 2 files changed, 419 deletions(-)

New commits:
commit 27653feb30911d0f1dfe14ff0cb5373d4c87bcdd
Author: Kohei Yoshida 
AuthorDate: Wed Jan 25 22:09:55 2023 -0500
Commit: Kohei Yoshida 
CommitDate: Thu Jan 26 13:52:54 2023 +

Just use std::variant and std::get

Change-Id: If467225fae07a9d33e324cac9ff32300d6c56534
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146151
Tested-by: Kohei Yoshida 
Reviewed-by: Kohei Yoshida 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 5b1f542a4cb9..48b7fb4743e9 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/libtool.patch.0 \
external/liborcus/fix-pch.patch.0 \
external/liborcus/liborcus_newline.patch.1 \
-   external/liborcus/std-get-busted.patch.1 \
external/liborcus/liborcus-no-benchmark.patch.1 \
external/liborcus/bugfix-0.18.0-unset-border-colors.patch.1 \
 ))
diff --git a/external/liborcus/std-get-busted.patch.1 
b/external/liborcus/std-get-busted.patch.1
deleted file mode 100644
index e0158114f227..
--- a/external/liborcus/std-get-busted.patch.1
+++ /dev/null
@@ -1,418 +0,0 @@
-From f917ed284c52ae12fb0d752c17141f355158470e Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida 
-Date: Tue, 2 Nov 2021 22:07:51 -0400
-Subject: [PATCH] std::get(...) may be flaky with some version of clang.
-
-As workaround, use boost::variant and boost::get.
-
-c.f. 
https://stackoverflow.com/questions/52521388/stdvariantget-does-not-compile-with-apple-llvm-10-0

- include/orcus/config.hpp|  4 ++--
- include/orcus/css_selector.hpp  |  5 +++--
- include/orcus/json_parser_thread.hpp|  4 ++--
- include/orcus/sax_token_parser_thread.hpp   |  5 +++--
- include/orcus/spreadsheet/pivot.hpp |  7 ---
- include/orcus/threaded_json_parser.hpp  |  8 
- include/orcus/threaded_sax_token_parser.hpp |  8 
- src/liborcus/css_document_tree.cpp  |  2 +-
- src/liborcus/css_selector.cpp   | 12 ++--
- src/liborcus/orcus_csv.cpp  |  4 ++--
- src/orcus_csv_main.cpp  |  2 +-
- src/orcus_test_csv.cpp  |  8 
- src/orcus_test_xlsx.cpp |  4 ++--
- src/parser/json_parser_thread.cpp   |  8 
- src/python/sheet_rows.cpp   |  3 +++
- 15 files changed, 45 insertions(+), 39 deletions(-)
-
-diff --git a/include/orcus/config.hpp b/include/orcus/config.hpp
-index 17743e6a..fe9a7d81 100644
 a/include/orcus/config.hpp
-+++ b/include/orcus/config.hpp
-@@ -12,7 +12,7 @@
- #include "orcus/types.hpp"
-
- #include 
--#include 
-+#include 
-
- namespace orcus {
-
-@@ -37,7 +37,7 @@ struct ORCUS_DLLPUBLIC config
- };
-
- // TODO: add config for other formats as needed.
--using data_type = std::variant;
-+using data_type = boost::variant;
-
- /**
-  * Enable or disable runtime debug output to stdout or stderr.
-diff --git a/include/orcus/css_selector.hpp b/include/orcus/css_selector.hpp
-index 1e41d544..dafeddf5 100644
 a/include/orcus/css_selector.hpp
-+++ b/include/orcus/css_selector.hpp
-@@ -12,11 +12,12 @@
- #include "css_types.hpp"
-
- #include 
--#include 
- #include 
- #include 
- #include 
-
-+#include 
-+
- namespace orcus {
-
- struct ORCUS_DLLPUBLIC css_simple_selector_t
-@@ -73,7 +74,7 @@ struct ORCUS_DLLPUBLIC css_selector_t
-  */
- struct ORCUS_DLLPUBLIC css_property_value_t
- {
--using value_type = std::variant;
-+using value_type = boost::variant;
-
- css::property_value_t type;
- value_type value;
-diff --git a/include/orcus/json_parser_thread.hpp 
b/include/orcus/json_parser_thread.hpp
-index 8328ef11..565008da 100644
 a/include/orcus/json_parser_thread.hpp
-+++ b/include/orcus/json_parser_thread.hpp
-@@ -14,7 +14,7 @@
- #include 
- #include 
- #include 
--#include 
-+#include 
-
- namespace orcus {
-
-@@ -47,7 +47,7 @@ enum class parse_token_t
-
- struct ORCUS_PSR_DLLPUBLIC parse_token
- {
--using value_type = std::variant;
-+using value_type = boost::variant;
-
- parse_token_t type;
- value_type value;
-diff --git a/include/orcus/sax_token_parser_thread.hpp 
b/include/orcus/sax_token_parser_thread.hpp
-index b3645735..e0842013 100644
 a/include/orcus/sax_token_parser_thread.hpp
-+++ b/include/orcus/sax_token_parser_thread.hpp
-@@ -12,10 +12,11 @@
- #include "types.hpp"
-
- #include 
--#include 
- #include 
- #include 
-
-+#include 
-+
- namespace orcus {
-
- class tokens;
-@@ -36,7 +37,7 @@ enum class parse_token_t
-
- struct ORCUS_PSR_DLLPUBLIC parse_token
- {
--using value_type = std::

[Libreoffice-commits] core.git: external/liborcus

2023-01-16 Thread Tor Lillqvist (via logerrit)

 external/liborcus/UnpackedTarball_liborcus.mk   |1 +
 external/liborcus/liborcus-no-benchmark.patch.1 |   19 +++
 2 files changed, 20 insertions(+)

New commits:
commit 5c355dbae859d2ac0b0e8fedca86b64797aec081
Author: Tor Lillqvist 
AuthorDate: Fri Jan 13 12:07:27 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Jan 17 07:56:42 2023 +

Don't bother building the liborcus benchmark

It causes a problem when building with Emscripten and
--enable-wasm-exceptions. Instead of fixing that problem, just don't
bother building executables we won't run anyway. (Ideally liborcus
should have some --disable-benchmark configure options, ping Kohei.)

Change-Id: Ic8c1d51513793bba85dc2833cc8fd9ec5b97ce76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145645
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 30d3f0d78d1c..47d05e82c612 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/forcepoint-95.patch.1 \
external/liborcus/include.patch.0 \
external/liborcus/overrun.patch.0 \
+   external/liborcus/liborcus-no-benchmark.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/liborcus-no-benchmark.patch.1 
b/external/liborcus/liborcus-no-benchmark.patch.1
new file mode 100644
index ..a19cea836601
--- /dev/null
+++ b/external/liborcus/liborcus-no-benchmark.patch.1
@@ -0,0 +1,19 @@
+-*- Mode: Diff -*-
+
+Don't build the benchmark directory.
+
+We won't run those anyway, and on some platforms building executables
+here and there for random externals can be problematic. While at it,
+skip the doc_example subdirectory too.
+
+--- liborcus/Makefile.in
 liborcus/Makefile.in
+@@ -408,7 +408,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = src include benchmark   doc_example
++SUBDIRS = src include
+ ACLOCAL_AMFLAGS = -I m4
+ pcfiles = liborcus-@ORCUS_API_VERSION@.pc $(am__append_1)
+ pkgconfig_DATA = $(pcfiles)

[Libreoffice-commits] core.git: external/liborcus sc/source

2022-08-03 Thread Mike Kaganski (via logerrit)

 external/liborcus/UnpackedTarball_liborcus.mk |1 
 external/liborcus/win_path_utf16.patch|   33 ++
 sc/source/filter/orcus/orcusfiltersimpl.cxx   |   33 +++---
 3 files changed, 38 insertions(+), 29 deletions(-)

New commits:
commit c2e86396b741b956efc05e9dfea1e1c3286dfb9d
Author: Mike Kaganski 
AuthorDate: Wed Aug 3 18:26:25 2022 +0300
Commit: Mike Kaganski 
CommitDate: Thu Aug 4 06:31:36 2022 +0200

tdf#150247: patch orcus to use UTF-16 paths on Windows

This adds UTF8->UTF16 conversion of the paths passed to ctor of
file_content on Windows, since both boost::filesystem::file_size
and boost::interprocess::file_mapping take UTF-16 strings on this
platform. So the assumption is that 8-bit path strings passed to
orcus are UTF-8-encoded.

This partially reverts commit 75252e58d9b5d020bf7bd6ca66b3a9d780463051
(it keeps use of osl_getThreadTextEncoding for platforms other than
Windows).

Change-Id: Ie467f71a65945f4f07ff432136ea06b811c3f794
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137759
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 6e78c0ca2c3e..30d3f0d78d1c 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
 ifeq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/windows-constants-hack.patch \
+   external/liborcus/win_path_utf16.patch \
 ))
 endif
 
diff --git a/external/liborcus/win_path_utf16.patch 
b/external/liborcus/win_path_utf16.patch
new file mode 100644
index ..0a6781e728b3
--- /dev/null
+++ b/external/liborcus/win_path_utf16.patch
@@ -0,0 +1,33 @@
+diff --git a/src/parser/stream.cpp b/src/parser/stream.cpp
+index 00395f59ff25..8f385fb8965a 100644
+--- a/src/parser/stream.cpp
 b/src/parser/stream.cpp
+@@ -147,6 +147,14 @@ std::tuple 
find_line_with_offset(std::string_v
+ return std::make_tuple(line, line_num, offset_on_line);
+ }
+ 
++#ifdef _WIN32
++std::wstring to_wstring(std::string_view s)
++{
++std::wstring_convert> conversion;
++return conversion.from_bytes(s.data(), s.data() + s.size());
++}
++#endif
++
+ } // anonymous namespace
+ 
+ struct file_content::impl
+@@ -162,8 +170,13 @@ struct file_content::impl
+ impl() : content_size(0), content(nullptr) {}
+ 
+ impl(std::string_view filepath) :
++#ifdef _WIN32
++content_size(fs::file_size(to_wstring(filepath))),
++mapped_file(to_wstring(filepath).c_str(), bip::read_only),
++#else
+ content_size(fs::file_size(std::string{filepath}.c_str())),
+ mapped_file(std::string{filepath}.c_str(), bip::read_only),
++#endif
+ mapped_region(mapped_file, bip::read_only, 0, content_size),
+ content(nullptr)
+ {
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx 
b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index db2d5705d51e..e7fdb44ca91e 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -11,8 +11,6 @@
 #include 
 #include 
 
-#include 
-
 #include 
 #include 
 #include 
@@ -30,13 +28,6 @@
 #include 
 #include 
 
-#if defined _WIN32
-#include  // for 
boost::filesystem::filesystem_error
-#include 
-#include 
-#include 
-#endif
-
 using namespace com::sun::star;
 
 namespace
@@ -129,33 +120,17 @@ bool ScOrcusFiltersImpl::importODS(ScDocument& rDoc, 
SfxMedium& rMedium) const
 
 bool ScOrcusFiltersImpl::importODS_Styles(ScDocument& rDoc, OUString& aPath) 
const
 {
-OString aPath8 = OUStringToOString(aPath, osl_getThreadTextEncoding());
-
 try
 {
 #if defined _WIN32
-std::unique_ptr content;
-try
-{
-content = std::make_unique(aPath8.getStr());
-}
-catch (const boost::filesystem::filesystem_error&)
-{
-// Maybe the path contains characters not representable in ACP. 
It's not
-// yet possible to pass Unicode path to orcus::file_content ctor - 
see
-// https://gitlab.com/orcus/orcus/-/issues/30; try short path.
-wchar_t buf[32767];
-if (GetShortPathNameW(o3tl::toW(aPath.getStr()), buf, 
std::size(buf)) == 0)
-throw;
-aPath8 = OUStringToOString(o3tl::toU(buf), 
osl_getThreadTextEncoding());
-content = std::make_unique(aPath8);
-}
+OString aPath8 = OUStringToOString(aPath, RTL_TEXTENCODING_UTF8);
 #else
-auto content = std::make_unique(aPath8);
+OString aPath8 = OUStringToOString(aPath, osl_getThreadTextEncoding());
 #endif
+orcus::file_content content(aPath8);
 ScOrcusFactory aFactory(rDoc);
 ScOrcusStyles aStyles(aFactory);
-orcus::import_ods::read_sty

[Libreoffice-commits] core.git: external/liborcus

2022-06-28 Thread Stephan Bergmann (via logerrit)

 external/liborcus/ExternalProject_liborcus.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8a456cc5e371c580d30df539e5fa22d3e7caa6f6
Author: Stephan Bergmann 
AuthorDate: Tue Jun 28 11:45:04 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jun 28 15:45:54 2022 +0200

Fix typo

...that was present since 173214d92046b4ea11f6c0959ca40999d1e0bbd2 "Fix 
liborcus
build for Android" (but doesn't seem to have caused issues all those years)

Change-Id: I70161f20a94655e8f485cd49bec9ce461c7507f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136563
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index e7f929a28b4c..cd86bcf49aa8 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -47,7 +47,7 @@ ifeq ($(OS),ANDROID)
 liborcus_LIBS+=$(gb_STDLIBS)
 endif
 
-liborcus_CPPCLAGS=$(CPPFLAGS)
+liborcus_CPPFLAGS=$(CPPFLAGS)
 ifeq ($(SYSTEM_ZLIB),)
 liborcus_CPPFLAGS+=$(ZLIB_CFLAGS)
 endif

[Libreoffice-commits] core.git: external/liborcus

2022-06-27 Thread Stephan Bergmann (via logerrit)

 external/liborcus/UnpackedTarball_liborcus.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4178d7b2212a9e4ec35b3225c28e50f64132efcb
Author: Stephan Bergmann 
AuthorDate: Mon Jun 27 11:37:39 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Jun 27 15:18:02 2022 +0200

Mark external/liborcus/overrun.patch.0 as upstreamed

Change-Id: Ibc77db49c7b584df1f5f3c086ecd479a28eb7797
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136484
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 12698bab7234..6e78c0ca2c3e 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -25,6 +25,8 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,liborcus))
 # 
https://gitlab.com/orcus/orcus/-/commit/0a99ca6d50af51f1b0a151fdcac5e12ec9b01bf8
 # forcepoint-95.patch.1 submitted as
 # https://gitlab.com/orcus/orcus/-/merge_requests/124
+# overrun.patch.0 submitted as
+# https://gitlab.com/orcus/orcus/-/merge_requests/131
 
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \

[Libreoffice-commits] core.git: external/liborcus

2022-06-24 Thread Stephan Bergmann (via logerrit)

 external/liborcus/UnpackedTarball_liborcus.mk |1 
 external/liborcus/overrun.patch.0 |   63 ++
 2 files changed, 64 insertions(+)

New commits:
commit 3f17a643d0f943d02c7cb2b5d8e702fe0e63e38d
Author: Stephan Bergmann 
AuthorDate: Fri Jun 24 18:21:32 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jun 24 21:36:34 2022 +0200

external/liborcus: Fix heap-buffer-overflow

...as seen during CppunitTest_vcl_pdfexport:

> ==573913==ERROR: AddressSanitizer: heap-buffer-overflow on address 
0x62b0001dba0e at pc 0x560576627186 bp 0x7ffeab9fa730 sp 0x7ffeab9f9ef0
> READ of size 26624 at 0x62b0001dba0e thread T0
>  #0 in StrtolFixAndCheck(void*, char const*, char**, char*, int) at 
~/github.com/llvm/llvm-project/compiler-rt/lib/asan/../sanitizer_common/sanitizer_common_interceptors.inc:3629:3
>  #1 in strtol at 
~/github.com/llvm/llvm-project/compiler-rt/lib/asan/asan_interceptors.cpp:485:3
>  #2 in 
orcus::sax_token_handler_wrapper_base::attribute(std::basic_string_view>, std::basic_string_view>) 
at workdir/UnpackedTarball/liborcus/src/parser/sax_token_parser.cpp:344:22
>  #3 in 
orcus::sax_ns_parser::handler_wrapper>::handler_wrapper::attribute(orcus::sax::parser_attribute
 const&) at 
workdir/UnpackedTarball/liborcus/src/liborcus/../../include/orcus/sax_ns_parser.hpp:212:27
>  #4 in 
orcus::sax_parser::handler_wrapper>::handler_wrapper,
 orcus::sax_parser_default_config>::attribute() at 
workdir/UnpackedTarball/liborcus/src/liborcus/../../include/orcus/sax_parser.hpp:570:15
>  #5 in 
orcus::sax_parser::handler_wrapper>::handler_wrapper,
 orcus::sax_parser_default_config>::declaration(char const*) at 
workdir/UnpackedTarball/liborcus/src/liborcus/../../include/orcus/sax_parser.hpp:389:9
>  #6 in 
orcus::sax_parser::handler_wrapper>::handler_wrapper,
 orcus::sax_parser_default_config>::element() at 
workdir/UnpackedTarball/liborcus/src/liborcus/../../include/orcus/sax_parser.hpp:242:13
>  #7 in 
orcus::sax_parser::handler_wrapper>::handler_wrapper,
 orcus::sax_parser_default_config>::body() at 
workdir/UnpackedTarball/liborcus/src/liborcus/../../include/orcus/sax_parser.hpp:214:13
>  #8 in 
orcus::sax_parser::handler_wrapper>::handler_wrapper,
 orcus::sax_parser_default_config>::parse() at 
workdir/UnpackedTarball/liborcus/src/liborcus/../../include/orcus/sax_parser.hpp:182:5
>  #9 in 
orcus::sax_ns_parser::handler_wrapper>::parse()
 at 
workdir/UnpackedTarball/liborcus/src/liborcus/../../include/orcus/sax_ns_parser.hpp:277:14
>  #10 in orcus::sax_token_parser::parse() at 
workdir/UnpackedTarball/liborcus/src/liborcus/../../include/orcus/sax_token_parser.hpp:215:14
>  #11 in orcus::xml_stream_parser::parse() at 
workdir/UnpackedTarball/liborcus/src/liborcus/xml_stream_parser.cpp:68:9
>  #12 in orcus::orcus_xls_xml::detect(unsigned char const*, unsigned long) 
at workdir/UnpackedTarball/liborcus/src/liborcus/orcus_xls_xml.cpp:94:16
>  #13 in orcus::detect(unsigned char const*, unsigned long) at 
workdir/UnpackedTarball/liborcus/src/liborcus/format_detection.cpp:68:9
>  #14 in (anonymous 
namespace)::OrcusFormatDetect::detect(com::sun::star::uno::Sequence&)
 at sc/source/filter/orcus/filterdetect.cxx:83:31
> 0x62b0001dba0e is located 0 bytes to the right of 26638-byte region 
[0x62b0001d5200,0x62b0001dba0e)
> allocated by thread T0 here:
>  #0 in operator new[](unsigned long) at 
~/github.com/llvm/llvm-project/compiler-rt/lib/asan/asan_new_delete.cpp:98:3
>  #1 in SvMemoryStream::AllocateMemory(unsigned long) at 
tools/source/stream/stream.cxx:1698:12
>  #2 in SvMemoryStream::SvMemoryStream(unsigned long, unsigned long) at 
tools/source/stream/stream.cxx:1544:9
>  #3 in (anonymous 
namespace)::OrcusFormatDetect::detect(com::sun::star::uno::Sequence&)
 at sc/source/filter/orcus/filterdetect.cxx:71:20

This started to occur now after a95c585433246813096e8890b7ed6ef4fe30c621 
"Pump
XInputStream into an SvMemoryStream rather than an OStringBuffer" no longer
guarantees that the memory range passed into

  orcus::detect(const unsigned char* buffer, size_t length)

is followed by a null byte at buffer[length].  (There appears to be no
documentation for that function, but it looks unreasonable to me that it 
should
require callers to provide a buffer thus terminated, and I rather assume 
that
what is observed here is an orcus bug.)

The problematic calls of std::strtol were used in code apparently meant to 
parse
strings matching the XML VersionNum grammar production, and then store the 
two
dot-separated numbers each as uint8_t.  The new code using a local readUint8
accepts a different set of strings now than the original code using 
std::strtol,
but the new set is arguably closer to what the actual XML VersionNum grammar
production accepts (which is '1.' [0-9]+ for XML 1.0 and '1.1' for XML 
1.

[Libreoffice-commits] core.git: external/liborcus

2022-03-30 Thread Caolán McNamara (via logerrit)

 external/liborcus/UnpackedTarball_liborcus.mk |   15 +++
 external/liborcus/forcepoint-95.patch.1   |   11 +++
 2 files changed, 22 insertions(+), 4 deletions(-)

New commits:
commit 0b9892fee990b7f6d0457ab6191f87c3991580e6
Author: Caolán McNamara 
AuthorDate: Wed Mar 30 12:59:46 2022 +0100
Commit: Caolán McNamara 
CommitDate: Wed Mar 30 16:19:53 2022 +0200

forcepoint#95 read past end of malformed document

Change-Id: I8b2c558c733af3d7662f668af47e962e252ee339
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132311
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 562ab4e5fcd7..eaa730255071 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -15,10 +15,16 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
 
-# forcepoint-83.patch.1 submitted as
-# https://gitlab.com/orcus/orcus/-/merge_requests/117
-# forcepoint-84.patch.1 submitted as
-# https://gitlab.com/orcus/orcus/-/merge_requests/118
+# forcepoint-83.patch.1 merged as
+# 
https://gitlab.com/orcus/orcus/-/commit/9f6400b8192e39fefd475a96222713e9e9c60038
+# forcepoint-84.patch.1 merged as
+# 
https://gitlab.com/orcus/orcus/-/commit/223defe95d6f20f1bc5fd22fecc80a79a9519028
+# forcepoint-87.patch.1 merged as
+# 
https://gitlab.com/orcus/orcus/-/commit/a718524ca424fb8a7e7931345a118342d1d4a507
+# forcepoint-88.patch.1 merged as
+# 
https://gitlab.com/orcus/orcus/-/commit/0a99ca6d50af51f1b0a151fdcac5e12ec9b01bf8
+# forcepoint-95.patch.1 submitted as
+# https://gitlab.com/orcus/orcus/-/merge_requests/124
 
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
@@ -31,6 +37,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/forcepoint-84.patch.1 \
external/liborcus/forcepoint-87.patch.1 \
external/liborcus/forcepoint-88.patch.1 \
+   external/liborcus/forcepoint-95.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/forcepoint-95.patch.1 
b/external/liborcus/forcepoint-95.patch.1
new file mode 100644
index ..93dc822298b0
--- /dev/null
+++ b/external/liborcus/forcepoint-95.patch.1
@@ -0,0 +1,11 @@
+--- a/include/orcus/sax_parser.hpp 2022-03-30 10:54:44.043568760 +0100
 b/include/orcus/sax_parser.hpp 2022-03-30 10:54:55.645037322 +0100
+@@ -547,7 +547,7 @@
+ 
+ skip_space_and_control();
+ 
+-char c = cur_char();
++char c = cur_char_checked();
+ if (c != '=')
+ {
+ std::ostringstream os;

[Libreoffice-commits] core.git: external/liborcus

2022-03-24 Thread Caolán McNamara (via logerrit)

 external/liborcus/forcepoint-83.patch.1 |   16 
 external/liborcus/forcepoint-84.patch.1 |   16 
 2 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 2323fa29617e4919226517d50abbb9ad33b320ca
Author: Caolán McNamara 
AuthorDate: Thu Mar 24 08:56:39 2022 +
Commit: Caolán McNamara 
CommitDate: Thu Mar 24 17:26:39 2022 +0100

forcepoint#83 forcepoint#84 update to upstream fix

Change-Id: I5add09b4379a1f86a720af75b758389424f4f50b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132055
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/external/liborcus/forcepoint-83.patch.1 
b/external/liborcus/forcepoint-83.patch.1
index bfd3bb86fcf9..644c0dcfff4e 100644
--- a/external/liborcus/forcepoint-83.patch.1
+++ b/external/liborcus/forcepoint-83.patch.1
@@ -1,4 +1,4 @@
-From 283b45ba3bcb22dc28303a09a96c9b94f86d1ba2 Mon Sep 17 00:00:00 2001
+From 4d58816e995a562f26f3cc5006ae9ddd46b1bbed Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
 Date: Wed, 23 Mar 2022 16:44:00 +
 Subject: [PATCH] forcepoint#83 Invalid read of size 1
@@ -17,22 +17,22 @@ Subject: [PATCH] forcepoint#83 Invalid read of size 1
 ==343916==by 0x30E60945: (anonymous 
namespace)::OrcusFormatDetect::detect(com::sun::star::uno::Sequence&)
 (filterdetect.cxx:83)
 ==343916==by 0x30E60ABE: non-virtual thunk to (anonymous 
namespace)::OrcusFormatDetect::detect(com::sun::star::uno::Sequence&)
 (filterdetect.cxx:0)
 ---
- include/orcus/sax_parser.hpp | 2 ++
- 1 file changed, 2 insertions(+)
+ include/orcus/sax_parser.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/orcus/sax_parser.hpp b/include/orcus/sax_parser.hpp
-index 15e8d917..d0fc45b5 100644
+index 15e8d917..2e707568 100644
 --- a/include/orcus/sax_parser.hpp
 +++ b/include/orcus/sax_parser.hpp
-@@ -255,6 +255,8 @@ void 
sax_parser<_Handler,_Config>::element_open(std::ptrdiff_t begin_pos)
+@@ -255,7 +255,7 @@ void 
sax_parser<_Handler,_Config>::element_open(std::ptrdiff_t begin_pos)
  while (true)
  {
  skip_space_and_control();
-+if (!has_char())
-+return;
- char c = cur_char();
+-char c = cur_char();
++char c = cur_char_checked();
  if (c == '/')
  {
+ // Self-closing element: 
 -- 
 2.35.1
 
diff --git a/external/liborcus/forcepoint-84.patch.1 
b/external/liborcus/forcepoint-84.patch.1
index 99aa0b9623b5..bbe05340bc63 100644
--- a/external/liborcus/forcepoint-84.patch.1
+++ b/external/liborcus/forcepoint-84.patch.1
@@ -1,4 +1,4 @@
-From 0fee6c0e3074be11874f1911a76f10eef5f59985 Mon Sep 17 00:00:00 2001
+From ec469f774bb91302c4df21eff1314dfd508d37c8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
 Date: Wed, 23 Mar 2022 20:04:31 +
 Subject: [PATCH] forcepoint#84 Invalid read of size 1
@@ -17,22 +17,22 @@ Subject: [PATCH] forcepoint#84 Invalid read of size 1
 ==356879==by 0x11BE3855: orcus::orcus_xlsx::detect(unsigned char const*, 
unsigned long) (orcus_xlsx.cpp:188)
 ==356879==by 0x11AB2492: orcus::detect(unsigned char const*, unsigned 
long) (format_detection.cpp:60)
 ---
- src/parser/sax_parser_base.cpp | 2 ++
- 1 file changed, 2 insertions(+)
+ src/parser/sax_parser_base.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/parser/sax_parser_base.cpp b/src/parser/sax_parser_base.cpp
-index 46acb81d..11791edc 100644
+index 46acb81d..1cee821e 100644
 --- a/src/parser/sax_parser_base.cpp
 +++ b/src/parser/sax_parser_base.cpp
-@@ -300,6 +300,8 @@ void parser_base::value_with_encoded_char(cell_buffer& 
buf, std::string_view& st
+@@ -300,7 +300,7 @@ void parser_base::value_with_encoded_char(cell_buffer& 
buf, std::string_view& st
  
  bool parser_base::value(std::string_view& str, bool decode)
  {
-+if (!has_char())
-+throw malformed_xml_error("value must be quoted", offset());
- char c = cur_char();
+-char c = cur_char();
++char c = cur_char_checked();
  if (c != '"' && c != '\'')
  throw malformed_xml_error("value must be quoted", offset());
+ 
 -- 
 2.35.1

[Libreoffice-commits] core.git: external/liborcus

2022-03-24 Thread Caolán McNamara (via logerrit)

 external/liborcus/UnpackedTarball_liborcus.mk |3 ++
 external/liborcus/forcepoint-84.patch.1   |   38 ++
 2 files changed, 41 insertions(+)

New commits:
commit d6a02a99eaa3690c0aa5c33fea3a4c710813a0de
Author: Caolán McNamara 
AuthorDate: Wed Mar 23 20:08:19 2022 +
Commit: Caolán McNamara 
CommitDate: Thu Mar 24 10:28:43 2022 +0100

forcepoint#84 Invalid read of size 1

Change-Id: I1d0d74940cfa78a3c88cee737c9535acf03e0f19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131991
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index a87da7edb88d..8f41fdbf9173 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -17,6 +17,8 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,liborcus))
 
 # forcepoint-83.patch.1 submitted as
 # https://gitlab.com/orcus/orcus/-/merge_requests/117
+# forcepoint-84.patch.1 submitted as
+# https://gitlab.com/orcus/orcus/-/merge_requests/118
 
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
@@ -26,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/liborcus_newline.patch.1 \
external/liborcus/std-get-busted.patch.1 \
external/liborcus/forcepoint-83.patch.1 \
+   external/liborcus/forcepoint-84.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/forcepoint-84.patch.1 
b/external/liborcus/forcepoint-84.patch.1
new file mode 100644
index ..99aa0b9623b5
--- /dev/null
+++ b/external/liborcus/forcepoint-84.patch.1
@@ -0,0 +1,38 @@
+From 0fee6c0e3074be11874f1911a76f10eef5f59985 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
+Date: Wed, 23 Mar 2022 20:04:31 +
+Subject: [PATCH] forcepoint#84 Invalid read of size 1
+
+==356879== Invalid read of size 1
+==356879==at 0x11EC50B0: orcus::parser_base::cur_char() const 
(parser_base.hpp:79)
+==356879==by 0x11EDD736: 
orcus::sax::parser_base::value(std::basic_string_view >&, bool) (sax_parser_base.cpp:303)
+==356879==by 0x11B7C3D5: 
orcus::sax_parser::handler_wrapper>::handler_wrapper,
 orcus::sax_parser_default_config>::attribute() (sax_parser.hpp:563)
+==356879==by 0x11B7B35E: 
orcus::sax_parser::handler_wrapper>::handler_wrapper,
 orcus::sax_parser_default_config>::element_open(long) (sax_parser.hpp:292)
+==356879==by 0x11B7A2F7: 
orcus::sax_parser::handler_wrapper>::handler_wrapper,
 orcus::sax_parser_default_config>::element() (sax_parser.hpp:246)
+==356879==by 0x11B7A1C7: 
orcus::sax_parser::handler_wrapper>::handler_wrapper,
 orcus::sax_parser_default_config>::body() (sax_parser.hpp:214)
+==356879==by 0x11B7A009: 
orcus::sax_parser::handler_wrapper>::handler_wrapper,
 orcus::sax_parser_default_config>::parse() (sax_parser.hpp:182)
+==356879==by 0x11B79FBB: 
orcus::sax_ns_parser::handler_wrapper>::parse()
 (sax_ns_parser.hpp:277)
+==356879==by 0x11B79798: 
orcus::sax_token_parser::parse() 
(sax_token_parser.hpp:215)
+==356879==by 0x11B79436: orcus::xml_stream_parser::parse() 
(xml_stream_parser.cpp:68)
+==356879==by 0x11BE3855: orcus::orcus_xlsx::detect(unsigned char const*, 
unsigned long) (orcus_xlsx.cpp:188)
+==356879==by 0x11AB2492: orcus::detect(unsigned char const*, unsigned 
long) (format_detection.cpp:60)
+---
+ src/parser/sax_parser_base.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/parser/sax_parser_base.cpp b/src/parser/sax_parser_base.cpp
+index 46acb81d..11791edc 100644
+--- a/src/parser/sax_parser_base.cpp
 b/src/parser/sax_parser_base.cpp
+@@ -300,6 +300,8 @@ void parser_base::value_with_encoded_char(cell_buffer& 
buf, std::string_view& st
+ 
+ bool parser_base::value(std::string_view& str, bool decode)
+ {
++if (!has_char())
++throw malformed_xml_error("value must be quoted", offset());
+ char c = cur_char();
+ if (c != '"' && c != '\'')
+ throw malformed_xml_error("value must be quoted", offset());
+-- 
+2.35.1
+

[Libreoffice-commits] core.git: external/liborcus

2022-03-23 Thread Caolán McNamara (via logerrit)

 external/liborcus/UnpackedTarball_liborcus.mk |5 ++-
 external/liborcus/forcepoint-83.patch.1   |   38 ++
 2 files changed, 41 insertions(+), 2 deletions(-)

New commits:
commit ee3e6c66ee9670ce4554b46f27467eda80632775
Author: Caolán McNamara 
AuthorDate: Wed Mar 23 16:49:03 2022 +
Commit: Caolán McNamara 
CommitDate: Wed Mar 23 21:10:32 2022 +0100

forcepoint#83 Invalid read of size 1

Change-Id: I1576dfd8c9731d943107764aeb66bb1c2294ad5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131983
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 87e462e33d91..a87da7edb88d 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -15,8 +15,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
 
-# crashtesting-crash-on-passing-null-to-std-string_vie.patch.1 submitted as
-# https://gitlab.com/orcus/orcus/-/merge_requests/113
+# forcepoint-83.patch.1 submitted as
+# https://gitlab.com/orcus/orcus/-/merge_requests/117
 
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
@@ -25,6 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/fix-pch.patch.0 \
external/liborcus/liborcus_newline.patch.1 \
external/liborcus/std-get-busted.patch.1 \
+   external/liborcus/forcepoint-83.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/forcepoint-83.patch.1 
b/external/liborcus/forcepoint-83.patch.1
new file mode 100644
index ..bfd3bb86fcf9
--- /dev/null
+++ b/external/liborcus/forcepoint-83.patch.1
@@ -0,0 +1,38 @@
+From 283b45ba3bcb22dc28303a09a96c9b94f86d1ba2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
+Date: Wed, 23 Mar 2022 16:44:00 +
+Subject: [PATCH] forcepoint#83 Invalid read of size 1
+
+==343916== Invalid read of size 1
+==343916==at 0x11A7B2F0: orcus::parser_base::cur_char() const 
(parser_base.hpp:79)
+==343916==by 0x11B7B112: 
orcus::sax_parser::handler_wrapper>::handler_wrapper,
 orcus::sax_parser_default_config>::element_open(long) (sax_parser.hpp:258)
+==343916==by 0x11B7A2C7: 
orcus::sax_parser::handler_wrapper>::handler_wrapper,
 orcus::sax_parser_default_config>::element() (sax_parser.hpp:246)
+==343916==by 0x11B7A197: 
orcus::sax_parser::handler_wrapper>::handler_wrapper,
 orcus::sax_parser_default_config>::body() (sax_parser.hpp:214)
+==343916==by 0x11B79FD9: 
orcus::sax_parser::handler_wrapper>::handler_wrapper,
 orcus::sax_parser_default_config>::parse() (sax_parser.hpp:182)
+==343916==by 0x11B79F8B: 
orcus::sax_ns_parser::handler_wrapper>::parse()
 (sax_ns_parser.hpp:277)
+==343916==by 0x11B79768: 
orcus::sax_token_parser::parse() 
(sax_token_parser.hpp:215)
+==343916==by 0x11B79406: orcus::xml_stream_parser::parse() 
(xml_stream_parser.cpp:68)
+==343916==by 0x11BE3805: orcus::orcus_xlsx::detect(unsigned char const*, 
unsigned long) (orcus_xlsx.cpp:188)
+==343916==by 0x11AB2482: orcus::detect(unsigned char const*, unsigned 
long) (format_detection.cpp:60)
+==343916==by 0x30E60945: (anonymous 
namespace)::OrcusFormatDetect::detect(com::sun::star::uno::Sequence&)
 (filterdetect.cxx:83)
+==343916==by 0x30E60ABE: non-virtual thunk to (anonymous 
namespace)::OrcusFormatDetect::detect(com::sun::star::uno::Sequence&)
 (filterdetect.cxx:0)
+---
+ include/orcus/sax_parser.hpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/orcus/sax_parser.hpp b/include/orcus/sax_parser.hpp
+index 15e8d917..d0fc45b5 100644
+--- a/include/orcus/sax_parser.hpp
 b/include/orcus/sax_parser.hpp
+@@ -255,6 +255,8 @@ void 
sax_parser<_Handler,_Config>::element_open(std::ptrdiff_t begin_pos)
+ while (true)
+ {
+ skip_space_and_control();
++if (!has_char())
++return;
+ char c = cur_char();
+ if (c == '/')
+ {
+-- 
+2.35.1
+

[Libreoffice-commits] core.git: external/liborcus

2022-02-20 Thread Jan-Marek Glogowski (via logerrit)

 external/liborcus/ExternalProject_liborcus.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 26603bc9ef0116ed31c510dab82b69d3666447b5
Author: Jan-Marek Glogowski 
AuthorDate: Thu Feb 10 09:38:40 2022 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Sun Feb 20 20:43:57 2022 +0100

WASM fix orcus native exception handling (NEH)

While this fixes the build with --enable-wasm-exceptions, the
resulting binary generates an "indirect call signature mismatch",
which doesn't happen with the non-NEH build.

The Chrome DWARF backtrace points to CallbackTaskScheduling().
Further debugging reveals, it's actually the UpdateMinPeriod
call for the "desktop::Desktop m_firstRunTimer" Timer.
Disturbingly the debug dynamic_cast at the start of the
job loop fails, and the fallback generic job output is
chosen, AKA:

info:vcl.schedule: 6516 0x3871618  i: 0 a: 1 p: 1 \
desktop::Desktop m_firstRunTimer

m_firstRunTimer is a Timer member in the Desktop class, so this
looks like some memory corruption or toolchain problem.

The size difference is more then 10% and it's supposed to be
faster too. FWIW the optimized link time is still high and needs
32GB+ memory compared to the 13GB non-optimized memory usage.

Change-Id: I06d37ecece09000fd3b72a73e7bf40f0b0f61457
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130216
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index 638271a5a398..d067b741146a 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -91,8 +91,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
$(call gb_ExternalProject_run,build,\
$(if $(liborcus_LIBS),LIBS='$(liborcus_LIBS)') \
$(if $(liborcus_CXXFLAGS),CXXFLAGS='$(liborcus_CXXFLAGS)') \
-   $(if $(liborcus_CPPFLAGS),CPPFLAGS='$(liborcus_CPPFLAGS) 
$(gb_EMSCRIPTEN_CPPFLAGS)') \
-   $(if $(liborcus_LDFLAGS),LDFLAGS='$(liborcus_LDFLAGS)') \
+   $(if $(liborcus_CPPFLAGS),CPPFLAGS='$(liborcus_CPPFLAGS) 
$(gb_EMSCRIPTEN_CPPFLAGS) $(gb_EMSCRIPTEN_EXCEPT)') \
+   $(if $(liborcus_LDFLAGS),LDFLAGS='$(liborcus_LDFLAGS) 
$(gb_EMSCRIPTEN_EXCEPT)') \
MDDS_CFLAGS='$(MDDS_CFLAGS)' \
MDDS_LIBS=' ' \
MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure \

[Libreoffice-commits] core.git: external/liborcus

2021-11-17 Thread Caolán McNamara (via logerrit)

 external/liborcus/UnpackedTarball_liborcus.mk  
|4 +
 external/liborcus/crashtesting-crash-on-passing-null-to-std-string_vie.patch.1 
|   27 ++
 2 files changed, 31 insertions(+)

New commits:
commit 037d5454a39260635aeb7064ac32c7a485af8197
Author: Caolán McNamara 
AuthorDate: Wed Nov 17 10:27:03 2021 +
Commit: Caolán McNamara 
CommitDate: Wed Nov 17 13:43:22 2021 +0100

crashtesting: crash on passing null to std::string_view

with many documents, e.g. moz377878-1.xhtml

https: //gitlab.com/orcus/orcus/-/merge_requests/113
Change-Id: I085543ebb28c02a1c0ec487b357f6e0a83004363
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125378
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 3d2cec42e55e..86c30431e05d 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -15,6 +15,9 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
 
+# crashtesting-crash-on-passing-null-to-std-string_vie.patch.1 submitted as
+# https://gitlab.com/orcus/orcus/-/merge_requests/113
+
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
external/liborcus/gcc9.patch.0 \
@@ -25,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/unused-variables.patch.1 \
external/liborcus/boost-filesystem.patch.1 \
external/liborcus/std-get-busted.patch.1 \
+   
external/liborcus/crashtesting-crash-on-passing-null-to-std-string_vie.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
diff --git 
a/external/liborcus/crashtesting-crash-on-passing-null-to-std-string_vie.patch.1
 
b/external/liborcus/crashtesting-crash-on-passing-null-to-std-string_vie.patch.1
new file mode 100644
index ..97e7b8366fde
--- /dev/null
+++ 
b/external/liborcus/crashtesting-crash-on-passing-null-to-std-string_vie.patch.1
@@ -0,0 +1,27 @@
+From ed21a93e132b968d8cd91aa080e1f90e980267c7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
+Date: Wed, 17 Nov 2021 10:21:32 +
+Subject: [PATCH] crashtesting: crash on passing null to std::string_view
+
+with many documents, e.g. moz377878-1.xhtml
+---
+ src/parser/xml_namespace.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/parser/xml_namespace.cpp b/src/parser/xml_namespace.cpp
+index 07942563..66077d9c 100644
+--- a/src/parser/xml_namespace.cpp
 b/src/parser/xml_namespace.cpp
+@@ -223,7 +223,8 @@ xmlns_id_t xmlns_context::push(std::string_view key, 
std::string_view uri)
+ #endif
+ mp_impl->m_trim_all_ns = true;
+ 
+-std::string_view uri_interned = mp_impl->repo->intern(uri);
++xmlns_id_t id = mp_impl->repo->intern(uri);
++std::string_view uri_interned = id ? std::string_view(id) : 
std::string_view();
+ 
+ if (key.empty())
+ {
+-- 
+2.33.1
+

[Libreoffice-commits] core.git: external/liborcus external/zxing

2021-05-03 Thread Michael Stahl (via logerrit)

 external/liborcus/liborcus_newline.patch.1 |2 ++
 external/zxing/zxing_newline.patch.1   |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 1e7a8b7ff63a425de9ba631e44bfa6b8cca76e04
Author: Michael Stahl 
AuthorDate: Mon May 3 12:04:23 2021 +0200
Commit: Michael Stahl 
CommitDate: Mon May 3 13:21:15 2021 +0200

liborcus,zxing: add link to GCC bug

Change-Id: I9420e786c4050a9ae79f1deab76a43e62c3b15fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115031
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/external/liborcus/liborcus_newline.patch.1 
b/external/liborcus/liborcus_newline.patch.1
index 421c30846b27..5b2038d5cc12 100644
--- a/external/liborcus/liborcus_newline.patch.1
+++ b/external/liborcus/liborcus_newline.patch.1
@@ -4,6 +4,8 @@ without this, compiling output of GCC 11 -E -fdirectives-only 
fails with:
 
 ooxml_tokens.inl:3524:32: error: stray '#' in program
 
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100392
+
 --- liborcus/src/liborcus/ooxml_tokens.inl.orig2021-05-01 
18:12:37.490131155 +0200
 +++ liborcus/src/liborcus/ooxml_tokens.inl 2021-05-01 18:12:50.994119453 
+0200
 @@ -3521,4 +3521,4 @@
diff --git a/external/zxing/zxing_newline.patch.1 
b/external/zxing/zxing_newline.patch.1
index 5b51ba7a2027..57673e431d00 100644
--- a/external/zxing/zxing_newline.patch.1
+++ b/external/zxing/zxing_newline.patch.1
@@ -8,6 +8,8 @@ and compiling that fails with:
 
 KRHangulMapping.h:38:55: error: stray '#' in program
 
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100392
+
 --- zxing/core/src/textcodec/KRHangulMapping.h.orig2021-05-01 
18:00:09.011795242 +0200
 +++ zxing/core/src/textcodec/KRHangulMapping.h 2021-05-01 18:00:16.774788294 
+0200
 @@ -35,4 +35,4 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2021-05-01 Thread Michael Stahl (via logerrit)

 external/liborcus/UnpackedTarball_liborcus.mk |1 +
 external/liborcus/liborcus_newline.patch.1|   15 +++
 2 files changed, 16 insertions(+)

New commits:
commit aa38eede9d340cbb11a792ab1ebbe681521a4489
Author: Michael Stahl 
AuthorDate: Sat May 1 18:19:27 2021 +0200
Commit: Michael Stahl 
CommitDate: Sat May 1 20:42:35 2021 +0200

liborcus: newline problem with GCC 11 -E -fdirectives-only

ooxml_tokens.inl:3524:32: error: stray '#' in program

Change-Id: Ib7f50e1798e8c985f31a0338944ae1e9b439e98f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114975
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 3b54db0e49ce..710d126a8c17 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/libtool.patch.0 \
external/liborcus/fix-pch.patch.0 \
external/liborcus/include.patch.0 \
+   external/liborcus/liborcus_newline.patch.1 \
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
diff --git a/external/liborcus/liborcus_newline.patch.1 
b/external/liborcus/liborcus_newline.patch.1
new file mode 100644
index ..421c30846b27
--- /dev/null
+++ b/external/liborcus/liborcus_newline.patch.1
@@ -0,0 +1,15 @@
+Add newline at end of KRHangulMapping.h
+
+without this, compiling output of GCC 11 -E -fdirectives-only fails with:
+
+ooxml_tokens.inl:3524:32: error: stray '#' in program
+
+--- liborcus/src/liborcus/ooxml_tokens.inl.orig2021-05-01 
18:12:37.490131155 +0200
 liborcus/src/liborcus/ooxml_tokens.inl 2021-05-01 18:12:50.994119453 
+0200
+@@ -3521,4 +3521,4 @@
+ "zoomToFit"  // 3517
+ };
+ 
+-size_t token_name_count = 3518;
+\ No newline at end of file
++size_t token_name_count = 3518;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2021-04-30 Thread Luboš Luňák (via logerrit)

 external/liborcus/UnpackedTarball_liborcus.mk|4 
 external/liborcus/allow-utf-8-in-xml-names.patch |  301 +++
 2 files changed, 305 insertions(+)

New commits:
commit 6b7c2fa65eb68be520ed4135cc245e33fa22e8bf
Author: Luboš Luňák 
AuthorDate: Thu Apr 29 20:10:34 2021 +0200
Commit: Luboš Luňák 
CommitDate: Fri Apr 30 11:23:36 2021 +0200

allow utf-8 in xml names (liborcus) (tdf#141672)

Change-Id: Ib150d55b588a572e4352396f18de2331983b2aae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114892
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 113e8e25818d..3b54db0e49ce 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -23,6 +23,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/include.patch.0 \
 ))
 
+$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
+   external/liborcus/allow-utf-8-in-xml-names.patch \
+))
+
 ifeq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/windows-constants-hack.patch \
diff --git a/external/liborcus/allow-utf-8-in-xml-names.patch 
b/external/liborcus/allow-utf-8-in-xml-names.patch
new file mode 100644
index ..e3430881053d
--- /dev/null
+++ b/external/liborcus/allow-utf-8-in-xml-names.patch
@@ -0,0 +1,301 @@
+From fa9b6845ed583f5486372c6ffbc59e02a140d303 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= 
+Date: Thu, 29 Apr 2021 19:12:20 +0200
+Subject: [PATCH] allow utf-8 in xml names (#137)
+
+https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-NameStartChar
+has a list of all allowed characters.
+---
+ include/orcus/sax_parser_base.hpp |   3 +
+ src/orcus_test_xml.cpp|   1 +
+ src/parser/sax_parser_base.cpp| 201 --
+ test/xml/non-ascii/check.txt  |   4 +
+ test/xml/non-ascii/input.xml  |   4 +
+ 5 files changed, 201 insertions(+), 12 deletions(-)
+ create mode 100644 test/xml/non-ascii/check.txt
+ create mode 100644 test/xml/non-ascii/input.xml
+
+diff --git a/include/orcus/sax_parser_base.hpp 
b/include/orcus/sax_parser_base.hpp
+index 9939e133..8394c07b 100644
+--- a/include/orcus/sax_parser_base.hpp
 b/include/orcus/sax_parser_base.hpp
+@@ -218,6 +218,9 @@ protected:
+ void element_name(parser_element& elem, std::ptrdiff_t begin_pos);
+ void attribute_name(pstring& attr_ns, pstring& attr_name);
+ void characters_with_encoded_char(cell_buffer& buf);
++
++int is_name_char();
++int is_name_start_char();
+ };
+ 
+ }}
+diff --git a/src/orcus_test_xml.cpp b/src/orcus_test_xml.cpp
+index 8a864d68..35f3dea7 100644
+--- a/src/orcus_test_xml.cpp
 b/src/orcus_test_xml.cpp
+@@ -77,6 +77,7 @@ const char* sax_parser_test_dirs[] = {
+ SRCDIR"/test/xml/no-decl-1/",
+ SRCDIR"/test/xml/underscore-identifier/",
+ SRCDIR"/test/xml/self-closing-root/",
++SRCDIR"/test/xml/non-ascii/",
+ };
+ 
+ const char* sax_parser_parse_only_test_dirs[] = {
+diff --git a/src/parser/sax_parser_base.cpp b/src/parser/sax_parser_base.cpp
+index 97aa34ec..db51ff94 100644
+--- a/src/parser/sax_parser_base.cpp
 b/src/parser/sax_parser_base.cpp
+@@ -328,20 +328,182 @@ bool parser_base::value(pstring& str, bool decode)
+ return transient_stream();
+ }
+ 
++// https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-NameStartChar
++// Return length of the character in bytes, otherwise 0.
++template< bool only_start_name >
++static
++int is_name_char_helper(const char* mp_char, const char* mp_end)
++{
++const unsigned char first = mp_char[0];
++// Note that ':' technically is an allowed name character, but it is 
handled separately
++// e.g. in element_name(), so here pretend it isn't.
++if (/*first == ':' ||*/ first == '_' || (first >= 'A' && first <= 'Z') || 
(first >= 'a' && first <= 'z'))
++return 1;
++if (!only_start_name && (first == '-' || first == '.' || (first >= '0' && 
first <= '9')))
++return 1;
++
++if (first < 0x7f) // other ascii characters are not allowed
++return 0;
++if (mp_end < mp_char + 1)
++return 0;
++const unsigned char second = mp_char[1];
++
++// 0xb7 = 0xc2 0xb7 utf-8
++if (!only_start_name && first == 0xc2 && second == 0xb7)
++return 2;
++
++// [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF]
++// 0xc0 = 0xc3 0x80 utf-8
++if (first < 0xc3)
++return 0;
++// xd7 = 0xc3 0x97 utf-8, 0xf7 = 0xc3 0xb7 utf-8
++if (first == 0xc3)
++return second >= 0x80 && second <= 0xff && second != 0x97 && second 
!= 0xb7 ? 2 : 0;
++// 0x2ff = 0xcb 0xbf utf-8, 0x300 = 0xcc 0x80 utf-8
++if (first >= 0xc4 && first <= 0xcb)
++return 2;
++
++// [#x0300-#x036F]
++// 0x0300 = 0xcc 0x80 utf-8, 0x36f = 0xcd 0xaf utf-8
++if (!only_start_name

[Libreoffice-commits] core.git: external/liborcus

2020-10-08 Thread Stephan Bergmann (via logerrit)

 external/liborcus/UnpackedTarball_liborcus.mk |1 
 external/liborcus/include.patch.0 |   30 ++
 2 files changed, 31 insertions(+)

New commits:
commit a9976a958b2857e308c6598532151878615bfd9f
Author: Stephan Bergmann 
AuthorDate: Wed Oct 7 22:29:46 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 8 14:27:39 2020 +0200

external/liborcus: Missing includes

...as seen with recent GCC 11 trunk libstdc++:

> orcus_xlsx.cpp: In function ‘size_t 
orcus::{anonymous}::get_schema_rank(orcus::schema_t)’:
> orcus_xlsx.cpp:313:59: error: incomplete type ‘std::numeric_limits’ used in nested name specifier
>   313 | return it == rank_map.end() ? numeric_limits::max() : 
it->second;
>   |   ^~~

etc.

Change-Id: If92cfb565ed9344b2ec1403793d7aeff8bd019ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104074
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index e5e33b0b1249..113e8e25818d 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/gcc9.patch.0 \
external/liborcus/libtool.patch.0 \
external/liborcus/fix-pch.patch.0 \
+   external/liborcus/include.patch.0 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/include.patch.0 
b/external/liborcus/include.patch.0
new file mode 100644
index ..a3275b1b13fa
--- /dev/null
+++ b/external/liborcus/include.patch.0
@@ -0,0 +1,30 @@
+--- src/liborcus/orcus_xlsx.cpp
 src/liborcus/orcus_xlsx.cpp
+@@ -32,6 +32,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+--- src/liborcus/xls_xml_context.cpp
 src/liborcus/xls_xml_context.cpp
+@@ -16,6 +16,7 @@
+ #include 
+ 
+ #include 
++#include 
+ 
+ using namespace std;
+ namespace ss = orcus::spreadsheet;
+--- src/liborcus/xlsx_revision_context.cpp
 src/liborcus/xlsx_revision_context.cpp
+@@ -16,6 +16,7 @@
+ #include "orcus/global.hpp"
+ 
+ #include 
++#include 
+ 
+ using namespace std;
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2020-09-11 Thread Kohei Yoshida (via logerrit)

 
external/liborcus/0001-Alpha-value-of-0-means-fully-transparent.-I-m-sure-2.patch
 |   50 
 external/liborcus/0001-add-xml-path.patch  
   |  119 --
 external/liborcus/0001-workaround-a-linking-problem-on-windows.patch   
   |   45 ---
 external/liborcus/0001-xls-xml-Import-hidden-row-and-column-flags.patch
   |   81 --
 external/liborcus/0001-xls-xml-Pick-up-border-colors.patch 
   |   69 -
 
external/liborcus/0002-We-are-supposed-to-use-the-foreground-color-for-soli.patch
 |   49 
 6 files changed, 413 deletions(-)

New commits:
commit 0ec032b6a42bcf3dee11cfd9f4fc702905b7ba94
Author: Kohei Yoshida 
AuthorDate: Fri Sep 11 21:09:22 2020 -0400
Commit: Kohei Yoshida 
CommitDate: Sat Sep 12 05:49:28 2020 +0200

Remove unused patches.

Change-Id: I2a1dbe15f2df42b4f74e0c00b91ace6c0d3f5f8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102503
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida 

diff --git 
a/external/liborcus/0001-Alpha-value-of-0-means-fully-transparent.-I-m-sure-2.patch
 
b/external/liborcus/0001-Alpha-value-of-0-means-fully-transparent.-I-m-sure-2.patch
deleted file mode 100644
index 6adae9ba2352..
--- 
a/external/liborcus/0001-Alpha-value-of-0-means-fully-transparent.-I-m-sure-2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 98d2b3377da71b713a37f9004acff3c02c22ce2b Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida 
-Date: Wed, 31 Jan 2018 22:11:25 -0500
-Subject: [PATCH 1/2] Alpha value of 0 means fully transparent. I'm sure 255
- was intended.
-
-(cherry picked from commit f7953a814d6a43205791b6cc01c528ef5d4b1ce3)

- src/liborcus/gnumeric_sheet_context.cpp | 4 ++--
- src/liborcus/odf_styles_context.cpp | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/liborcus/gnumeric_sheet_context.cpp 
b/src/liborcus/gnumeric_sheet_context.cpp
-index 8659cc3..6bd1471 100644
 a/src/liborcus/gnumeric_sheet_context.cpp
-+++ b/src/liborcus/gnumeric_sheet_context.cpp
-@@ -132,7 +132,7 @@ public:
- {
- spreadsheet::color_elem_t red, green, blue;
- gnumeric_helper::parse_RGB_color_attribute(red, green, blue, 
attr.value);
--m_styles.set_fill_fg_color(0, red, green, blue);
-+m_styles.set_fill_fg_color(255, red, green, blue);
- 
- m_fill = true;
- 
-@@ -145,7 +145,7 @@ public:
- {
- spreadsheet::color_elem_t red, green, blue;
- gnumeric_helper::parse_RGB_color_attribute(red, green, blue, 
attr.value);
--m_styles.set_fill_bg_color(0, red, green, blue);
-+m_styles.set_fill_bg_color(255, red, green, blue);
- 
- m_fill = true;
- }
-diff --git a/src/liborcus/odf_styles_context.cpp 
b/src/liborcus/odf_styles_context.cpp
-index d988f7d..f9c422a 100644
 a/src/liborcus/odf_styles_context.cpp
-+++ b/src/liborcus/odf_styles_context.cpp
-@@ -739,7 +739,7 @@ void styles_context::start_element(xmlns_id_t ns, 
xml_token_t name, const std::v
- {
- spreadsheet::color_elem_t red, green, blue;
- func.get_background_color(red, green, blue);
--mp_styles->set_fill_bg_color(0, red, green, blue);
-+mp_styles->set_fill_bg_color(255, red, green, blue);
- }
- 
- size_t fill_id = mp_styles->commit_fill();
--- 
-2.7.4
-
diff --git a/external/liborcus/0001-add-xml-path.patch 
b/external/liborcus/0001-add-xml-path.patch
deleted file mode 100644
index 3f9a16bb880f..
--- a/external/liborcus/0001-add-xml-path.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff --git a/include/orcus/xml_structure_tree.hpp 
b/include/orcus/xml_structure_tree.hpp
-index 
58cabfd116fa24e35ff27cf8d7512b6e73df33f4..c88808d24bd74c175fa4017328d3e54b4c588c5e
 100644
 a/include/orcus/xml_structure_tree.hpp
-+++ b/include/orcus/xml_structure_tree.hpp
-@@ -127,6 +127,20 @@ public:
- size_t get_xmlns_index(xmlns_id_t ns) const;
-
- std::string get_xmlns_short_name(xmlns_id_t ns) const;
-+
-+/**
-+ * Get a XPath like ID for the element inside of the XML tree.
-+ *
-+ */
-+std::string get_path() const;
-+
-+/**
-+ * Select an element by a path expression. The path expression may be
-+ * generated by xml_structure_tree::walker::get_path.
-+ *
-+ * @param path a simple XPath like expression
-+ */
-+element select_by_path(const std::string& path);
- };
-
- xml_structure_tree(xmlns_context& xmlns_cxt);
-diff --git a/src/liborcus/xml_structure_tree.cpp 
b/src/liborcus/xml_structure_tree.cpp
-index 
2778bc05f32841a9441bf471913872e119256895..6622bc57cd2595f12bba80d4bbdb5c24cd6e7bc6
 100644
 a/src/liborcus/xml_structure_tree.cpp
-+++ b/

[Libreoffice-commits] core.git: external/liborcus

2019-08-29 Thread Stephan Bergmann (via logerrit)

 external/liborcus/UnpackedTarball_liborcus.mk |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 9eff936dd66161393d08aea1abdb7e65bf6869fd
Author: Stephan Bergmann 
AuthorDate: Thu Aug 29 15:02:36 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Aug 29 19:54:07 2019 +0200

Update comment

external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch has 
been
removed with df2b4a9daa643e66b705a7b39d8988a3d97d731e "Update liborcus to
0.15.2."

Change-Id: I1014e1ff847468b5b6c05ee363c1e6017722fd47
Reviewed-on: https://gerrit.libreoffice.org/78271
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 8ee135fdf5da..f0cbd0db17eb 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -15,9 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
 
-# external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch 
upstreamed as
-#  

 "Blind fix
-#  attempt for older macOS builds":
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
external/liborcus/gcc9.patch.0 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2019-08-27 Thread Stephan Bergmann (via logerrit)

 external/liborcus/UnpackedTarball_liborcus.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit cd4808e2e77fe08d260ecc22177dd7e23a7c5319
Author: Stephan Bergmann 
AuthorDate: Tue Aug 27 13:46:24 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 27 15:09:11 2019 +0200

Record patch as upstreamed

Change-Id: Ib28e86de29cdb5d91e05b341c75b87590e8b3aa6
Reviewed-on: https://gerrit.libreoffice.org/78189
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 393ede86275d..8168fd812b89 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -15,6 +15,9 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
 
+# external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch 
upstreamed as
+#  

 "Blind fix
+#  attempt for older macOS builds":
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
external/liborcus/gcc9.patch.0 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2019-08-23 Thread Stephan Bergmann (via logerrit)

 external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch |   24 
+++---
 1 file changed, 19 insertions(+), 5 deletions(-)

New commits:
commit caabc3f9fc0b7640966bd55ca0a2bc42f255a945
Author: Stephan Bergmann 
AuthorDate: Fri Aug 23 17:08:12 2019 +0200
Commit: Caolán McNamara 
CommitDate: Fri Aug 23 20:23:19 2019 +0200

external/liborcus: Blind fix attempt for older macOS builds, take 3

One more place that needs a workaround like
5c2c08f635c30b732df48faca7ba3d411074e05a "external/liborcus: Blind fix 
attempt
for older macOS builds" and ee02218eb9aaa36f37619cb16bb389762e1785b2
"external/liborcus: Blind fix attempt for older macOS builds, take 2".

Change-Id: I330737e1c31744cd28f753f18edf9c911946b37c
Reviewed-on: https://gerrit.libreoffice.org/78022
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git 
a/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch 
b/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch
index 17bbf6393bf7..a25a42fd2549 100644
--- a/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch
+++ b/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch
@@ -1,4 +1,4 @@
-From 37e7b4629c06c241e2fbd33c1897b384875bcbd3 Mon Sep 17 00:00:00 2001
+From a0d47fff81ac100192ada343574da75d992dd00d Mon Sep 17 00:00:00 2001
 From: Stephan Bergmann 
 Date: Fri, 23 Aug 2019 10:26:51 +0200
 Subject: [PATCH] Blind fix attempt for older macOS builds
@@ -46,11 +46,11 @@ MacOSX10.13.sdk, but not sure with what Clang and libc++ 
versions):
 
 )
 ---
- src/liborcus/xml_map_tree.cpp | 12 
- 1 file changed, 8 insertions(+), 4 deletions(-)
+ src/liborcus/xml_map_tree.cpp | 15 ++-
+ 1 file changed, 10 insertions(+), 5 deletions(-)
 
 diff --git a/src/liborcus/xml_map_tree.cpp b/src/liborcus/xml_map_tree.cpp
-index 8338b930..f66b1ff6 100644
+index 8338b930..1a9251c8 100644
 --- a/src/liborcus/xml_map_tree.cpp
 +++ b/src/liborcus/xml_map_tree.cpp
 @@ -211,12 +211,13 @@ xml_map_tree::element* 
xml_map_tree::element::get_or_create_child(
@@ -97,7 +97,21 @@ index 8338b930..f66b1ff6 100644
  element_unlinked,
  reference_unknown
  )
-@@ -789,11 +792,12 @@ xml_map_tree::element* xml_map_tree::get_element(const 
pstring& xpath)
+@@ -748,11 +751,12 @@ xml_map_tree::linked_node_type 
xml_map_tree::get_linked_node(const pstring& xpat
+ if (it != attrs.end())
+ throw xpath_error("This attribute is already linked.  You can't 
link the same attribute twice.");
+ 
++auto const nm = m_names.intern(token.name.get(), 
token.name.size()).first;
+ attribute* p = m_attribute_pool.construct(
+ attribute::args_type(
+ *this,
+ token.ns,
+-m_names.intern(token.name.get(), token.name.size()).first,
++nm,
+ ref_type
+ )
+ );
+@@ -789,11 +793,12 @@ xml_map_tree::element* xml_map_tree::get_element(const 
pstring& xpath)
  if (token.attribute)
  throw xpath_error("root element cannot be an attribute.");
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2019-08-23 Thread Stephan Bergmann (via logerrit)

 external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch |   71 
+-
 1 file changed, 64 insertions(+), 7 deletions(-)

New commits:
commit ee02218eb9aaa36f37619cb16bb389762e1785b2
Author: Stephan Bergmann 
AuthorDate: Fri Aug 23 14:38:32 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 23 16:41:11 2019 +0200

external/liborcus: Blind fix attempt for older macOS builds, take 2

More places that need a workaround like 
5c2c08f635c30b732df48faca7ba3d411074e05a
"external/liborcus: Blind fix attempt for older macOS builds".

Change-Id: Idcdfbddabac63bcc778a43ce5dfbf6b9f70d20e1
Reviewed-on: https://gerrit.libreoffice.org/78008
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git 
a/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch 
b/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch
index 4b77cb1be933..17bbf6393bf7 100644
--- a/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch
+++ b/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch
@@ -1,4 +1,4 @@
-From 46221fdfc62e317d34def4ebede814cf2bb14ebb Mon Sep 17 00:00:00 2001
+From 37e7b4629c06c241e2fbd33c1897b384875bcbd3 Mon Sep 17 00:00:00 2001
 From: Stephan Bergmann 
 Date: Fri, 23 Aug 2019 10:26:51 +0200
 Subject: [PATCH] Blind fix attempt for older macOS builds
@@ -30,27 +30,84 @@ MacOSX10.13.sdk, but not sure with what Clang and libc++ 
versions):
 > Makefile:1804: recipe for target 'liborcus_0.15_la-xml_map_tree.lo' failed
 > make[5]: *** [liborcus_0.15_la-xml_map_tree.lo] Error 1
 
-(while building orcus as part of LibreOffice)
+(while building orcus as part of LibreOffice).
+
+(Using "nm" instead of a more descriptive variable name "name" to avoid
+-Wshadow warnings like
+
+> xml_map_tree.cpp: In member function ‘orcus::xml_map_tree::element* 
orcus::xml_map_tree::element::get_or_create_child(orcus::xml_map_tree&, 
orcus::xmlns_id_t, const orcus::pstring&)’:
+> xml_map_tree.cpp:214:16: warning: declaration of ‘name’ shadows a member of 
‘orcus::xml_map_tree::element’ [-Wshadow]
+>   214 | auto const name = sp.intern(_name.get(), _name.size()).first;
+>   |^~~~
+> In file included from xml_map_tree.cpp:8:
+> xml_map_tree.hpp:126:17: note: shadowed declaration is here
+>   126 | pstring name;
+>   | ^~~~
+
+)
 ---
- src/liborcus/xml_map_tree.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ src/liborcus/xml_map_tree.cpp | 12 
+ 1 file changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/src/liborcus/xml_map_tree.cpp b/src/liborcus/xml_map_tree.cpp
-index 8338b930..8fd40534 100644
+index 8338b930..f66b1ff6 100644
 --- a/src/liborcus/xml_map_tree.cpp
 +++ b/src/liborcus/xml_map_tree.cpp
 @@ -211,12 +211,13 @@ xml_map_tree::element* 
xml_map_tree::element::get_or_create_child(
  string_pool& sp = parent.m_names;
  
  // Insert a new element of this name.
-+auto const name = sp.intern(_name.get(), _name.size()).first;
++auto const nm = sp.intern(_name.get(), _name.size()).first;
  child_elements->push_back(
  parent.m_element_pool.construct(
  element::args_type(
  parent,
  _ns,
 -sp.intern(_name.get(), _name.size()).first,
-+name,
++nm,
+ element_unlinked,
+ reference_unknown
+ )
+@@ -251,12 +252,13 @@ xml_map_tree::element* 
xml_map_tree::element::get_or_create_linked_child(
+ string_pool& sp = parent.m_names;
+ 
+ // Insert a new linked element of this name.
++auto const nm = sp.intern(_name.get(), _name.size()).first;
+ child_elements->push_back(
+ parent.m_element_pool.construct(
+ element::args_type(
+ parent,
+ _ns,
+-sp.intern(_name.get(), _name.size()).first,
++nm,
+ element_linked,
+ _ref_type
+ )
+@@ -699,11 +701,12 @@ xml_map_tree::linked_node_type 
xml_map_tree::get_linked_node(const pstring& xpat
+ if (token.attribute)
+ throw xpath_error("root element cannot be an attribute.");
+ 
++auto const nm = m_names.intern(token.name).first;
+ mp_root = m_element_pool.construct(
+ element::args_type(
+ *this,
+ token.ns,
+-m_names.intern(token.name).first,
++nm,
+ element_unlinked,
+ reference_unknown
+ )
+@@ -789,11 +792,12 @@ xml_map_tree::element* xml_map_tree::get_element(const 
pstring& xpath)
+ if (token.attribute)
+ throw xpath_error("root element cannot be an attribute.");
+ 
++auto const nm = m_names.intern(token.name).first;
+ mp_root = m_element_pool.construct(
+ element::args_type(
+ *this,

[Libreoffice-commits] core.git: external/liborcus

2019-08-23 Thread Stephan Bergmann (via logerrit)

 external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch |   59 
++
 external/liborcus/UnpackedTarball_liborcus.mk |1 
 2 files changed, 60 insertions(+)

New commits:
commit 5c2c08f635c30b732df48faca7ba3d411074e05a
Author: Stephan Bergmann 
AuthorDate: Fri Aug 23 10:33:50 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 23 13:00:13 2019 +0200

external/liborcus: Blind fix attempt for older macOS builds

see external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch 
for
details

Change-Id: I7be71524da1cf702218170fd2c921d35c176ea4c
Reviewed-on: https://gerrit.libreoffice.org/77997
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git 
a/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch 
b/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch
new file mode 100644
index ..4b77cb1be933
--- /dev/null
+++ b/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch
@@ -0,0 +1,59 @@
+From 46221fdfc62e317d34def4ebede814cf2bb14ebb Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann 
+Date: Fri, 23 Aug 2019 10:26:51 +0200
+Subject: [PATCH] Blind fix attempt for older macOS builds
+
+...like  (which builds with
+MacOSX10.13.sdk, but not sure with what Clang and libc++ versions):
+
+> In file included from xml_map_tree.cpp:8:
+> In file included from ./xml_map_tree.hpp:11:
+> In file included from ../../include/orcus/pstring.hpp:14:
+> In file included from 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/string:470:
+> In file included from 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/string_view:169:
+> In file included from 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/__string:56:
+> In file included from 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/algorithm:643:
+> In file included from 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/memory:653:
+> 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/tuple:227:10:
 error: static_assert failed "Attempted to construct a reference element in a 
tuple with an rvalue"
+> {static_assert(__can_bind_reference<_Tp>(),
+>  ^ ~~~
+> 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/tuple:385:13:
 note: in instantiation of function template specialization 
'std::__1::__tuple_leaf<2, const orcus::pstring &, 
false>::__tuple_leaf' requested here
+> __tuple_leaf<_Uf, _Tf>(_VSTD::forward<_Up>(__u))...,
+> ^
+> 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/tuple:738:15:
 note: in instantiation of function template specialization 
'std::__1::__tuple_impl, 
orcus::xml_map_tree &, const char *, const orcus::pstring &, 
orcus::xml_map_tree::element_type, 
orcus::xml_map_tree::reference_type>::__tuple_impl<0, 1, 2, 3, 4, 
orcus::xml_map_tree &, const char *, const orcus::pstring &, 
orcus::xml_map_tree::element_type, orcus::xml_map_tree::reference_type, 
orcus::xml_map_tree &, const char *&, orcus::pstring, 
orcus::xml_map_tree::element_type, orcus::xml_map_tree::reference_type>' 
requested here
+> : __base_(typename __make_tuple_indices::type(),
+>   ^
+> xml_map_tree.cpp:216:13: note: in instantiation of function template 
specialization 'std::__1::tuple::tuple' requested here
+> element::args_type(
+> ^
+> 1 error generated.
+> Makefile:1804: recipe for target 'liborcus_0.15_la-xml_map_tree.lo' failed
+> make[5]: *** [liborcus_0.15_la-xml_map_tree.lo] Error 1
+
+(while building orcus as part of LibreOffice)
+---
+ src/liborcus/xml_map_tree.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/liborcus/xml_map_tree.cpp b/src/liborcus/xml_map_tree.cpp
+index 8338b930..8fd40534 100644
+--- a/src/liborcus/xml_map_tree.cpp
 b/src/liborcus/xml_map_tree.cpp
+@@ -211,12 +211,13 @@ xml_map_tree::element* 
xml_map_tree::element::get_or_create_child(
+ string_pool& sp = parent.m_names;
+ 
+ // Insert a new element of this name.
++auto const name = sp.intern(_name.get(), _name.size()).first;
+ child_elements->push_back(
+ parent.m_element_pool.construct(
+ element::args_type(
+ parent,
+ _ns,
+-sp.intern(_name.get(), _name.size()).first,
++name,
+ element_unlinked,
+ reference_unknown
+ )
+-- 
+2.21.0
+
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/

[Libreoffice-commits] core.git: external/liborcus

2019-08-23 Thread Stephan Bergmann (via logerrit)

 external/liborcus/UnpackedTarball_liborcus.mk |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 83664b83b0118cf7ea654da3819d2b62b9dffaa7
Author: Stephan Bergmann 
AuthorDate: Fri Aug 23 08:57:14 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 23 11:49:27 2019 +0200

Update comment

external/liborcus/create-element.patch.0 has been removed with
52800fd6d9867252b795b6afacce19f66b5a5107 "Update orcus to 0.15.1."

Change-Id: Ie127466778f9c15c8edd9de8511c3f60f6da1cd7
Reviewed-on: https://gerrit.libreoffice.org/77988
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index e1aef32edcf7..f0cbd0db17eb 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -15,9 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
 
-# * external/liborcus/create-element.patch.0 covered by upstream
-#   

 "Fix linking of
-#   newly created element":
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
external/liborcus/gcc9.patch.0 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2019-08-15 Thread Stephan Bergmann (via logerrit)

 external/liborcus/UnpackedTarball_liborcus.mk |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 6c286f807c03321a79f8aaa98c6a785da005d619
Author: Stephan Bergmann 
AuthorDate: Thu Aug 15 15:49:26 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Aug 15 17:02:43 2019 +0200

external/liborcus/version.patch.0 is gone

...since 56ffe3c0a1261cd98a3d42b8b08d5f8eb013ead4 "Switch mdds to 1.5.0 and
liborcus to 0.15.0."

Change-Id: I03c5336bbaf65a13f883a30a3fc4238b140a9cef
Reviewed-on: https://gerrit.libreoffice.org/77521
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 88e0963c6dde..eb1d5af676ce 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -15,9 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
 
-# * external/liborcus/version.patch.0 covered by upstream
-#   

 "Remove unused
-#   VERSION file":
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
external/liborcus/gcc9.patch.0 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2019-08-15 Thread Stephan Bergmann (via logerrit)

 external/liborcus/UnpackedTarball_liborcus.mk |1 
 external/liborcus/create-element.patch.0  |   55 ++
 2 files changed, 56 insertions(+)

New commits:
commit ffdc97898b145c9b0cebd22f0393da2c27e17a47
Author: Stephan Bergmann 
AuthorDate: Thu Aug 15 15:28:40 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Aug 15 16:36:04 2019 +0200

Fix linking of newly created element in liborcus 0.15.0

After 56ffe3c0a1261cd98a3d42b8b08d5f8eb013ead4 "Switch mdds to 1.5.0 and
liborcus to 0.15.0", CppunitTest_sc_dataprovider started to fail in ASan 
builds
with

> ERROR: AddressSanitizer: new-delete-type-mismatch on 0x6060005b9340 in 
thread T4 (XML Fetch Threa):
>   object passed to delete has wrong type:
>   size of the allocated type:   56 bytes;
>   size of the deallocated type: 16 bytes.
>  #0 in operator delete(void*, unsigned long) at 
llvm-project/compiler-rt/lib/asan/asan_new_delete.cpp:172:3
>  #1 in orcus::xml_map_tree::element::~element() at 
workdir/UnpackedTarball/liborcus/src/liborcus/xml_map_tree.cpp:238:13
[...]
>  #25 in std::unique_ptr >::~unique_ptr()
>  #26 in orcus::orcus_xml::~orcus_xml() at 
workdir/UnpackedTarball/liborcus/src/liborcus/orcus_xml.cpp:530:26
>  #27 in ScOrcusXMLContextImpl::importXML(ScOrcusImportXMLParam const&) at 
sc/source/filter/orcus/xmlcontext.cxx:286:5
[...]
> 0x6060005b9340 is located 0 bytes inside of 56-byte region 
[0x6060005b9340,0x6060005b9378)
> allocated by thread T4 (XML Fetch Threa) here:
>  #0 in operator new(unsigned long) at 
llvm-project/compiler-rt/lib/asan/asan_new_delete.cpp:99:3
>  #1 in orcus::xml_map_tree::element::element(char const*, orcus::pstring 
const&, orcus::xml_map_tree::element_type, orcus::xml_map_tree::reference_type) 
at workdir/UnpackedTarball/liborcus/src/liborcus/xml_map_tree.cpp:203:26
>  #2 in std::unique_ptr > 
orcus::make_unique(char 
const*&, orcus::pstring&&, orcus::xml_map_tree::element_type&&, 
orcus::xml_map_tree::reference_type&&) at 
workdir/UnpackedTarball/liborcus/src/liborcus/../../include/orcus/global.hpp:61:35
>  #3 in 
orcus::xml_map_tree::element::get_or_create_child(orcus::string_pool&, char 
const*, orcus::pstring const&) at 
workdir/UnpackedTarball/liborcus/src/liborcus/xml_map_tree.cpp:271:9
>  #4 in orcus::xml_map_tree::get_linked_node(orcus::pstring const&, 
orcus::xml_map_tree::reference_type) at 
workdir/UnpackedTarball/liborcus/src/liborcus/xml_map_tree.cpp:722:31
[...]

Change-Id: Iad8e06ead6f2655a3e26ceeab368e9b50028402f
Reviewed-on: https://gerrit.libreoffice.org/77519
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 74fbbb2e9e33..88e0963c6dde 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
external/liborcus/gcc9.patch.0 \
external/liborcus/libtool.patch.0 \
+   external/liborcus/create-element.patch.0 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/create-element.patch.0 
b/external/liborcus/create-element.patch.0
new file mode 100644
index ..b1012e5c90d8
--- /dev/null
+++ b/external/liborcus/create-element.patch.0
@@ -0,0 +1,55 @@
+--- src/liborcus/xml_map_tree.cpp
 src/liborcus/xml_map_tree.cpp
+@@ -723,35 +723,28 @@
+ element* elem = r.first;
+ bool created = r.second;
+ 
+-if (created)
+-{
+-// No element of that name exists.
+-elem->elem_type = element_linked;
+-elem->ref_type = ref_type;
+-}
+-else
++if (!created)
+ {
+ // This element already exists.  Check if this is already linked.
+ if (elem->ref_type != reference_unknown || elem->elem_type != 
element_unlinked)
+ throw xpath_error("This element is already linked.  You can't 
link the same element twice.");
+-
+-// Turn this existing non-linked element into a linked one.
+-delete elem->child_elements;
+-elem->elem_type = element_linked;
+-elem->ref_type = ref_type;
+-switch (ref_type)
+-{
+-case reference_cell:
+-elem->cell_ref = new cell_reference;
+-break;
+-case reference_range_field:
+-elem->field_ref = new field_in_range;
+-break;
+-default:
+-throw general_error("Unknown reference type in 
xml_map_tree::get_element_stack.");
+-}
+-
+ }
++
++// Turn this existing non-linked element into a linked one.
++delete elem->child_elements;
++elem->elem_type = ele

[Libreoffice-commits] core.git: external/liborcus external/libwps

2019-05-06 Thread Luboš Luňák (via logerrit)

 external/liborcus/ExternalProject_liborcus.mk |8 
 external/liborcus/UnpackedTarball_liborcus.mk |1 +
 external/liborcus/libtool.patch.0 |   11 +++
 external/libwps/ExternalProject_libwps.mk |   23 +++
 external/libwps/UnpackedTarball_libwps.mk |1 +
 external/libwps/libtool.patch.0   |   11 +++
 6 files changed, 51 insertions(+), 4 deletions(-)

New commits:
commit ddea172792d13516ff7e0dd43f1f78b74ade8914
Author: Luboš Luňák 
AuthorDate: Sun May 5 15:49:16 2019 +0200
Commit: Luboš Luňák 
CommitDate: Mon May 6 10:33:18 2019 +0200

enable gdb-index also for liborcus and libwps if possible

These are larger C++ libs and without gdb-index gdb takes a moment
to load such libs.

Change-Id: I555a629199f761060199a528415f7d5fbe9d9533
Reviewed-on: https://gerrit.libreoffice.org/71822
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index f1e82f54f4f7..8cc1c030fa98 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -82,6 +82,14 @@ ifeq ($(OS),LINUX)
 liborcus_LDFLAGS+=-Wl,-z,origin -Wl,-rpath,\ORIGIN
 endif
 
+ifeq ($(ENABLE_GDB_INDEX),TRUE)
+liborcus_LDFLAGS+=-Wl,--gdb-index
+liborcus_CXXFLAGS+=-ggnu-pubnames
+ifneq ($(USE_LD),)
+liborcus_LDFLAGS += -fuse-ld=$(USE_LD)
+endif
+endif
+
 $(call gb_ExternalProject_get_state_target,liborcus,build) :
$(call gb_ExternalProject_run,build,\
$(if $(liborcus_LIBS),LIBS='$(liborcus_LIBS)') \
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 6814782bd9e2..e1d810a49dc2 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
external/liborcus/gcc9.patch.0 \
external/liborcus/version.patch.0 \
+   external/liborcus/libtool.patch.0 \
external/liborcus/0001-Prevent-unsigned-integer-underflow.patch \
 ))
 
diff --git a/external/liborcus/libtool.patch.0 
b/external/liborcus/libtool.patch.0
new file mode 100644
index ..93b677303374
--- /dev/null
+++ b/external/liborcus/libtool.patch.0
@@ -0,0 +1,11 @@
+--- ltmain.sh.sav  2018-09-14 23:47:13.0 +0200
 ltmain.sh  2019-05-05 23:11:30.406904472 +0200
+@@ -7278,7 +7278,7 @@ func_mode_link ()
+   -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+   
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+   
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+-  -specs=*|-fsanitize=*)
++  -specs=*|-fsanitize=*|-fuse-ld=*)
+ func_quote_for_eval "$arg"
+   arg=$func_quote_for_eval_result
+ func_append compile_command " $arg"
diff --git a/external/libwps/ExternalProject_libwps.mk 
b/external/libwps/ExternalProject_libwps.mk
index 9c6a5ea137b3..bb8a5d977b6e 100644
--- a/external/libwps/ExternalProject_libwps.mk
+++ b/external/libwps/ExternalProject_libwps.mk
@@ -25,6 +25,23 @@ libwps_CPPFLAGS+=-D_GLIBCXX_DEBUG
 endif
 endif
 
+libwps_CXXFLAGS=$(gb_CXXFLAGS) $(if 
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))
+
+libwps_LDFLAGS=
+ifeq ($(OS),LINUX)
+ifeq ($(SYSTEM_REVENGE),)
+libwps_LDFLAGS+=-Wl,-z,origin -Wl,-rpath,\ORIGIN
+endif
+endif
+
+ifeq ($(ENABLE_GDB_INDEX),TRUE)
+libwps_LDFLAGS+=-Wl,--gdb-index
+libwps_CXXFLAGS+=-ggnu-pubnames
+ifneq ($(USE_LD),)
+libwps_LDFLAGS += -fuse-ld=$(USE_LD)
+endif
+endif
+
 $(call gb_ExternalProject_get_state_target,libwps,build) :
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
@@ -41,11 +58,9 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-werror \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
-   CXXFLAGS="$(gb_CXXFLAGS) $(if 
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
+   $(if $(libwps_CXXFLAGS),CXXFLAGS='$(libwps_CXXFLAGS)') \
$(if $(libwps_CPPFLAGS),CPPFLAGS='$(libwps_CPPFLAGS)') \
-   $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \
-   'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
-   -Wl$(COMMA)-rpath$(COMMA)\ORIGIN')) 
\
+   $(if $(libwps_LDFLAGS),LDFLAGS='$(libwps_LDFLAGS)') \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.

[Libreoffice-commits] core.git: external/liborcus

2018-11-07 Thread Libreoffice Gerrit user

 external/liborcus/0001-Prevent-unsigned-integer-underflow.patch |   27 
++
 external/liborcus/UnpackedTarball_liborcus.mk   |1 
 2 files changed, 28 insertions(+)

New commits:
commit 0512ed1e8c9490f0f9b0d7ab515dc292800cac55
Author: Kohei Yoshida 
AuthorDate: Wed Nov 7 21:44:01 2018 -0500
Commit: Markus Mohrhard 
CommitDate: Thu Nov 8 07:08:35 2018 +0100

Prevent crash on assert error coming from orcus::css_parser::parse().

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 

diff --git a/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch 
b/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch
new file mode 100644
index ..3353857a2d10
--- /dev/null
+++ b/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch
@@ -0,0 +1,27 @@
+From 1967be013804f4f578b53659d7ef459b4c35de9f Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida 
+Date: Wed, 7 Nov 2018 21:08:40 -0500
+Subject: [PATCH] Prevent unsigned integer underflow.
+
+(cherry picked from commit 40bbce85048b77c545103af124f3d9831dd4a458)
+---
+ src/parser/parser_base.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/parser/parser_base.cpp b/src/parser/parser_base.cpp
+index 586d495f..9d426efb 100644
+--- a/src/parser/parser_base.cpp
 b/src/parser/parser_base.cpp
+@@ -120,7 +120,8 @@ double parser_base::parse_double()
+ 
+ size_t parser_base::remaining_size() const
+ {
+-return std::distance(mp_char, mp_end) - 1;
++size_t n = std::distance(mp_char, mp_end);
++return n ? (n - 1) : 0;
+ }
+ 
+ std::ptrdiff_t parser_base::offset() const
+-- 
+2.17.1
+
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 7669390cc661..94ef29f80462 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
external/liborcus/gcc9.patch.0 \
external/liborcus/version.patch.0 \
+   external/liborcus/0001-Prevent-unsigned-integer-underflow.patch \
 ))
 
 ifeq ($(OS),WNT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2018-10-04 Thread Libreoffice Gerrit user

 external/liborcus/UnpackedTarball_liborcus.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 90bf93135e9eff21eda2c0b4e94ed727a2449a72
Author: Stephan Bergmann 
AuthorDate: Thu Oct 4 15:47:59 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 4 21:41:43 2018 +0200

Record external/liborcus/version.patch.0 as covered upstream

Change-Id: I006a16cfc83e5b03408a2e772e752bb210901686
Reviewed-on: https://gerrit.libreoffice.org/61380
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 41c89c9e33b1..7669390cc661 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -15,6 +15,9 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
 
+# * external/liborcus/version.patch.0 covered by upstream
+#   

 "Remove unused
+#   VERSION file":
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2018-10-04 Thread Libreoffice Gerrit user

 external/liborcus/README |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit fe32670dda4a9a9afca233cba2cbb645d7480bd7
Author: Stephan Bergmann 
AuthorDate: Thu Oct 4 15:41:57 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 4 21:41:17 2018 +0200

Add external/liborcus/README, containing link to upstream project

Change-Id: Iea609a8e90d8b2bf8bcac2b537699b08073f25ae
Reviewed-on: https://gerrit.libreoffice.org/61379
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/liborcus/README b/external/liborcus/README
new file mode 100644
index ..54e882663caf
--- /dev/null
+++ b/external/liborcus/README
@@ -0,0 +1,2 @@
+[https://gitlab.com/orcus/orcus]
+"Collection of parsers and import filters for spreadsheet documents."
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2018-10-04 Thread Libreoffice Gerrit user

 external/liborcus/UnpackedTarball_liborcus.mk |1 +
 external/liborcus/version.patch.0 |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit f7bc83c6c4a74e32fff3180d9053c1e006beb44d
Author: Stephan Bergmann 
AuthorDate: Thu Oct 4 10:38:40 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 4 14:23:54 2018 +0200

external/liborcus: Clash between VERSION and trunk libc++ 

...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.  internally includes  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 
Tested-by: Jenkins

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 215bd4b8cc15..41c89c9e33b1 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \
external/liborcus/gcc9.patch.0 \
+   external/liborcus/version.patch.0 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/version.patch.0 
b/external/liborcus/version.patch.0
new file mode 100644
index ..2c0b5ae4ca07
--- /dev/null
+++ b/external/liborcus/version.patch.0
@@ -0,0 +1,11 @@
+--- configure
 configure
+@@ -21055,7 +21055,7 @@
+ 
+ fi
+ 
+-ac_config_files="$ac_config_files Makefile 
liborcus-$ORCUS_API_VERSION.pc:liborcus.pc.in 
liborcus-spreadsheet-model-$ORCUS_API_VERSION.pc:liborcus-spreadsheet-model.pc.in
 VERSION include/Makefile include/orcus/Makefile include/orcus/detail/Makefile 
include/orcus/mso/Makefile include/orcus/spreadsheet/Makefile src/Makefile 
src/liborcus/Makefile src/liborcus/constants.inl src/mso/Makefile 
src/parser/Makefile src/python/Makefile src/spreadsheet/Makefile 
parser_handlers/Makefile benchmark/Makefile doc_example/Makefile"
++ac_config_files="$ac_config_files Makefile 
liborcus-$ORCUS_API_VERSION.pc:liborcus.pc.in 
liborcus-spreadsheet-model-$ORCUS_API_VERSION.pc:liborcus-spreadsheet-model.pc.in
 include/Makefile include/orcus/Makefile include/orcus/detail/Makefile 
include/orcus/mso/Makefile include/orcus/spreadsheet/Makefile src/Makefile 
src/liborcus/Makefile src/liborcus/constants.inl src/mso/Makefile 
src/parser/Makefile src/python/Makefile src/spreadsheet/Makefile 
parser_handlers/Makefile benchmark/Makefile doc_example/Makefile"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2018-07-26 Thread Libreoffice Gerrit user

 external/liborcus/UnpackedTarball_liborcus.mk |1 
 external/liborcus/gcc9.patch.0|   27 ++
 2 files changed, 28 insertions(+)

New commits:
commit dcd77e78d5c3b3c855c0588f165bcd4af695101f
Author: Stephan Bergmann 
AuthorDate: Thu Jul 26 10:34:56 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jul 26 13:05:27 2018 +0200

external/liborcus: silence -Werror=deprecated-copy (GCC trunk towards GCC 9)

Change-Id: I520b19e2486bf1622206c74649f7105148b7bd87
Reviewed-on: https://gerrit.libreoffice.org/58047
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 3ab387e734be..215bd4b8cc15 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -18,6 +18,7 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,liborcus))
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \
+   external/liborcus/gcc9.patch.0 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/gcc9.patch.0 b/external/liborcus/gcc9.patch.0
new file mode 100644
index ..afb9b81c4ea0
--- /dev/null
+++ b/external/liborcus/gcc9.patch.0
@@ -0,0 +1,27 @@
+--- include/orcus/types.hpp
 include/orcus/types.hpp
+@@ -7,6 +7,13 @@
+ 
+ #ifndef INCLUDED_ORCUS_TYPES_HPP
+ #define INCLUDED_ORCUS_TYPES_HPP
++
++#ifdef __GNUC__
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wpragmas" // for old GCC
++#pragma GCC diagnostic ignored "-Wunknown-warning-option" // for Clang
++#pragma GCC diagnostic ignored "-Wdeprecated-copy"
++#endif
+ 
+ #include 
+ #include 
+@@ -145,6 +152,10 @@
+ typedef ::std::vector xml_attrs_t;
+ 
+ }
++
++#ifdef __GNUC__
++#pragma GCC diagnostic pop
++#endif
+ 
+ #endif
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus sc/source

2018-06-24 Thread Vikas Mahato

 external/liborcus/0001-add-xml-path.patch |  119 ++
 sc/source/filter/inc/orcusinterface.hxx   |4 -
 sc/source/filter/orcus/interface.cxx  |8 +-
 sc/source/filter/orcus/xmlcontext.cxx |2 
 4 files changed, 126 insertions(+), 7 deletions(-)

New commits:
commit 9313dcc624e3898d2b10f8b0d6efba403a190c88
Author: Vikas Mahato 
Date:   Sun Jun 24 20:38:12 2018 +0530

Changes to orcus for implementing XML data provider

Change-Id: I70075f4240c75f0f46260bb77b160f0b75d6ae94
Reviewed-on: https://gerrit.libreoffice.org/56354
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/external/liborcus/0001-add-xml-path.patch 
b/external/liborcus/0001-add-xml-path.patch
new file mode 100644
index ..3f9a16bb880f
--- /dev/null
+++ b/external/liborcus/0001-add-xml-path.patch
@@ -0,0 +1,119 @@
+diff --git a/include/orcus/xml_structure_tree.hpp 
b/include/orcus/xml_structure_tree.hpp
+index 
58cabfd116fa24e35ff27cf8d7512b6e73df33f4..c88808d24bd74c175fa4017328d3e54b4c588c5e
 100644
+--- a/include/orcus/xml_structure_tree.hpp
 b/include/orcus/xml_structure_tree.hpp
+@@ -127,6 +127,20 @@ public:
+ size_t get_xmlns_index(xmlns_id_t ns) const;
+
+ std::string get_xmlns_short_name(xmlns_id_t ns) const;
++
++/**
++ * Get a XPath like ID for the element inside of the XML tree.
++ *
++ */
++std::string get_path() const;
++
++/**
++ * Select an element by a path expression. The path expression may be
++ * generated by xml_structure_tree::walker::get_path.
++ *
++ * @param path a simple XPath like expression
++ */
++element select_by_path(const std::string& path);
+ };
+
+ xml_structure_tree(xmlns_context& xmlns_cxt);
+diff --git a/src/liborcus/xml_structure_tree.cpp 
b/src/liborcus/xml_structure_tree.cpp
+index 
2778bc05f32841a9441bf471913872e119256895..6622bc57cd2595f12bba80d4bbdb5c24cd6e7bc6
 100644
+--- a/src/liborcus/xml_structure_tree.cpp
 b/src/liborcus/xml_structure_tree.cpp
+@@ -12,6 +12,7 @@
+ #include "orcus/exception.hpp"
+
+ #include "orcus/string_pool.hpp"
++#include "string_helper.hpp"
+
+ #include 
+ #include 
+@@ -275,6 +276,15 @@ struct xml_structure_tree_impl
+ {
+ delete mp_root;
+ }
++
++std::string get_element_str(const xml_structure_tree::entity_name& name) 
const
++{
++ostringstream ss;
++if (m_xmlns_cxt.get_index(name.ns) != index_not_found)
++ss << m_xmlns_cxt.get_short_name(name.ns) << ":";
++ss << name.name;
++return ss.str();
++}
+ };
+
+ struct xml_structure_tree::walker_impl
+@@ -423,6 +433,66 @@ string 
xml_structure_tree::walker::get_xmlns_short_name(xmlns_id_t ns) const
+ return mp_impl->m_parent_impl.m_xmlns_cxt.get_short_name(ns);
+ }
+
++string xml_structure_tree::walker::get_path() const
++{
++ostringstream ss;
++for (auto& element : mp_impl->m_scopes)
++{
++ss << "/" << mp_impl->m_parent_impl.get_element_str(element.name);
++}
++
++return ss.str();
++}
++
++xml_structure_tree::element xml_structure_tree::walker::select_by_path(const 
std::string& path)
++{
++pstring p(path);
++std::vector parts = string_helper::split_string(p, '/');
++if (parts.empty())
++throw general_error("invalid format for path");
++
++// string_helper::split_string will create an empty first element due to 
leading '/'
++if (parts[0] != "")
++{
++throw general_error("invalid format for path");
++}
++else
++{
++parts.erase(parts.begin());
++}
++
++if (parts.empty())
++throw general_error("invalid format for path");
++
++element_ref root_ref(mp_impl->mp_root->name, &mp_impl->mp_root->prop);
++if (pstring(mp_impl->m_parent_impl.get_element_str(root_ref.name)) != 
parts[0])
++throw general_error("path does not match any element");
++
++std::vector scopes;
++scopes.push_back(root_ref);
++
++for (size_t i = 1; i < parts.size(); ++i)
++{
++const elem_prop& prop = *scopes.back().prop;
++bool found = false;
++for (auto& child : prop.child_elements)
++{
++if (pstring(mp_impl->m_parent_impl.get_element_str(child.first)) 
== parts[i])
++{
++scopes.emplace_back(child.first, child.second);
++found = true;
++break;
++}
++}
++if (!found)
++throw general_error("path does not match any element");
++}
++
++std::swap(mp_impl->m_scopes, scopes);
++const element_ref& ref = mp_impl->m_scopes.back();
++return element(ref.name, ref.prop->repeat);
++}
++
+ xml_structure_tree::xml_structure_tree(xmlns_context& xmlns_cxt) :
+ mp_impl(new xml_structure_tree_impl(xmlns_cxt)) {}
diff --git a/sc/source/filter/inc/orcusinterface.hxx 
b/sc/source/filter/inc/orcusinterface.hxx

[Libreoffice-commits] core.git: external/liborcus

2018-02-13 Thread Kohei Yoshida

 external/liborcus/0001-xls-xml-Import-hidden-row-and-column-flags.patch |   81 
++
 external/liborcus/UnpackedTarball_liborcus.mk   |1 
 2 files changed, 82 insertions(+)

New commits:
commit 9dbc3ffec050c880bb46e0edbdb9cd4a6241c9eb
Author: Kohei Yoshida 
Date:   Tue Feb 13 22:25:20 2018 -0500

Pick up hidden row and column flags when importing via orcus.

Change-Id: Idf2530935eb93339602ac5f6a5d0547aa56b453a
Reviewed-on: https://gerrit.libreoffice.org/49695
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git 
a/external/liborcus/0001-xls-xml-Import-hidden-row-and-column-flags.patch 
b/external/liborcus/0001-xls-xml-Import-hidden-row-and-column-flags.patch
new file mode 100644
index ..15a554a79cff
--- /dev/null
+++ b/external/liborcus/0001-xls-xml-Import-hidden-row-and-column-flags.patch
@@ -0,0 +1,81 @@
+From 66bbbd42f5d135b7e7dd57eaa7fdf6fd69c664df Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida 
+Date: Tue, 13 Feb 2018 22:15:49 -0500
+Subject: [PATCH] xls-xml: Import hidden row and column flags.
+
+(cherry picked from commit 95420c1a1e8c082bb5953b2a49f0d56eef0e5f7e)
+---
+ src/liborcus/xls_xml_context.cpp | 20 ++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/src/liborcus/xls_xml_context.cpp 
b/src/liborcus/xls_xml_context.cpp
+index 917ff86..04b863a 100644
+--- a/src/liborcus/xls_xml_context.cpp
 b/src/liborcus/xls_xml_context.cpp
+@@ -1222,6 +1222,7 @@ void xls_xml_context::start_element_column(const 
xml_token_pair_t& parent, const
+ spreadsheet::col_t col_index = m_cur_prop_col;
+ spreadsheet::col_t span = 0;
+ double width = 0.0;
++bool hidden = false;
+ 
+ std::for_each(attrs.begin(), attrs.end(),
+ [&](const xml_token_attr_t& attr)
+@@ -1244,6 +1245,8 @@ void xls_xml_context::start_element_column(const 
xml_token_pair_t& parent, const
+ case XML_Span:
+ span = to_long(attr.value);
+ break;
++case XML_Hidden:
++hidden = to_long(attr.value) != 0;
+ default:
+ ;
+ }
+@@ -1251,8 +1254,11 @@ void xls_xml_context::start_element_column(const 
xml_token_pair_t& parent, const
+ );
+ 
+ for (; span >= 0; --span, ++col_index)
++{
+ // Column widths are stored as points.
+ mp_sheet_props->set_column_width(col_index, width, 
orcus::length_unit_t::point);
++mp_sheet_props->set_column_hidden(col_index, hidden);
++}
+ 
+ m_cur_prop_col = col_index;
+ }
+@@ -1263,6 +1269,7 @@ void xls_xml_context::start_element_row(const 
xml_token_pair_t& parent, const xm
+ m_cur_col = 0;
+ spreadsheet::row_t row_index = -1;
+ bool has_height = false;
++bool hidden = false;
+ double height = 0.0;
+ 
+ for (const xml_token_attr_t& attr : attrs)
+@@ -1281,6 +1288,9 @@ void xls_xml_context::start_element_row(const 
xml_token_pair_t& parent, const xm
+ has_height = true;
+ height = to_double(attr.value);
+ break;
++case XML_Hidden:
++hidden = to_long(attr.value) != 0;
++break;
+ default:
+ ;
+ }
+@@ -1293,8 +1303,14 @@ void xls_xml_context::start_element_row(const 
xml_token_pair_t& parent, const xm
+ m_cur_row = row_index - 1;
+ }
+ 
+-if (mp_sheet_props && has_height)
+-mp_sheet_props->set_row_height(m_cur_row, height, 
length_unit_t::point);
++if (mp_sheet_props)
++{
++if (has_height)
++mp_sheet_props->set_row_height(m_cur_row, height, 
length_unit_t::point);
++
++if (hidden)
++mp_sheet_props->set_row_hidden(m_cur_row, true);
++}
+ }
+ 
+ void xls_xml_context::end_element_borders()
+-- 
+2.7.4
+
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index a35ad9eec002..92e461f95e57 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\

external/liborcus/0001-Alpha-value-of-0-means-fully-transparent.-I-m-sure-2.patch
 \

external/liborcus/0002-We-are-supposed-to-use-the-foreground-color-for-soli.patch
 \
external/liborcus/0001-xls-xml-Pick-up-border-colors.patch \
+   external/liborcus/0001-xls-xml-Import-hidden-row-and-column-flags.patch 
\
 ))
 
 ifeq ($(OS),WNT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus sc/source

2018-02-01 Thread Kohei Yoshida

 
external/liborcus/0001-Alpha-value-of-0-means-fully-transparent.-I-m-sure-2.patch
 |   50 ++
 
external/liborcus/0002-We-are-supposed-to-use-the-foreground-color-for-soli.patch
 |   49 +
 external/liborcus/UnpackedTarball_liborcus.mk  
   |2 
 sc/source/filter/orcus/interface.cxx   
   |   15 ++-
 4 files changed, 111 insertions(+), 5 deletions(-)

New commits:
commit 20945a9a4de6684010fd5b3603595e6da543807d
Author: Kohei Yoshida 
Date:   Wed Jan 31 21:27:44 2018 -0500

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 
Tested-by: Kohei Yoshida 

diff --git 
a/external/liborcus/0001-Alpha-value-of-0-means-fully-transparent.-I-m-sure-2.patch
 
b/external/liborcus/0001-Alpha-value-of-0-means-fully-transparent.-I-m-sure-2.patch
new file mode 100644
index ..6adae9ba2352
--- /dev/null
+++ 
b/external/liborcus/0001-Alpha-value-of-0-means-fully-transparent.-I-m-sure-2.patch
@@ -0,0 +1,50 @@
+From 98d2b3377da71b713a37f9004acff3c02c22ce2b Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida 
+Date: Wed, 31 Jan 2018 22:11:25 -0500
+Subject: [PATCH 1/2] Alpha value of 0 means fully transparent. I'm sure 255
+ was intended.
+
+(cherry picked from commit f7953a814d6a43205791b6cc01c528ef5d4b1ce3)
+---
+ src/liborcus/gnumeric_sheet_context.cpp | 4 ++--
+ src/liborcus/odf_styles_context.cpp | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/liborcus/gnumeric_sheet_context.cpp 
b/src/liborcus/gnumeric_sheet_context.cpp
+index 8659cc3..6bd1471 100644
+--- a/src/liborcus/gnumeric_sheet_context.cpp
 b/src/liborcus/gnumeric_sheet_context.cpp
+@@ -132,7 +132,7 @@ public:
+ {
+ spreadsheet::color_elem_t red, green, blue;
+ gnumeric_helper::parse_RGB_color_attribute(red, green, blue, 
attr.value);
+-m_styles.set_fill_fg_color(0, red, green, blue);
++m_styles.set_fill_fg_color(255, red, green, blue);
+ 
+ m_fill = true;
+ 
+@@ -145,7 +145,7 @@ public:
+ {
+ spreadsheet::color_elem_t red, green, blue;
+ gnumeric_helper::parse_RGB_color_attribute(red, green, blue, 
attr.value);
+-m_styles.set_fill_bg_color(0, red, green, blue);
++m_styles.set_fill_bg_color(255, red, green, blue);
+ 
+ m_fill = true;
+ }
+diff --git a/src/liborcus/odf_styles_context.cpp 
b/src/liborcus/odf_styles_context.cpp
+index d988f7d..f9c422a 100644
+--- a/src/liborcus/odf_styles_context.cpp
 b/src/liborcus/odf_styles_context.cpp
+@@ -739,7 +739,7 @@ void styles_context::start_element(xmlns_id_t ns, 
xml_token_t name, const std::v
+ {
+ spreadsheet::color_elem_t red, green, blue;
+ func.get_background_color(red, green, blue);
+-mp_styles->set_fill_bg_color(0, red, green, blue);
++mp_styles->set_fill_bg_color(255, red, green, blue);
+ }
+ 
+ size_t fill_id = mp_styles->commit_fill();
+-- 
+2.7.4
+
diff --git 
a/external/liborcus/0002-We-are-supposed-to-use-the-foreground-color-for-soli.patch
 
b/external/liborcus/0002-We-are-supposed-to-use-the-foreground-color-for-soli.patch
new file mode 100644
index ..ebb233ac7b8d
--- /dev/null
+++ 
b/external/liborcus/0002-We-are-supposed-to-use-the-foreground-color-for-soli.patch
@@ -0,0 +1,49 @@
+From 473526e1ca3a7117e2daf977e1b82a0a3977fc84 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida 
+Date: Wed, 31 Jan 2018 22:24:45 -0500
+Subject: [PATCH 2/2] We are supposed to use the foreground color for solid
+ fill.
+
+(cherry picked from commit f821995022df8dd1e580dd22cf131584b2b1ac4f)
+---
+ src/liborcus/odf_styles_context.cpp  | 3 ++-
+ src/liborcus/odf_styles_context_test.cpp | 9 +
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/liborcus/odf_styles_context.cpp 
b/src/liborcus/odf_styles_context.cpp
+index f9c422a..e5f1cc6 100644
+--- a/src/liborcus/odf_styles_context.cpp
 b/src/liborcus/odf_styles_context.cpp
+@@ -739,7 +739,8 @@ void styles_context::start_element(xmlns_id_t ns, 
xml_token_t name, const std::v
+ {
+ spreadsheet::color_elem_t red, green, blue;
+ func.get_background_color(red, green, blue);
+-

[Libreoffice-commits] core.git: external/liborcus

2017-11-23 Thread Caolán McNamara

 external/liborcus/UnpackedTarball_liborcus.mk |1 +
 external/liborcus/silence-assert.patch|   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit e5e8181161632ace434359de2a983ae425670c40
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 23 15:33:54 2017 +

crashtesting: assert from liborcus

Change-Id: I3b148354745fa419b6299b6456d24925ea4fb980
Reviewed-on: https://gerrit.libreoffice.org/45160
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index b3261a5fa993..e9270c24a5cb 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -18,6 +18,7 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,liborcus))
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \
+   external/liborcus/silence-assert.patch \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/silence-assert.patch 
b/external/liborcus/silence-assert.patch
new file mode 100644
index ..fb0bba200df7
--- /dev/null
+++ b/external/liborcus/silence-assert.patch
@@ -0,0 +1,11 @@
+--- liborcus/src/parser/sax_parser_base.cpp2017-11-23 15:26:54.307416084 
+
 liborcus/src/parser/sax_parser_base.cpp2017-11-16 00:38:32.0 
+
+@@ -296,7 +296,7 @@
+ str = pstring(buf.get(), buf.size());
+ 
+ // Skip the closing quote.
+-assert(cur_char() == '"');
++assert(!has_char() || cur_char() == '"');
+ next();
+ }
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2017-08-12 Thread Markus Mohrhard

 external/liborcus/UnpackedTarball_liborcus.mk|1 +
 external/liborcus/orcus_allow_missing_xml_header.patch.1 |   12 
 2 files changed, 13 insertions(+)

New commits:
commit d1195c097126c4986462857d01e27ee33352fbd1
Author: Markus Mohrhard 
Date:   Sat Aug 12 11:23:30 2017 +0200

orcus: xml header is only mandatory in xml 1.1+

Change-Id: I28aa8a2f340cb1a100dfa5d10d8d6e9b8dac2479
Reviewed-on: https://gerrit.libreoffice.org/41080
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index b37384e65d62..7bf65cbdcd41 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/visibility.patch.0 \
external/liborcus/iOS.patch \
external/liborcus/nullptr-in-ostringstream.patch.1 \
+   external/liborcus/orcus_allow_missing_xml_header.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/orcus_allow_missing_xml_header.patch.1 
b/external/liborcus/orcus_allow_missing_xml_header.patch.1
new file mode 100644
index ..2cfd498c7eae
--- /dev/null
+++ b/external/liborcus/orcus_allow_missing_xml_header.patch.1
@@ -0,0 +1,12 @@
+diff -ur liborcus.org/include/orcus/sax_parser.hpp 
liborcus/include/orcus/sax_parser.hpp
+--- liborcus.org/include/orcus/sax_parser.hpp  2017-08-12 09:44:21.379509116 
+0200
 liborcus/include/orcus/sax_parser.hpp  2017-08-12 09:46:06.884259216 
+0200
+@@ -20,7 +20,7 @@
+  * parsing regardless of whether or not the xml stream begins with a
+  *  declaration.
+  */
+-static const bool strict_xml_declaration = true;
++static const bool strict_xml_declaration = false;
+ };
+ 
+ /**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2017-06-30 Thread Markus Mohrhard

 external/liborcus/UnpackedTarball_liborcus.mk  |1 +
 external/liborcus/nullptr-in-ostringstream.patch.1 |   12 
 2 files changed, 13 insertions(+)

New commits:
commit ec822b7b716ebb14e717513aeaaf97a45b98bee9
Author: Markus Mohrhard 
Date:   Fri Jun 30 14:39:08 2017 +0200

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 
Reviewed-by: Markus Mohrhard 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 0f94f73490fc..b37384e65d62 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
external/liborcus/visibility.patch.0 \
external/liborcus/iOS.patch \
+   external/liborcus/nullptr-in-ostringstream.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/nullptr-in-ostringstream.patch.1 
b/external/liborcus/nullptr-in-ostringstream.patch.1
new file mode 100644
index ..d8b97ee2c92a
--- /dev/null
+++ b/external/liborcus/nullptr-in-ostringstream.patch.1
@@ -0,0 +1,12 @@
+diff -ur liborcus.org/src/liborcus/xml_context_base.cpp 
liborcus/src/liborcus/xml_context_base.cpp
+--- liborcus.org/src/liborcus/xml_context_base.cpp 2017-06-30 
14:32:19.044195127 +0200
 liborcus/src/liborcus/xml_context_base.cpp 2017-06-30 14:34:27.580268421 
+0200
+@@ -171,7 +171,7 @@
+ 
+ // Create a generic error message.
+ ostringstream os;
+-os << "element '" << ns << ":" << m_tokens.get_token_name(name) << "' 
expected, but '";
++os << "element '" << (ns ? ns : "") << ":" << 
m_tokens.get_token_name(name) << "' expected, but '";
+ os << elem.first << ":" << m_tokens.get_token_name(elem.second) << "' 
encountered.";
+ throw xml_structure_error(os.str());
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2017-06-12 Thread jan Iversen

 external/liborcus/UnpackedTarball_liborcus.mk |1 +
 external/liborcus/iOS.patch   |   20 
 2 files changed, 21 insertions(+)

New commits:
commit 6685631ed9edcfded8e37a9df67afaed898e2afc
Author: jan Iversen 
Date:   Mon Jun 12 12:44:05 2017 +0200

iOS patch liborcus

Support for arm64

Change-Id: Ie2289e4df9f90b7c31357ecfe859f087a7df9c5a

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 5d09d6de7ccd..0f94f73490fc 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \
external/liborcus/visibility.patch.0 \
+   external/liborcus/iOS.patch \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/iOS.patch b/external/liborcus/iOS.patch
new file mode 100644
index ..1b5a1a70cc14
--- /dev/null
+++ b/external/liborcus/iOS.patch
@@ -0,0 +1,20 @@
+--- a/config.sub
 b/config.sub
+@@ -253,7 +253,7 @@
+   | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
+   | am33_2.0 \
+   | arc | arceb \
+-  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | 
arm64 \
+   | avr | avr32 \
+   | be32 | be64 \
+   | bfin \
+@@ -367,7 +367,7 @@
+   | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+   | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+   | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+-  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
+   | avr-* | avr32-* \
+   | be32-* | be64-* \
+   | bfin-* | bs2000-* \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2016-09-26 Thread Markus Mohrhard

 external/liborcus/ExternalProject_liborcus.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a4c974293e84685aa055922b70b2470fcff2d844
Author: Markus Mohrhard 
Date:   Tue Sep 27 03:00:44 2016 +0200

don't dynamically link to system boost in internal boost case

Change-Id: If1cc03b3861ac89b14d8d726fa4ce042f0086b24

diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index 46ceb05..dd237ea 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -107,6 +107,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
--with-boost=$(WORKDIR)/UnpackedTarball/boost \
boost_cv_lib_iostreams=yes \
boost_cv_lib_system=yes \
+   boost_cv_lib_filesystem=yes \
) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
&& $(if $(verbose),V=1) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2016-09-20 Thread Stephan Bergmann

 external/liborcus/visibility.patch.0 |4 
 1 file changed, 4 insertions(+)

New commits:
commit 480edfceca5470eb4fe9f11c9535645872ee4bd6
Author: Stephan Bergmann 
Date:   Tue Sep 20 11:01:29 2016 +0200

external/liborcus: Mark patch as upstreamed

Change-Id: Id830c74cbdfb759300ae278df2ece642eb3579bb

diff --git a/external/liborcus/visibility.patch.0 
b/external/liborcus/visibility.patch.0
index c9c53a9..a62ecf7 100644
--- a/external/liborcus/visibility.patch.0
+++ b/external/liborcus/visibility.patch.0
@@ -1,3 +1,7 @@
+Upstreamed as
+
+"Allow passed-in CXXFLAGS to override -fvisibility=hidden":
+
 --- configure
 +++ configure
 @@ -4255,7 +4255,7 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2016-09-20 Thread Stephan Bergmann

 external/liborcus/UnpackedTarball_liborcus.mk |1 +
 external/liborcus/visibility.patch.0  |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit ee0a0b840763df64ee8940697dbea69c6cccf5e9
Author: Stephan Bergmann 
Date:   Tue Sep 20 09:57:01 2016 +0200

external/liborcus: Let us override -fvisiblity=hidden

(needed by UBSan builds that use -fvisibility-ms-compat instead)

Change-Id: Ifabaf352cf2b9e77f9458eff46e240141f9e729d

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 09b3c28..5d09d6d 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \
+   external/liborcus/visibility.patch.0 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/visibility.patch.0 
b/external/liborcus/visibility.patch.0
new file mode 100644
index 000..c9c53a9
--- /dev/null
+++ b/external/liborcus/visibility.patch.0
@@ -0,0 +1,11 @@
+--- configure
 configure
+@@ -4255,7 +4255,7 @@
+ 
+   fi
+ 
+-CXXFLAGS="$CXXFLAGS -fvisibility=hidden -Wall -pthread"
++CXXFLAGS="-fvisibility=hidden $CXXFLAGS -Wall -pthread"
+ 
+ # ===
+ # Find required base packages
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2016-09-19 Thread Miklos Vajna

 external/liborcus/UnpackedTarball_liborcus.mk |5 +
 external/liborcus/android-workaround.patch|   22 ++
 2 files changed, 27 insertions(+)

New commits:
commit c2673a358c78b864c1276f7956d5a348003b7a02
Author: Miklos Vajna 
Date:   Mon Sep 19 10:14:50 2016 +0200

liborcus: fix Android build

stoi() is missing in the std namespace on the broken Android toolchain,
work it around.

Change-Id: I9ea4f89bea346a4383fbb99e03b09ebae43d21e5

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 08f3423..09b3c28 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -23,6 +23,11 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/windows-constants-hack.patch \
 ))
 endif
+ifeq ($(OS),ANDROID)
+$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
+   external/liborcus/android-workaround.patch \
+))
+endif
 
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/liborcus/android-workaround.patch 
b/external/liborcus/android-workaround.patch
new file mode 100644
index 000..f9d047d
--- /dev/null
+++ b/external/liborcus/android-workaround.patch
@@ -0,0 +1,22 @@
+diff --git a/src/parser/sax_parser_base.cpp b/src/parser/sax_parser_base.cpp
+index 743130d..2624bd5 100644
+--- a/src/parser/sax_parser_base.cpp
 b/src/parser/sax_parser_base.cpp
+@@ -12,6 +12,17 @@
+ #include 
+ #include 
+ 
++#ifdef __ANDROID__
++namespace std
++{
++int stoi(const std::string& str, std::size_t* /*pos*/ = 0, int base = 10)
++{
++char* end;
++return strtol(str.c_str(), &end, base);
++}
++}
++#endif
++
+ namespace orcus { namespace sax {
+ 
+ malformed_xml_error::malformed_xml_error(const std::string& msg, 
std::ptrdiff_t offset) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2016-08-26 Thread David Tardon

 external/liborcus/Library_orcus.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 4462447b8a48ad097e56c47e3736d80dc4aaa13a
Author: David Tardon 
Date:   Fri Aug 26 12:57:24 2016 +0200

tdf#94834 enable liborcus format detection on Windows

Change-Id: Ia6b353ed800eabd5766cc76e799f6151b71f865e

diff --git a/external/liborcus/Library_orcus.mk 
b/external/liborcus/Library_orcus.mk
index 96169f1..e49adca 100644
--- a/external/liborcus/Library_orcus.mk
+++ b/external/liborcus/Library_orcus.mk
@@ -30,6 +30,10 @@ $(eval $(call gb_Library_set_include,orcus,\
 $(eval $(call gb_Library_add_defs,orcus,\
-DBOOST_ALL_NO_LIB \
-D__ORCUS_BUILDING_DLL \
+   -D__ORCUS_GNUMERIC \
+   -D__ORCUS_ODS \
+   -D__ORCUS_XLSX \
+   -D__ORCUS_XLS_XML \
 ))
 
 $(eval $(call gb_Library_use_libraries,orcus,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2015-12-02 Thread Stephan Bergmann

 external/liborcus/Library_orcus-parser.mk |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 6054cfcb6e8531791f3daaf5c78f60050b67e761
Author: Stephan Bergmann 
Date:   Wed Dec 2 16:10:53 2015 +0100

Revert "external/liborcus: Silence clang-cl errors about redeclared Windows 
functions"

This reverts commit be0bf120299cff1ec14af1b578d4ea89976cea08, which is no 
longer
needed after 12fc5b85ddc3b90b385ad0fc2ab0144a32bf9a4b "unnecessary include
brings in boost headers that are broken under rhel-7"

diff --git a/external/liborcus/Library_orcus-parser.mk 
b/external/liborcus/Library_orcus-parser.mk
index 50c7f72..c3b4eec 100644
--- a/external/liborcus/Library_orcus-parser.mk
+++ b/external/liborcus/Library_orcus-parser.mk
@@ -29,13 +29,6 @@ $(eval $(call gb_Library_add_defs,orcus-parser,\
-DBOOST_ALL_NO_LIB \
-D__ORCUS_PSR_BUILDING_DLL \
 ))
-ifeq ($(OS),WNT)
-ifeq ($(COM_IS_CLANG),TRUE)
-$(eval $(call gb_Library_add_defs,orcus-parser, \
--DBOOST_USE_WINDOWS_H \
-))
-endif
-endif
 
 $(eval $(call gb_Library_set_generated_cxx_suffix,orcus-parser,cpp))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2015-12-02 Thread Caolán McNamara

 external/liborcus/UnpackedTarball_liborcus.mk |1 +
 external/liborcus/unusedheader.patch.0|   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit 12fc5b85ddc3b90b385ad0fc2ab0144a32bf9a4b
Author: CaolÃ¡n McNamara 
Date:   Wed Dec 2 14:41:11 2015 +

unnecessary include brings in boost headers that are broken under rhel-7

Change-Id: I1ad477b9db9ba960ae2c417799e5d91b63538d57

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index f278049..825fa49 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \
external/liborcus/fix-crash-ooo55043-1.patch.0 \
+   external/liborcus/unusedheader.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/liborcus/unusedheader.patch.0 
b/external/liborcus/unusedheader.patch.0
new file mode 100644
index 000..4f7a77b
--- /dev/null
+++ b/external/liborcus/unusedheader.patch.0
@@ -0,0 +1,11 @@
+--- ./src/parser/pstring.cpp.orig  2015-12-02 14:38:44.658744408 +
 ./src/parser/pstring.cpp   2015-12-02 14:38:50.449658497 +
+@@ -13,8 +13,6 @@
+ #include 
+ #include 
+ 
+-#include 
+-
+ using namespace std;
+ 
+ namespace orcus {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2015-10-11 Thread Caolán McNamara

 external/liborcus/UnpackedTarball_liborcus.mk  |1 +
 external/liborcus/fix-crash-ooo55043-1.patch.0 |   17 +
 2 files changed, 18 insertions(+)

New commits:
commit 50529b713221548d9aa7447d125b734b8de44fa0
Author: CaolÃ¡n McNamara 
Date:   Sun Oct 11 21:20:37 2015 +0100

fix crash on examining ooo55043-1.odt etc

Change-Id: I3b57f50b09d491bd1b021eb95587becbd3f169a2

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index e242cfc..f278049 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \
+   external/liborcus/fix-crash-ooo55043-1.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/liborcus/fix-crash-ooo55043-1.patch.0 
b/external/liborcus/fix-crash-ooo55043-1.patch.0
new file mode 100644
index 000..58a97c0
--- /dev/null
+++ b/external/liborcus/fix-crash-ooo55043-1.patch.0
@@ -0,0 +1,17 @@
+--- src/parser/zip_archive_stream.cpp
 src/parser/zip_archive_stream.cpp
+@@ -91,8 +91,13 @@
+ 
+ void zip_archive_stream_blob::read(unsigned char* buffer, size_t length) const
+ {
++if (!length)
++return;
+ // First, make sure we have enough blob to satisfy the requested stream 
length.
+-size_t length_available = m_size - tell();
++const size_t pos = tell();
++if (pos > m_size)
++throw zip_error("Stream is seeked past end. No data available");
++const size_t length_available = m_size - pos;
+ if (length_available < length)
+ throw zip_error("There is not enough stream left to fill requested 
length.");
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2015-06-20 Thread David Tardon

 external/liborcus/ExternalProject_liborcus.mk |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 994bb22c8f34786c1d4b0a787f85c16f117aba96
Author: David Tardon 
Date:   Sat Jun 20 19:09:53 2015 +0200

force liborcus to use internal boost if needed

... in a different way. Because my patch to boost.m4 has been rejected.

Change-Id: I524eee367d5e295f8177e1f50dfdf1d0893ca0c6

diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index 1869428..37af7c8 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -103,10 +103,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) 
:
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
$(if $(SYSTEM_BOOST),,\
--with-boost=$(WORKDIR)/UnpackedTarball/boost \
-   BOOST_IOSTREAMS_LDFLAGS=' ' \
-   BOOST_IOSTREAMS_LIBS=' ' \
-   BOOST_SYSTEM_LDFLAGS=' ' \
-   BOOST_SYSTEM_LIBS=' ' \
+   boost_cv_lib_iostreams=yes \
+   boost_cv_lib_system=yes \
) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
&& $(if $(VERBOSE)$(verbose),V=1) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2015-06-11 Thread David Tardon

 external/liborcus/ExternalProject_liborcus.mk |8 +
 external/liborcus/UnpackedTarball_liborcus.mk |1 
 external/liborcus/boost.patch.0   |  106 ++
 3 files changed, 114 insertions(+), 1 deletion(-)

New commits:
commit fe51d68f9a3056180a9496cded3fd823ac6ce1bc
Author: David Tardon 
Date:   Thu Jun 11 14:05:52 2015 +0200

force liborcus to use internal boost if needed

Change-Id: I96b23262edf05d2589590f5e29a5b7a11b49e7aa

diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index 98bc45b..1869428 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -101,7 +101,13 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) 
:
--without-tools \
--disable-werror \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
-   $(if 
$(SYSTEM_BOOST),,--with-boost=$(WORKDIR)/UnpackedTarball/boost) \
+   $(if $(SYSTEM_BOOST),,\
+   --with-boost=$(WORKDIR)/UnpackedTarball/boost \
+   BOOST_IOSTREAMS_LDFLAGS=' ' \
+   BOOST_IOSTREAMS_LIBS=' ' \
+   BOOST_SYSTEM_LDFLAGS=' ' \
+   BOOST_SYSTEM_LIBS=' ' \
+   ) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
&& $(if $(VERBOSE)$(verbose),V=1) \
   $(MAKE) \
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 6cae540..b4859cf 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\

external/liborcus/0001-these-functions-are-implemented-in-liborcus.patch \
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \
+   external/liborcus/boost.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/liborcus/boost.patch.0 b/external/liborcus/boost.patch.0
new file mode 100644
index 000..b0278be
--- /dev/null
+++ b/external/liborcus/boost.patch.0
@@ -0,0 +1,106 @@
+--- configure.old  2015-06-10 13:18:15.791765357 +0200
 configure  2015-06-10 13:18:31.604545887 +0200
+@@ -17236,6 +17236,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
++if test x"$BOOST_SYSTEM_LIBS" == "x" -o x"$BOOST_SYSTEM_LDFLAGS" == "x"; then
+ if test x"$boost_cv_inc_path" = xno; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching 
for the Boost system library" >&5
+ $as_echo "$as_me: Boost not available, not searching for the Boost system 
library" >&6;}
+@@ -17519,6 +17520,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ fi
++fi
+ 
+ 
+ 
+@@ -1,7 +17779,8 @@ fi
+ 
+ if test "x$with_gnumeric_filter" != "xno"; then :
+ 
+-if test x"$boost_cv_inc_path" = xno; then
++if test x"$BOOST_IOSTREAMS_LIBS" == "x" -o 
x"$BOOST_IOSTREAMS_LDFLAGS" == "x"; then
++if test x"$boost_cv_inc_path" = xno; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching 
for the Boost iostreams library" >&5
+ $as_echo "$as_me: Boost not available, not searching for the Boost iostreams 
library" >&6;}
+ else
+@@ -18060,6 +18063,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ fi
++fi
+ 
+ 
+ 
+@@ -18068,7 +18072,8 @@ fi
+ 
+ if test "x$with_tools" != "xno"; then :
+ 
+-if test x"$boost_cv_inc_path" = xno; then
++if test x"$BOOST_PROGRAM_OPTIONS_LIBS" == "x" -o 
x"$BOOST_PROGRAM_OPTIONS_LDFLAGS" == "x"; then
++if test x"$boost_cv_inc_path" = xno; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching 
for the Boost program_options library" >&5
+ $as_echo "$as_me: Boost not available, not searching for the Boost 
program_options library" >&6;}
+ else
+@@ -18351,6 +18356,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ fi
++fi
+ 
+ 
+ 
+@@ -18358,7 +18364,8 @@ fi
+ # added as of 1.35.0.  If we have a version <1.35, we must not attempt to
+ # find Boost.System as it didn't exist by then.
+ if test $boost_major_version -ge 135; then
+-

[Libreoffice-commits] core.git: external/liborcus

2015-06-10 Thread Stephan Bergmann

 external/liborcus/ExternalProject_liborcus.mk |4 
 external/liborcus/UnpackedTarball_liborcus.mk |1 +
 external/liborcus/rpath.patch.0   |   10 ++
 3 files changed, 15 insertions(+)

New commits:
commit 371cc81bd9ccbfbed25f810e70899c044280349e
Author: Stephan Bergmann 
Date:   Wed Jun 10 11:18:23 2015 +0200

external/liborcus: Fix Linux RPATH

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

diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index 5c7736e..98bc45b 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -77,6 +77,10 @@ ifneq (,$(PTHREAD_LIBS))
 liborcus_LDFLAGS+=$(PTHREAD_LIBS)
 endif
 
+ifeq ($(OS),LINUX)
+liborcus_LDFLAGS+=-Wl,-z,origin -Wl,-rpath,\ORIGIN
+endif
+
 $(call gb_ExternalProject_get_state_target,liborcus,build) :
$(call gb_ExternalProject_run,build,\
$(if $(liborcus_LIBS),LIBS='$(liborcus_LIBS)') \
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index ae569ed..6cae540 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-mark-more-symbols-as-public.patch \

external/liborcus/0001-these-functions-are-implemented-in-liborcus.patch \
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
+   external/liborcus/rpath.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/liborcus/rpath.patch.0 b/external/liborcus/rpath.patch.0
new file mode 100644
index 000..e7a33e6
--- /dev/null
+++ b/external/liborcus/rpath.patch.0
@@ -0,0 +1,10 @@
+--- configure
 configure
+@@ -14007,6 +14007,7 @@
+   esac
+   ;;
+   esac
++hardcode_libdir_flag_spec_CXX=
+   ;;
+ 
+   lynxos*)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2015-06-09 Thread Stephan Bergmann

 external/liborcus/ExternalProject_liborcus.mk |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 2b121ad11a4e465bff94816513f6e390061aa811
Author: Stephan Bergmann 
Date:   Tue Jun 9 21:27:54 2015 +0200

Fix Mac OS X install names of external liborcus

Change-Id: I0304b13b441654636f633a97012ac91863d0b4d9

diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index c9adc47..5c7736e 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -96,10 +96,16 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
--disable-spreadsheet-model \
--without-tools \
--disable-werror \
+   $(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
$(if 
$(SYSTEM_BOOST),,--with-boost=$(WORKDIR)/UnpackedTarball/boost) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
&& $(if $(VERBOSE)$(verbose),V=1) \
   $(MAKE) \
+   $(if $(filter MACOSX,$(OS)),\
+   && $(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+   
$(gb_Package_SOURCEDIR_liborcus)/src/liborcus/.libs/liborcus-0.10.0.dylib \
+   
$(gb_Package_SOURCEDIR_liborcus)/src/parser/.libs/liborcus-parser-0.10.0.dylib \
+   ) \
)
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2015-06-05 Thread David Tardon

 external/liborcus/ExternalProject_liborcus.mk |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit b46276e6c02b22441f87b2bf689e2aa61f806688
Author: David Tardon 
Date:   Fri Jun 5 14:35:21 2015 +0200

better way to do this

Change-Id: I4a18927f2c9b6414134e5ea016121693ac47ecf9

diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index 12f22f7..c9adc47 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -87,7 +87,11 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
MDDS_LIBS=' ' \
MAKE=$(MAKE) ./configure \
--with-pic \
-   $(if $(filter IOS ANDROID,$(OS)), --disable-shared 
--enable-static, --enable-shared --disable-static) \
+   $(if $(DISABLE_DYNLOADING), \
+   --enable-static --disable-shared \
+   , \
+   --enable-shared --disable-static \
+   ) \
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-spreadsheet-model \
--without-tools \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2015-06-05 Thread Miklos Vajna

 external/liborcus/ExternalProject_liborcus.mk |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 0aed9cbb6c6e8e048a90fed61f44efbe09efac4f
Author: Miklos Vajna 
Date:   Fri Jun 5 14:06:39 2015 +0200

liborcus: still build statically on Android

Change-Id: Ieeb5180ea7f96cb08d06bf895bd2a6ffc6c1cef0

diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index 8a53fa8..12f22f7 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -87,8 +87,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
MDDS_LIBS=' ' \
MAKE=$(MAKE) ./configure \
--with-pic \
-   --enable-shared \
-   --disable-static \
+   $(if $(filter IOS ANDROID,$(OS)), --disable-shared 
--enable-static, --enable-shared --disable-static) \
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-spreadsheet-model \
--without-tools \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2015-03-03 Thread Stephan Bergmann

 external/liborcus/liborcus_0.1.0-dllimport.patch |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f6977bb87a2eb962e433f85d2e317b8f932f5251
Author: Stephan Bergmann 
Date:   Tue Mar 3 11:56:40 2015 +0100

Further reduce amount of symbols exported from static orcus library

Following up on 7a4cc197910546d6fb3469806c406bf358ba0168 "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
f0aa1a78fb209310e8baef53c02f365fca518d11 "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

diff --git a/external/liborcus/liborcus_0.1.0-dllimport.patch 
b/external/liborcus/liborcus_0.1.0-dllimport.patch
index 7c91a77..8940155 100644
--- a/external/liborcus/liborcus_0.1.0-dllimport.patch
+++ b/external/liborcus/liborcus_0.1.0-dllimport.patch
@@ -18,7 +18,7 @@
  #else
#if __GNUC__ >= 4
 -#define ORCUS_DLLPUBLIC __attribute__ ((visibility ("default")))
-+#define ORCUS_DLLPUBLIC
++#define ORCUS_DLLPUBLIC __attribute__ ((visibility ("hidden")))
  #define ORCUS_DLLLOCAL  __attribute__ ((visibility ("hidden")))
#else
  #define ORCUS_DLLPUBLIC
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2015-02-19 Thread David Ostrovsky

 external/liborcus/ExternalProject_liborcus.mk |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 38671c869d8903ba7d0bd516d53ba0ff9d152adf
Author: David Ostrovsky 
Date:   Thu Feb 19 21:22:23 2015 +0100

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 
Reviewed-by: Michael Stahl 

diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index 85f1588..9e68331 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -47,9 +47,6 @@ liborcus_LIBS+=-lgnustl_shared -lm
 endif
 
 liborcus_CPPCLAGS=$(CPPFLAGS)
-ifeq ($(COM),MSC)
-liborcus_CPPFLAGS+=-DBOOST_ALL_NO_LIB
-endif
 ifeq ($(SYSTEM_ZLIB),)
 liborcus_CPPFLAGS+=$(ZLIB_CFLAGS)
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2015-02-10 Thread Stephan Bergmann

 external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0 |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit cdd8ab7e0caa5b6845581afd5fc69bc69b5589df
Author: Stephan Bergmann 
Date:   Tue Feb 10 17:57:48 2015 +0100

...next attempt at getting this through both GCC 5 and MSVC

Change-Id: Id367dee6c4fe55fe039ebf28603c883014194832

diff --git a/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0 
b/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0
index 1827a34..79d372c 100644
--- a/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0
+++ b/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0
@@ -296,7 +296,7 @@
  boost_save_IFS=$IFS
  boost_version_req=1.36
  IFS=.
-@@ -16193,17 +16356,28 @@ $as_echo_n "checking for Boost's header
+@@ -16193,17 +16356,30 @@ $as_echo_n "checking for Boost's header
  if ${boost_cv_lib_version+:} false; then :
$as_echo_n "(cached) " >&6
  else
@@ -313,9 +313,11 @@
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  grep -v '#' |
++  grep -Ev '^(conftest.cpp| *command-line arguments :)' |
tr -d '\r' |
 -  $SED -n -e "/^boost-lib-version = /{s///;s/\"//g;p;q;}" >conftest.i 2>&1; 
then :
-+  $SED -n -e "/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}" >conftest.i 
2>&1; then :
++  tr -s '\n' ' ' |
++  $SED -n -e "/^ *boost-lib-version = /{s///;s/[\" ]//g;p;q;}" >conftest.i 
2>&1; then :
boost_cv_lib_version=`cat conftest.i`
  fi
  rm -rf conftest*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2015-02-10 Thread Stephan Bergmann

 external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0 |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit a5ec343f6cb522f4d41e097eda48042bf85c4578
Author: Stephan Bergmann 
Date:   Tue Feb 10 17:25:41 2015 +0100

How is that supposed to ever work?

Change-Id: Ieb13095abb399662e449fad5a056999343165025

diff --git a/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0 
b/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0
index a029a27..1827a34 100644
--- a/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0
+++ b/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0
@@ -296,7 +296,7 @@
  boost_save_IFS=$IFS
  boost_version_req=1.36
  IFS=.
-@@ -16193,17 +16356,29 @@ $as_echo_n "checking for Boost's header
+@@ -16193,17 +16356,28 @@ $as_echo_n "checking for Boost's header
  if ${boost_cv_lib_version+:} false; then :
$as_echo_n "(cached) " >&6
  else
@@ -315,7 +315,6 @@
 +  grep -v '#' |
tr -d '\r' |
 -  $SED -n -e "/^boost-lib-version = /{s///;s/\"//g;p;q;}" >conftest.i 2>&1; 
then :
-+  tr -s '\n' ' ' |
 +  $SED -n -e "/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}" >conftest.i 
2>&1; then :
boost_cv_lib_version=`cat conftest.i`
  fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2015-02-09 Thread David Tardon

 external/liborcus/UnpackedTarball_liborcus.mk   |2 
 external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0 | 1799 
 2 files changed, 1801 insertions(+)

New commits:
commit 8b68841c1482d98bee98de0a60910b93feb8f8b6
Author: David Tardon 
Date:   Mon Feb 9 23:50:03 2015 +0100

fix liborcus build with gcc 5

Change-Id: I38b2ecf86d4334d0179362079a216df4301bf184

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 696c34a..66022d5 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -29,6 +29,8 @@ endif
 # f60d6eecee72349993a392a9a63ddf3383d3b8c8-
 # f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>:
 
+liborcus_patches += liborcus_0.7.0-configure.gcc5.patch.0
+
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
$(foreach patch,$(liborcus_patches),external/liborcus/$(patch)) \
 ))
diff --git a/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0 
b/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0
new file mode 100644
index 000..a029a27
--- /dev/null
+++ b/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0
@@ -0,0 +1,1799 @@
+--- configure.old  2013-10-15 04:17:59.0 +0200
 configure  2015-02-09 23:41:48.525767041 +0100
+@@ -1471,7 +1471,7 @@ Optional Features:
+   --disable-libtool-lock  avoid locking (might break parallel builds)
+   --enable-static-boost   Prefer the static boost libraries over the shared
+   ones [no]
+-  --disable-werrorTreat all warnings as errors, useful for development
++  --enable-werror Treat all warnings as errors, useful for development
+   --enable-debug  Build with debug features in mind.]
+   --disable-spreadsheet-model
+   Disable the spreadsheet model implementation in
+@@ -2592,7 +2592,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ ac_config_headers="$ac_config_headers config.h"
+ 
+-am__api_version='1.12'
++am__api_version='1.14'
+ 
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+@@ -2805,8 +2805,8 @@ if test x"${MISSING+set}" != xset; then
+   esac
+ fi
+ # Use eval to expand $SHELL
+-if eval "$MISSING --run true"; then
+-  am_missing_run="$MISSING --run "
++if eval "$MISSING --is-lightweight"; then
++  am_missing_run="$MISSING "
+ else
+   am_missing_run=
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too 
old or missing" >&5
+@@ -3046,6 +3046,45 @@ else
+ fi
+ rmdir .tst 2>/dev/null
+ 
++# Check whether --enable-silent-rules was given.
++if test "${enable_silent_rules+set}" = set; then :
++  enableval=$enable_silent_rules;
++fi
++
++case $enable_silent_rules in # (((
++  yes) AM_DEFAULT_VERBOSITY=0;;
++   no) AM_DEFAULT_VERBOSITY=1;;
++*) AM_DEFAULT_VERBOSITY=1;;
++esac
++am_make=${MAKE-make}
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports 
nested variables" >&5
++$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
++if ${am_cv_make_support_nested_variables+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if $as_echo 'TRUE=$(BAR$(V))
++BAR0=false
++BAR1=true
++V=1
++am__doit:
++  @$(TRUE)
++.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
++  am_cv_make_support_nested_variables=yes
++else
++  am_cv_make_support_nested_variables=no
++fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 
$am_cv_make_support_nested_variables" >&5
++$as_echo "$am_cv_make_support_nested_variables" >&6; }
++if test $am_cv_make_support_nested_variables = yes; then
++AM_V='$(V)'
++  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
++else
++  AM_V=$AM_DEFAULT_VERBOSITY
++  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
++fi
++AM_BACKSLASH='\'
++
+ if test "`cd $srcdir && pwd`" != "`pwd`"; then
+   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+   # is not polluted with repeated "-I."
+@@ -3096,19 +3135,70 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
+ 
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
+-mkdir_p="$MKDIR_P"
++# For better backward compatibility.  To be removed once Automake 1.9.x
++# dies out for good.  For more background, see:
++# 
++# 
++mkdir_p='$(MKDIR_P)'
++
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ # Always define AMTAR for backward compatibility.  Yes, it's still used
+ # in the wild :-(  We should find a proper way to deprecate it ...
+ AMTAR='$${TAR-tar}'
+ 
++
++# We'll loop over all known methods to create a tar archive until one works.
++_am_tools='gnutar  pax cpio none'
++
+ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+ 
+ 
+ 
+ 
+ 
++
++# POSIX will say in a future version that running "rm -f" with no argument
++# is OK; and we want to be able to make th

[Libreoffice-commits] core.git: external/liborcus

2014-03-03 Thread Markus Mohrhard

 external/liborcus/liborcus-handle-invalid-xml.patch.1 |   12 --
 external/liborcus/liborcus_0.1.0-tac.patch|   20 --
 2 files changed, 32 deletions(-)

New commits:
commit 9c6f0a676048bdbdf0b4866d5e5afd5a436b146e
Author: Markus Mohrhard 
Date:   Tue Mar 4 06:47:55 2014 +0100

remove unnecessary patches

They have been applied upstream and are part of the new release.

Change-Id: I928b29e74abe2415bdf75de32cbaa7ac279a2889

diff --git a/external/liborcus/liborcus-handle-invalid-xml.patch.1 
b/external/liborcus/liborcus-handle-invalid-xml.patch.1
deleted file mode 100644
index 4cb091d..000
--- a/external/liborcus/liborcus-handle-invalid-xml.patch.1
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur liborcus.org/include/orcus/sax_parser.hpp 
liborcus/include/orcus/sax_parser.hpp
 liborcus.org/include/orcus/sax_parser.hpp  2013-12-13 20:51:55.126503773 
+0100
-+++ liborcus/include/orcus/sax_parser.hpp  2013-12-13 20:57:39.076174743 
+0100
-@@ -278,6 +278,8 @@
- special_tag();
- break;
- default:
-+if (!is_alpha(c))
-+throw malformed_xml_error("expect an alphabet.");
- element_open(pos);
- }
- }
diff --git a/external/liborcus/liborcus_0.1.0-tac.patch 
b/external/liborcus/liborcus_0.1.0-tac.patch
deleted file mode 100644
index 01c77a9..000
--- a/external/liborcus/liborcus_0.1.0-tac.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 configure
-+++ configure
-@@ -15668,7 +15668,7 @@
- 
-   LDFLAGS_SAVE=$LDFLAGS
- if test "x$ax_boost_user_system_lib" = "x"; then
--for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* 
$BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 
's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;' | tac` ; do
-+for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* 
$BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 
's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;' | tail -r` ; do
-  ax_lib=${libextension}
-   as_ac_Lib=`$as_echo 
"ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
-@@ -15716,7 +15716,7 @@
- 
-   done
- if test "x$link_system" != "xyes"; then
--for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 
2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;' 
| tac` ; do
-+for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 
2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;' 
| tail -r` ; do
-  ax_lib=${libextension}
-   as_ac_Lib=`$as_echo 
"ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2014-03-03 Thread Markus Mohrhard

 external/liborcus/UnpackedTarball_liborcus.mk |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 7801c94bffdabe669601d23e86f2f2a41447902d
Author: Markus Mohrhard 
Date:   Mon Mar 3 17:59:05 2014 +0100

I think we don't need that Mac patch anymore

Change-Id: I6619e70f3f7c8ba4d17be4ca434057948be3d79f

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index d046f80..696c34a 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -21,11 +21,6 @@ liborcus_patches :=
 # don't use dllimport
 liborcus_patches += liborcus_0.1.0-dllimport.patch
 
-ifeq ($(OS),MACOSX)
-# no "tac" command on OS X, but "tail -r"
-liborcus_patches += liborcus_0.1.0-tac.patch
-endif
-
 ifneq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE)
 liborcus_patches += visibility.patch
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus external/python3

2014-02-22 Thread Matúš Kukan

 external/liborcus/ExternalProject_liborcus.mk |2 +-
 external/python3/ExternalProject_python3.mk   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6ae1323442bfa647220d6c46219cff91a849873b
Author: MatÃºÅ¡ Kukan 
Date:   Sat Feb 22 18:27:30 2014 +0100

external: Use gb_LTOFLAGS only in LDFLAGS to fix building.

liborcus was not building for me with -flto in CFLAGS, I would have to
fix ar somehow.
-flto in LDFLAGS is just to fix the build if the external library does use
another library built by us with -flto: does happen for liborcus and 
python3.
It's not like we would use -flto for external libraries consistently anyway,
the only exception is icu: no idea why we build with -flto there.

Change-Id: Ia54d619674b8999ce5e4b920ba77b1587c9cf48d

diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index 4247e51..d5776f0 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -68,7 +68,7 @@ liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
 endif
 endif
 
-liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_LTOFLAGS)
+liborcus_CXXFLAGS=$(CXXFLAGS)
 liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS)
 ifeq ($(COM),MSC)
 liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
diff --git a/external/python3/ExternalProject_python3.mk 
b/external/python3/ExternalProject_python3.mk
index 8cce5cb..e07d897 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -51,7 +51,7 @@ else
 # create a symlink "LO_lib" because the .so are in a directory with platform
 # specific name like build/lib.linux-x86_64-3.3
 
-python3_cflags = $(ZLIB_CFLAGS) $(gb_LTOFLAGS)
+python3_cflags = $(ZLIB_CFLAGS)
 ifneq (,$(ENABLE_VALGRIND))
 python3_cflags += $(VALGRIND_CFLAGS)
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2014-02-21 Thread Matúš Kukan

 external/liborcus/ExternalProject_liborcus.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a11dff0342cd826c6e680a83a011e606595acfb7
Author: MatÃºÅ¡ Kukan 
Date:   Fri Feb 21 18:28:19 2014 +0100

Build liborcus with lto flags. To unbreak linking phase.

Change-Id: Ie24054a9c0538187e1b234101dd41f30306ec2ae

diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index a62855d4e..4247e51 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -68,8 +68,8 @@ liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
 endif
 endif
 
-liborcus_CXXFLAGS=$(CXXFLAGS)
-liborcus_LDFLAGS=$(LDFLAGS)
+liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_LTOFLAGS)
+liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS)
 ifeq ($(COM),MSC)
 liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2013-12-13 Thread Markus Mohrhard

 external/liborcus/UnpackedTarball_liborcus.mk |3 +++
 external/liborcus/liborcus-handle-invalid-xml.patch.1 |   12 
 2 files changed, 15 insertions(+)

New commits:
commit ece94ab98fd8564a5419ea370c0d1f0e6afe188a
Author: Markus Mohrhard 
Date:   Fri Dec 13 21:06:04 2013 +0100

handle invalid xml files in orcus, fdo#63844

Change-Id: I82fff6ab89acece0e46c92bfca2c7faf967639b8

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 9e2df47..930543c 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -21,6 +21,9 @@ liborcus_patches += liborcus_0.1.0-configure.patch
 # don't use dllimport
 liborcus_patches += liborcus_0.1.0-dllimport.patch
 
+# fdo#63844
+liborcus_patches += liborcus-handle-invalid-xml.patch.1
+
 ifeq ($(OS),MACOSX)
 # no "tac" command on OS X, but "tail -r"
 liborcus_patches += liborcus_0.1.0-tac.patch
diff --git a/external/liborcus/liborcus-handle-invalid-xml.patch.1 
b/external/liborcus/liborcus-handle-invalid-xml.patch.1
new file mode 100644
index 000..4cb091d
--- /dev/null
+++ b/external/liborcus/liborcus-handle-invalid-xml.patch.1
@@ -0,0 +1,12 @@
+diff -ur liborcus.org/include/orcus/sax_parser.hpp 
liborcus/include/orcus/sax_parser.hpp
+--- liborcus.org/include/orcus/sax_parser.hpp  2013-12-13 20:51:55.126503773 
+0100
 liborcus/include/orcus/sax_parser.hpp  2013-12-13 20:57:39.076174743 
+0100
+@@ -278,6 +278,8 @@
+ special_tag();
+ break;
+ default:
++if (!is_alpha(c))
++throw malformed_xml_error("expect an alphabet.");
+ element_open(pos);
+ }
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus external/Module_external.mk liborcus/ExternalProject_liborcus.mk liborcus/liborcus_0.1.0-configure.patch liborcus/liborcus_0.1.0-dllimport.patch libor

2013-10-19 Thread Khaled Hosny

 RepositoryModule_host.mk |1 
 external/Module_external.mk  |1 
 external/liborcus/ExternalProject_liborcus.mk|  100 +++
 external/liborcus/Makefile   |7 +
 external/liborcus/Module_liborcus.mk |   17 +++
 external/liborcus/UnpackedTarball_liborcus.mk|   41 +
 external/liborcus/liborcus_0.1.0-configure.patch |   20 
 external/liborcus/liborcus_0.1.0-dllimport.patch |   18 
 external/liborcus/liborcus_0.1.0-tac.patch   |   20 
 external/liborcus/visibility.patch   |   11 ++
 liborcus/ExternalProject_liborcus.mk |  100 ---
 liborcus/Makefile|7 -
 liborcus/Module_liborcus.mk  |   21 
 liborcus/UnpackedTarball_liborcus.mk |   41 -
 liborcus/liborcus_0.1.0-configure.patch  |   20 
 liborcus/liborcus_0.1.0-dllimport.patch  |   18 
 liborcus/liborcus_0.1.0-tac.patch|   20 
 liborcus/visibility.patch|   11 --
 18 files changed, 235 insertions(+), 239 deletions(-)

New commits:
commit 392726f04252fa3802ade7c31ca65fac57896861
Author: Khaled Hosny 
Date:   Fri Oct 18 22:15:14 2013 +0200

fdo#70393: move liborcus to a subdir of external

Change-Id: Ibdf8c9fc9d7d2639ebd440ff2d833ab37ae76d98
Reviewed-on: https://gerrit.libreoffice.org/6334
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 30e4e25..aa47dfb 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
jvmaccess \
jvmfwk \
$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
-   $(call gb_Helper_optional,ORCUS,liborcus) \
librelogo \
$(call gb_Helper_optional,VISIO,libvisio) \
$(call gb_Helper_optional,WPD,libwpd) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 5e60a64..13846f4 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,MSPUB,libmspub) \
$(call gb_Helper_optional,MWAW,libmwaw) \
$(call gb_Helper_optional,ODFGEN,libodfgen) \
+   $(call gb_Helper_optional,ORCUS,liborcus) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
similarity index 100%
rename from liborcus/ExternalProject_liborcus.mk
rename to external/liborcus/ExternalProject_liborcus.mk
diff --git a/liborcus/Makefile b/external/liborcus/Makefile
similarity index 71%
rename from liborcus/Makefile
rename to external/liborcus/Makefile
index ccb1c85..e4968cf 100644
--- a/liborcus/Makefile
+++ b/external/liborcus/Makefile
@@ -2,6 +2,6 @@
 
 module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST
 
-include $(module_directory)/../solenv/gbuild/partial_build.mk
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
 
 # vim: set noet sw=4 ts=4:
diff --git a/liborcus/Module_liborcus.mk b/external/liborcus/Module_liborcus.mk
similarity index 89%
rename from liborcus/Module_liborcus.mk
rename to external/liborcus/Module_liborcus.mk
index e3c9639..42f1715 100644
--- a/liborcus/Module_liborcus.mk
+++ b/external/liborcus/Module_liborcus.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,liborcus))
 
-ifeq ($(ENABLE_ORCUS)-$(SYSTEM_LIBORCUS),TRUE-NO)
-
 $(eval $(call gb_Module_add_targets,liborcus,\
ExternalProject_liborcus \
UnpackedTarball_liborcus \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
similarity index 94%
rename from liborcus/UnpackedTarball_liborcus.mk
rename to external/liborcus/UnpackedTarball_liborcus.mk
index cb61573..9e2df47 100644
--- a/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -35,7 +35,7 @@ endif
 # f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>:
 
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
-   $(foreach patch,$(liborcus_patches),liborcus/$(patch)) \
+   $(foreach patch,$(liborcus_patches),external/liborcus/$(patch)) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/liborcus/liborcus_0.1.0-configure.patch 
b/external/liborcus/liborcus_0.1.0-configure.patch
similarity index 100%
rename from liborcus/liborcus_0.1.0-configure.patch
rename to external/liborcus/liborcus_0.1.0-configure.patch
diff --git a/liborcus/liborcus_0.1.0-dllimport.patch 
b/external/liborcus/liborcus_0.1.0-dllimport.patch
similarity index 100%
rename from liborcus/liborcus_0.1.0-dllimport.patch
rename to external/liborcus/liborcus_0.1.0-dllimport.patch
diff --git a/liborcus/liborcus_0.1.0-tac.patch 
b/extern

65 matches

Mail list logo