upload liborcus 0.9.2

Change-Id: Id551e1c3e60a0426bcd636642a9a0e02eb1e2612

download.lst

@@ -118,7 +118,8 @@ export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
 export OPENSSL_MD5SUM := a06c547dac9044161a477211049f60ef
 export OPENSSL_TARBALL := openssl-1.0.2a.tar.gz
-export ORCUS_TARBALL := 18814358772ed7bb476e04b0384af082-liborcus-0.9.1.tar.gz
+export ORCUS_MD5SUM := e6efcbe50a5fd4d50d513c9a7a4139b0
+export ORCUS_TARBALL := liborcus-0.9.2.tar.gz
 export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
 export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz
 export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671

external/liborcus/0001-fix-dllexport-decls.patch

-From 3e08d2264984b8d5227e22c7089f00f8f2e36513 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Tue, 2 Jun 2015 23:26:39 +0200
-Subject: [PATCH] fix dllexport decls
-
----
- include/orcus/base64.hpp      | 4 ++--
- include/orcus/exception.hpp   | 2 +-
- include/orcus/pstring.hpp     | 6 +++---
- include/orcus/stream.hpp      | 2 +-
- include/orcus/string_pool.hpp | 2 +-
- 5 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/include/orcus/base64.hpp b/include/orcus/base64.hpp
-index a4cf020..0f81289 100644
---- a/include/orcus/base64.hpp
-+++ b/include/orcus/base64.hpp
-@@ -22,7 +22,7 @@ namespace orcus {
-  * @param len_base64 length of encoded character sequence.
-  * @param decoded decoded byte sequence will be put into this parameter.
-  */
--ORCUS_DLLPUBLIC void decode_from_base64(const char* p_base64, size_t len_base64, std::vector<char>& decoded);
-+ORCUS_PSR_DLLPUBLIC void decode_from_base64(const char* p_base64, size_t len_base64, std::vector<char>& decoded);
- 
- /**
-  * Encode a sequence of bytes into base64-encoded characters.
-@@ -31,7 +31,7 @@ ORCUS_DLLPUBLIC void decode_from_base64(const char* p_base64, size_t len_base64,
-  * @param encoded base64-encoded character sequence representing the input
-  *                bytes.
-  */
--ORCUS_DLLPUBLIC void encode_to_base64(const std::vector<char>& input, std::string& encoded);
-+ORCUS_PSR_DLLPUBLIC void encode_to_base64(const std::vector<char>& input, std::string& encoded);
- 
- }
- 
-diff --git a/include/orcus/exception.hpp b/include/orcus/exception.hpp
-index 63729ae..ba6132c 100644
---- a/include/orcus/exception.hpp
-+++ b/include/orcus/exception.hpp
-@@ -25,7 +25,7 @@ private:
-     ::std::string m_msg;
- };
- 
--class ORCUS_DLLPUBLIC xml_structure_error : public general_error
-+class ORCUS_PSR_DLLPUBLIC xml_structure_error : public general_error
- {
- public:
-     explicit xml_structure_error(const ::std::string& msg);
-diff --git a/include/orcus/pstring.hpp b/include/orcus/pstring.hpp
-index e38d4be..c72b78b 100644
---- a/include/orcus/pstring.hpp
-+++ b/include/orcus/pstring.hpp
-@@ -71,7 +71,7 @@ public:
-         m_size = 0;
-     }
- 
--    struct ORCUS_DLLPUBLIC hash
-+    struct ORCUS_PSR_DLLPUBLIC hash
-     {
-         size_t operator() (const pstring& val) const;
-     };
-@@ -86,8 +86,8 @@ inline ::std::ostream& operator<< (::std::ostream& os, const pstring& str)
-     return os << str.str();
- }
- 
--ORCUS_DLLPUBLIC std::string operator+ (const std::string& left, const pstring& right);
--ORCUS_DLLPUBLIC std::string& operator+= (std::string& left, const pstring& right);
-+ORCUS_PSR_DLLPUBLIC std::string operator+ (const std::string& left, const pstring& right);
-+ORCUS_PSR_DLLPUBLIC std::string& operator+= (std::string& left, const pstring& right);
- 
- }
- 
-diff --git a/include/orcus/stream.hpp b/include/orcus/stream.hpp
-index a32f6a4..064d386 100644
---- a/include/orcus/stream.hpp
-+++ b/include/orcus/stream.hpp
-@@ -20,7 +20,7 @@ namespace orcus {
-  * @param filepath file to open
-  * @param strm content of the file
-  */
--ORCUS_DLLPUBLIC void load_file_content(const char* filepath, std::string& strm);
-+ORCUS_PSR_DLLPUBLIC void load_file_content(const char* filepath, std::string& strm);
- 
- }
- 
-diff --git a/include/orcus/string_pool.hpp b/include/orcus/string_pool.hpp
-index e4afa4f..b895ee4 100644
---- a/include/orcus/string_pool.hpp
-+++ b/include/orcus/string_pool.hpp
-@@ -21,7 +21,7 @@ namespace orcus {
- /**
-  * Implements string hash map.
-  */
--class ORCUS_DLLPUBLIC string_pool
-+class ORCUS_PSR_DLLPUBLIC string_pool
- {
-     struct string_hash
-     {
--- 
-2.4.1
-

external/liborcus/0001-mark-more-symbols-as-public.patch

-From 718b1adfe9c327e06b1ab796c5cd9805db63c9b3 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Wed, 3 Jun 2015 07:46:50 +0200
-Subject: [PATCH] mark more symbols as public
-
----
- include/orcus/xml_structure_tree.hpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/include/orcus/xml_structure_tree.hpp b/include/orcus/xml_structure_tree.hpp
-index 097e56c..58cabfd 100644
---- a/include/orcus/xml_structure_tree.hpp
-+++ b/include/orcus/xml_structure_tree.hpp
-@@ -31,7 +31,7 @@ class ORCUS_DLLPUBLIC xml_structure_tree
- 
- public:
- 
--    struct entity_name
-+    struct ORCUS_DLLPUBLIC entity_name
-     {
-         xmlns_id_t ns;
-         pstring name;
-@@ -42,7 +42,7 @@ public:
-         bool operator< (const entity_name& r) const;
-         bool operator== (const entity_name& r) const;
- 
--        struct hash
-+        struct ORCUS_DLLPUBLIC hash
-         {
-             size_t operator ()(const entity_name& val) const;
-         };
-@@ -50,7 +50,7 @@ public:
- 
-     typedef std::vector<entity_name> entity_names_type;
- 
--    struct element
-+    struct ORCUS_DLLPUBLIC element
-     {
-         entity_name name;
-         bool repeat;
-@@ -64,7 +64,7 @@ public:
-     /**
-      * This class allows client to traverse the tree.
-      */
--    class walker
-+    class ORCUS_DLLPUBLIC walker
-     {
-         friend class xml_structure_tree;
-         walker_impl* mp_impl;
--- 
-2.4.1
-

external/liborcus/0001-these-functions-are-implemented-in-liborcus.patch

-From 26d33d7cfd93b22e2fa13e6a3e28d133619948cf Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Thu, 4 Jun 2015 12:33:26 +0200
-Subject: [PATCH] these functions are implemented in liborcus
-
----
- include/orcus/spreadsheet/types.hpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/orcus/spreadsheet/types.hpp b/include/orcus/spreadsheet/types.hpp
-index a78340e..bec14c8 100644
---- a/include/orcus/spreadsheet/types.hpp
-+++ b/include/orcus/spreadsheet/types.hpp
-@@ -22,8 +22,8 @@ typedef unsigned char color_elem_t;
- typedef unsigned short col_width_t;
- typedef unsigned short row_height_t;
- 
--ORCUS_SPM_DLLPUBLIC col_width_t get_default_column_width();
--ORCUS_SPM_DLLPUBLIC row_height_t get_default_row_height();
-+ORCUS_DLLPUBLIC col_width_t get_default_column_width();
-+ORCUS_DLLPUBLIC row_height_t get_default_row_height();
- 
- enum border_direction_t
- {
-@@ -192,7 +192,7 @@ enum databar_axis_t
-  * Convert a string representation of a totals row function name to its
-  * equivalent enum value.
-  */
--ORCUS_SPM_DLLPUBLIC totals_row_function_t to_totals_row_function_enum(const char* p, size_t n);
-+ORCUS_DLLPUBLIC totals_row_function_t to_totals_row_function_enum(const char* p, size_t n);
- 
- }}
- 
--- 
-2.4.1
-

external/liborcus/UnpackedTarball_liborcus.mk

@@ -14,12 +14,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,liborcus,$(ORCUS_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
-	external/liborcus/0001-fix-dllexport-decls.patch \
-	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 \
-	external/liborcus/boost.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:

external/liborcus/boost.patch.0

---- 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
- 
- 
- 
-@@ -17777,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
--  if test x"$boost_cv_inc_path" = xno; then
-+  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;}
- else
-@@ -18641,6 +18648,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
- 
- 
- 
-@@ -18649,6 +18657,7 @@ boost_filesystem_save_LIBS=$LIBS
- boost_filesystem_save_LDFLAGS=$LDFLAGS
- LIBS="$LIBS $BOOST_SYSTEM_LIBS"
- LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS"
-+if test x"$BOOST_FILESYSTEM_LIBS" == "x" -o x"$BOOST_FILESYSTEM_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 filesystem library" >&5
- $as_echo "$as_me: Boost not available, not searching for the Boost filesystem library" >&6;}
-@@ -18932,6 +18941,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
- 
- if test $enable_static_boost = yes && test $boost_major_version -ge 135; then
-   BOOST_FILESYSTEM_LIBS="$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"
-@@ -18940,7 +18950,8 @@ LIBS=$boost_filesystem_save_LIBS
- LDFLAGS=$boost_filesystem_save_LDFLAGS
- 
- 
--        if test x"$boost_cv_inc_path" = xno; then
-+        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;}
- else
-@@ -19223,6 +19234,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
- 
- 
-