subject:"\[Libreoffice\-commits\] core.git\: configure.ac download.lst external\/liborcus"

[Libreoffice-commits] core.git: configure.ac download.lst external/liborcus RepositoryExternal.mk sc/source

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

 RepositoryExternal.mk|4 
 configure.ac |2 
 download.lst |4 
 external/liborcus/0001-Mark-all-untentionally-unused-variables.patch |  376 
++
 external/liborcus/ExternalPackage_liborcus.mk|8 
 external/liborcus/ExternalProject_liborcus.mk|4 
 external/liborcus/Library_orcus-parser.mk|1 
 external/liborcus/Library_orcus.mk   |4 
 external/liborcus/UnpackedTarball_liborcus.mk|1 
 external/liborcus/libtool.patch.0|   10 
 external/liborcus/windows-constants-hack.patch   |2 
 sc/source/filter/inc/orcusinterface.hxx  |   21 
 sc/source/filter/orcus/interface.cxx |   82 +-
 sc/source/filter/orcus/xmlcontext.cxx|7 
 sc/source/ui/xmlsource/xmlsourcedlg.cxx  |6 
 15 files changed, 480 insertions(+), 52 deletions(-)

New commits:
commit 109ed8f775dddfede012d56d078abd70b45490c0
Author: Kohei Yoshida 
AuthorDate: Wed Sep 9 21:23:48 2020 -0400
Commit: Kohei Yoshida 
CommitDate: Sat Sep 12 05:49:10 2020 +0200

Upgrade liborcus to 0.16.0.

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

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d9fa980d7f24..1f0a91de142a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3270,7 +3270,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.15 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.16 \
 )
 
 $(if $(SYSTEM_BOOST), \
@@ -3289,7 +3289,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.15 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.16 \
 )
 
 endef
diff --git a/configure.ac b/configure.ac
index 8e8d5eb662d9..06398bfa99a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10126,7 +10126,7 @@ AC_SUBST(ENABLE_FUZZERS)
 dnl ===
 dnl Orcus
 dnl ===
-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.15 >= 0.15.0])
+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.16 >= 0.16.0])
 if test "$with_system_orcus" != "yes"; then
 if test "$SYSTEM_BOOST" = "TRUE"; then
 # ===
diff --git a/download.lst b/download.lst
index ee4ba8a1c83b..345ddd19537b 100644
--- a/download.lst
+++ b/download.lst
@@ -206,8 +206,8 @@ export OPENLDAP_SHA256SUM := 
cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89
 export OPENLDAP_TARBALL := openldap-2.4.45.tgz
 export OPENSSL_SHA256SUM := 
ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
 export OPENSSL_TARBALL := openssl-1.1.1g.tar.gz
-export ORCUS_SHA256SUM := 
cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61
-export ORCUS_TARBALL := liborcus-0.15.4.tar.bz2
+export ORCUS_SHA256SUM := 
854c6ec167ace59baa2984e175bac7b5b2af91bfde4bb10d2088b87a51ed76ec
+export ORCUS_TARBALL := liborcus-0.16.0.tar.bz2
 export OWNCLOUD_ANDROID_LIB_SHA256SUM := 
b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
 export OWNCLOUD_ANDROID_LIB_TARBALL := 
owncloud-android-library-0.9.4-no-binary-deps.tar.gz
 export PAGEMAKER_SHA256SUM := 
66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
diff --git 
a/external/liborcus/0001-Mark-all-untentionally-unused-variables.patch 
b/external/liborcus/0001-Mark-all-untentionally-unused-variables.patch
new file mode 100644
index ..b0f6a572aff7
--- /dev/null
+++ b/external/liborcus/0001-Mark-all-untentionally-unused-variables.patch
@@ -0,0 +1,376 @@
+From 6d34c41b661a9e8dddf6d08bf1f3c1fd4f5581da Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida 
+Date: Fri, 11 Sep 2020 21:39:09 -0400
+Subject: [PATCH] Mark all untentionally unused variables.
+
+---
+ include/orcus/css_parser.hpp   | 70 --
+ include/orcus/csv_parser.hpp   |  5 ++-
+ include/orcus/json_parser.hpp  | 15 +--
+ include/orcus/sax_parser.hpp   | 35 ---
+ include/orcus/sax_token_parser.hpp | 20 +++--
+ include/orcus/yaml_parser.hpp  | 10 -
+ 6 files changed, 124 insertions(+), 31 deletions(-)
+
+diff --git a/include/orcus/css_parser.hpp

[Libreoffice-commits] core.git: configure.ac download.lst external/liborcus RepositoryExternal.mk sc/inc sc/qa sc/source svl/source

2019-08-14 Thread Kohei Yoshida (via logerrit)

 RepositoryExternal.mk   |4 -
 configure.ac|4 -
 download.lst|8 +-
 external/liborcus/0001-Prevent-unsigned-integer-underflow.patch |   27 
--
 external/liborcus/ExternalPackage_liborcus.mk   |8 +-
 external/liborcus/ExternalProject_liborcus.mk   |4 -
 external/liborcus/Library_orcus-parser.mk   |2 
 external/liborcus/Library_orcus.mk  |7 ++
 external/liborcus/UnpackedTarball_liborcus.mk   |3 -
 external/liborcus/version.patch.0   |   11 
 sc/inc/mtvelements.hxx  |8 +-
 sc/inc/orcusxml.hxx |1 
 sc/qa/unit/dataproviders_test.cxx   |1 
 sc/source/core/tool/scmatrix.cxx|8 +-
 sc/source/filter/inc/orcusinterface.hxx |2 
 sc/source/filter/orcus/interface.cxx|8 ++
 sc/source/filter/orcus/orcusfiltersimpl.cxx |4 -
 sc/source/filter/orcus/xmlcontext.cxx   |9 ++-
 sc/source/ui/xmlsource/xmlsourcedlg.cxx |6 ++
 svl/source/misc/gridprinter.cxx |2 
 20 files changed, 58 insertions(+), 69 deletions(-)

New commits:
commit 56ffe3c0a1261cd98a3d42b8b08d5f8eb013ead4
Author: Kohei Yoshida 
AuthorDate: Mon Aug 12 13:57:34 2019 -0400
Commit: Kohei Yoshida 
CommitDate: Thu Aug 15 06:09:52 2019 +0200

Switch mdds to 1.5.0 and liborcus to 0.15.0.

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

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 54ab1dbfdcc3..57f66b8f344a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3262,7 +3262,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.14 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.15 \
 )
 
 $(if $(SYSTEM_BOOST), \
@@ -3281,7 +3281,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.14 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.15 \
 )
 
 endef
diff --git a/configure.ac b/configure.ac
index 1510daf22454..d0e6759b1f52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9291,7 +9291,7 @@ AC_SUBST(SYSTEM_BOOST)
 dnl ===
 dnl Check for system mdds
 dnl ===
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.4 >= 1.4.1], 
["-I${WORKDIR}/UnpackedTarball/mdds/include"])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.5 >= 1.5.0], 
["-I${WORKDIR}/UnpackedTarball/mdds/include"])
 
 dnl ===
 dnl Check for system glm
@@ -9597,7 +9597,7 @@ AC_SUBST(ENABLE_FUZZERS)
 dnl ===
 dnl Orcus
 dnl ===
-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.14 >= 0.14.0])
+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.15 >= 0.15.0])
 if test "$with_system_orcus" != "yes"; then
 if test "$SYSTEM_BOOST" = "TRUE"; then
 # ===
diff --git a/download.lst b/download.lst
index b57ed794d2a6..59b58f96347c 100644
--- a/download.lst
+++ b/download.lst
@@ -168,8 +168,8 @@ export LXML_SHA256SUM := 
940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a
 export LXML_TARBALL := lxml-4.1.1.tgz
 export MARIADB_CONNECTOR_C_SHA256SUM := 
fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60
 export MARIADB_CONNECTOR_C_TARBALL := 
a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
-export MDDS_SHA256SUM := 
25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81
-export MDDS_TARBALL := mdds-1.4.3.tar.bz2
+export MDDS_SHA256SUM := 
74cda018d5aa39a2f91652608efb066fd225f3597ce54733e6ab1e99e52606f7
+export MDDS_TARBALL := mdds-1.5.0.tar.bz2
 export MDNSRESPONDER_SHA256SUM := 
e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0
 export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz
 export MSPUB_SHA256SUM := 
ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
@@ -194,8 +194,8 @@ export OPENLDAP_SHA256SUM :=

[Libreoffice-commits] core.git: configure.ac download.lst external/liborcus RepositoryExternal.mk sc/source

2018-08-31 Thread Libreoffice Gerrit user

 RepositoryExternal.mk   |4 
 configure.ac|2 
 download.lst|4 
 external/liborcus/0001-Missing-header-for-std-tolower.patch |   24 
 external/liborcus/ExternalPackage_liborcus.mk   |8 
 external/liborcus/ExternalProject_liborcus.mk   |4 
 external/liborcus/Library_orcus.mk  |2 
 external/liborcus/UnpackedTarball_liborcus.mk   |1 
 external/liborcus/gcc9.patch.0  |3 
 sc/source/filter/inc/orcusinterface.hxx |  107 +++
 sc/source/filter/orcus/interface.cxx|  322 
 sc/source/filter/orcus/xmlcontext.cxx   |5 
 12 files changed, 360 insertions(+), 126 deletions(-)

New commits:
commit 1d0727a104d76210814f41c1169df318e40c9d80
Author: Kohei Yoshida 
AuthorDate: Mon Aug 27 11:06:17 2018 -0400
Commit: Kohei Yoshida 
CommitDate: Sat Sep 1 01:34:10 2018 +0200

Update orcus to 0.14.0.

And make all necessary adjustments for the new version of orcus.

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

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index cec79cc105e8..f172765a84f8 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3295,7 +3295,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.13 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.14 \
 )
 
 $(if $(SYSTEM_BOOST), \
@@ -3314,7 +3314,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.13 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.14 \
 )
 
 endef
diff --git a/configure.ac b/configure.ac
index 3c9e5dc5e908..a60a3e72689f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9196,7 +9196,7 @@ AC_SUBST(ENABLE_FUZZERS)
 dnl ===
 dnl Orcus
 dnl ===
-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.13 >= 0.13.3])
+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.14 >= 0.14.0])
 if test "$with_system_orcus" != "yes"; then
 if test "$SYSTEM_BOOST" = "TRUE"; then
 # ===
diff --git a/download.lst b/download.lst
index 1ed75b36f3b3..3532e2be3aa3 100644
--- a/download.lst
+++ b/download.lst
@@ -192,8 +192,8 @@ export OPENLDAP_SHA256SUM := 
cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89
 export OPENLDAP_TARBALL := openldap-2.4.45.tgz
 export OPENSSL_SHA256SUM := 
ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d
 export OPENSSL_TARBALL := openssl-1.0.2o.tar.gz
-export ORCUS_SHA256SUM := 
bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b
-export ORCUS_TARBALL := liborcus-0.13.4.tar.gz
+export ORCUS_SHA256SUM := 
7bcfac3f4f490540292cfc87d3fde7b47eafa8450afa1e1a2c181d8293dcd4ef
+export ORCUS_TARBALL := liborcus-0.14.0.tar.gz
 export OWNCLOUD_ANDROID_LIB_SHA256SUM := 
b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
 export OWNCLOUD_ANDROID_LIB_TARBALL := 
owncloud-android-library-0.9.4-no-binary-deps.tar.gz
 export PAGEMAKER_SHA256SUM := 
66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
diff --git a/external/liborcus/0001-Missing-header-for-std-tolower.patch 
b/external/liborcus/0001-Missing-header-for-std-tolower.patch
new file mode 100644
index ..2e00be92a872
--- /dev/null
+++ b/external/liborcus/0001-Missing-header-for-std-tolower.patch
@@ -0,0 +1,24 @@
+From 3a6bb93a382b4d5f1463ee3fdd54cab7048ff996 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida 
+Date: Fri, 31 Aug 2018 16:07:06 -0400
+Subject: [PATCH] Missing header for std::tolower.
+
+---
+ src/parser/sax_token_parser.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/parser/sax_token_parser.cpp b/src/parser/sax_token_parser.cpp
+index 9790b498..44ba5844 100644
+--- a/src/parser/sax_token_parser.cpp
 b/src/parser/sax_token_parser.cpp
+@@ -9,6 +9,7 @@
+ #include "orcus/tokens.hpp"
+ 
+ #include 
++#include 
+ 
+ namespace orcus {
+ 
+-- 
+2.17.1
+
diff --git a/external/liborcus/ExternalPackage_liborcus.mk 
b/external/liborcus/ExternalPackage_liborcus.mk
index 32382b7d89a1..ffa0b38bea19 100644
--- a/external/liborcus/ExternalPackage_liborcus.mk
+++ b/external/liborcus/ExternalPackage_liborcus.mk
@@ -12,11 +12,11 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,liborcus,liborcus))
 $(eval $(call

[Libreoffice-commits] core.git: configure.ac download.lst external/liborcus

2018-02-14 Thread Kohei Yoshida

 configure.ac  |2 +-
 download.lst  |4 ++--
 external/liborcus/UnpackedTarball_liborcus.mk |4 
 3 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 45a4e70484e7d90dab07a677914ada2d948b415c
Author: Kohei Yoshida 
Date:   Wed Feb 14 21:04:28 2018 -0500

Update orcus to 0.13.3.

This will be the new baseline for master, since, though this change
is a fully API-compatible, one bug fix wrt the alpha value handling
unfortunately would break some unit tests when using an earlier
version.

Change-Id: I5a17ce4085d3311a165748154d107d12b95e2c71
Reviewed-on: https://gerrit.libreoffice.org/49784
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/configure.ac b/configure.ac
index 101050c2ae3c..e0cbf939 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9026,7 +9026,7 @@ AC_SUBST(ENABLE_FUZZERS)
 dnl ===
 dnl Orcus
 dnl ===
-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.13 >= 0.13.0])
+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.13 >= 0.13.3])
 if test "$with_system_orcus" != "yes"; then
 if test "$SYSTEM_BOOST" = "TRUE"; then
 # ===
diff --git a/download.lst b/download.lst
index 70b6833e7e63..12a5f1482c7c 100644
--- a/download.lst
+++ b/download.lst
@@ -190,8 +190,8 @@ export OPENLDAP_SHA256SUM := 
cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89
 export OPENLDAP_TARBALL := openldap-2.4.45.tgz
 export OPENSSL_SHA256SUM := 
8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f
 export OPENSSL_TARBALL := openssl-1.0.2m.tar.gz
-export ORCUS_SHA256SUM := 
0f8e85dc163881c358bd175227a970e3c70443109e2bb0d8d422439c31641df2
-export ORCUS_TARBALL := liborcus-0.13.2.tar.gz
+export ORCUS_SHA256SUM := 
62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9
+export ORCUS_TARBALL := liborcus-0.13.3.tar.gz
 export OWNCLOUD_ANDROID_LIB_SHA256SUM := 
b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
 export OWNCLOUD_ANDROID_LIB_TARBALL := 
owncloud-android-library-0.9.4-no-binary-deps.tar.gz
 export PAGEMAKER_SHA256SUM := 
66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 92e461f95e57..3ab387e734be 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -18,10 +18,6 @@ $(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/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: configure.ac download.lst external/liborcus RepositoryExternal.mk sc/source

2015-06-04 Thread David Tardon

 RepositoryExternal.mk|   
55 
 configure.ac |
2 
 download.lst |
2 
 external/liborcus/0001-fix-dllexport-decls.patch |  
101 
 external/liborcus/0001-mark-more-symbols-as-public.patch |   
52 
 external/liborcus/0001-these-functions-are-implemented-in-liborcus.patch |   
36 
 external/liborcus/0001-workaround-a-linking-problem-on-windows.patch |   
45 
 external/liborcus/ExternalPackage_liborcus.mk|   
22 
 external/liborcus/ExternalProject_liborcus.mk|
4 
 external/liborcus/Library_orcus-parser.mk|   
55 
 external/liborcus/Library_orcus.mk   |  
104 
 external/liborcus/Module_liborcus.mk |   
17 
 external/liborcus/UnpackedTarball_liborcus.mk|   
25 
 external/liborcus/liborcus_0.1.0-configure.patch |   
20 
 external/liborcus/liborcus_0.1.0-dllimport.patch |   
24 
 external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0  | 
1800 --
 external/liborcus/visibility.patch   |   
11 
 sc/source/filter/html/htmlpars.cxx   |   
30 
 sc/source/filter/inc/orcusinterface.hxx  |   
10 
 sc/source/filter/orcus/interface.cxx |   
48 
 20 files changed, 572 insertions(+), 1891 deletions(-)

New commits:
commit edb38d702dd5a058ae0702b73a43328318b94649
Author: David Tardon dtar...@redhat.com
Date:   Thu Jun 4 16:09:48 2015 +0200

update to liborcus 0.9.1

Includes switching to dynamic libs.

Change-Id: I959c4e9430f8cf95f50d48e1b01d8323dba4af81

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 47e4d17..726ef75 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3209,35 +3209,78 @@ endef
 
 else # !SYSTEM_LIBORCUS
 
+ifeq ($(COM),MSC)
+
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
+   orcus \
+   orcus-parser \
+))
+
+define gb_LinkTarget__use_orcus
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
+   $$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_use_libraries,$(1),\
+   orcus \
+)
+
+endef
+
+define gb_LinkTarget__use_orcus-parser
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
+   $$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_use_libraries,$(1),\
+   orcus-parser \
+)
+
+endef
+
+else # !MSC
+
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+   liborcus \
+))
+
 define gb_LinkTarget__use_orcus
-$(call gb_LinkTarget_use_external_project,$(1),liborcus)
+$(call gb_LinkTarget_use_package,$(1),liborcus)
+
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
$$(INCLUDE) \
 )
+
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.8$(gb_StaticLibrary_PLAINEXT)
 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.10 \
 )
 
 $(if $(SYSTEM_BOOST), \
-$(call gb_LinkTarget_add_ldflags,$(1),$(BOOST_LDFLAGS)) \
-$(call gb_LinkTarget_add_libs,$(1),$(BOOST_SYSTEM_LIB)) \
+   $(call gb_LinkTarget_add_ldflags,$(1),$(BOOST_LDFLAGS)) \
+   $(call gb_LinkTarget_add_libs,$(1),$(BOOST_SYSTEM_LIB)) \
 )
 
 endef
 
 define gb_LinkTarget__use_orcus-parser
-$(call gb_LinkTarget_use_external_project,$(1),liborcus)
+$(call gb_LinkTarget_use_package,$(1),liborcus)
+
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
$$(INCLUDE) \
 )
+
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.8$(gb_StaticLibrary_PLAINEXT)
 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.10 \
 )
 
 endef
 
+endif # MSC
+
 endif # SYSTEM_LIBORCUS
 
 else # ENABLE_ORCUS != TRUE
diff --git a/configure.ac b/configure.ac
index c7483a0..ac00539 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9012,7 +9012,7 @@ if test -z $enable_orcus -o $enable_orcus != no; then
 ENABLE_ORCUS=TRUE
 AC_DEFINE(ENABLE_ORCUS)
 
-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.8 = 0.7.0])
+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.10 = 0.9.0])
 if test $with_system_orcus != yes; then
 if test $SYSTEM_BOOST = TRUE; then
 # ===
diff --git a/download.lst b/download.lst
index 86ce10c..7b4bfe4 100644
---

[Libreoffice-commits] core.git: configure.ac download.lst external/liborcus RepositoryExternal.mk sc/source

[Libreoffice-commits] core.git: configure.ac download.lst external/liborcus RepositoryExternal.mk sc/inc sc/qa sc/source svl/source

[Libreoffice-commits] core.git: configure.ac download.lst external/liborcus RepositoryExternal.mk sc/source

[Libreoffice-commits] core.git: configure.ac download.lst external/liborcus

[Libreoffice-commits] core.git: configure.ac download.lst external/liborcus RepositoryExternal.mk sc/source

5 matches

Site Navigation

Mail list logo

Footer information