+++ /dev/null
-From edb38d702dd5a058ae0702b73a43328318b94649 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Thu, 4 Jun 2015 16:09:48 +0200
-Subject: [PATCH] update to liborcus 0.9.1
-
-Includes switching to dynamic libs.
-
-Change-Id: I959c4e9430f8cf95f50d48e1b01d8323dba4af81
----
- RepositoryExternal.mk | 55 +-
- configure.ac | 2 +-
- download.lst | 2 +-
- external/liborcus/0001-fix-dllexport-decls.patch | 101 ++
- .../0001-mark-more-symbols-as-public.patch | 52 +
- ...ese-functions-are-implemented-in-liborcus.patch | 36 +
- ...1-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 -
- .../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(-)
- create mode 100644 external/liborcus/0001-fix-dllexport-decls.patch
- create mode 100644 external/liborcus/0001-mark-more-symbols-as-public.patch
- create mode 100644 external/liborcus/0001-these-functions-are-implemented-in-liborcus.patch
- create mode 100644 external/liborcus/0001-workaround-a-linking-problem-on-windows.patch
- create mode 100644 external/liborcus/ExternalPackage_liborcus.mk
- create mode 100644 external/liborcus/Library_orcus-parser.mk
- create mode 100644 external/liborcus/Library_orcus.mk
- delete mode 100644 external/liborcus/liborcus_0.1.0-configure.patch
- delete mode 100644 external/liborcus/liborcus_0.1.0-dllimport.patch
- delete mode 100644 external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0
- delete mode 100644 external/liborcus/visibility.patch
-
-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
---- a/download.lst
-+++ b/download.lst
-@@ -118,7 +118,7 @@ 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 := 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
-+export ORCUS_TARBALL := 18814358772ed7bb476e04b0384af082-liborcus-0.9.1.tar.gz
- export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671
- export PAGEMAKER_TARBALL := libpagemaker-0.0.2.tar.bz2
- export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
-diff --git a/external/liborcus/0001-fix-dllexport-decls.patch b/external/liborcus/0001-fix-dllexport-decls.patch
-new file mode 100644
-index 0000000..75a4423
---- /dev/null
-+++ b/external/liborcus/0001-fix-dllexport-decls.patch
-@@ -0,0 +1,101 @@
-+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
-+
-diff --git a/external/liborcus/0001-mark-more-symbols-as-public.patch b/external/liborcus/0001-mark-more-symbols-as-public.patch
-new file mode 100644
-index 0000000..ee9658e
---- /dev/null
-+++ b/external/liborcus/0001-mark-more-symbols-as-public.patch
-@@ -0,0 +1,52 @@
-+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
-+
-diff --git a/external/liborcus/0001-these-functions-are-implemented-in-liborcus.patch b/external/liborcus/0001-these-functions-are-implemented-in-liborcus.patch
-new file mode 100644
-index 0000000..c027da6
---- /dev/null
-+++ b/external/liborcus/0001-these-functions-are-implemented-in-liborcus.patch
-@@ -0,0 +1,36 @@
-+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
-+
-diff --git a/external/liborcus/0001-workaround-a-linking-problem-on-windows.patch b/external/liborcus/0001-workaround-a-linking-problem-on-windows.patch
-new file mode 100644
-index 0000000..5710877
---- /dev/null
-+++ b/external/liborcus/0001-workaround-a-linking-problem-on-windows.patch
-@@ -0,0 +1,45 @@
-+From 71841b7aa7c5e75a793cfaafb31865524a74d9fc Mon Sep 17 00:00:00 2001
-+From: David Tardon <dtardon@redhat.com>
-+Date: Thu, 4 Jun 2015 16:13:18 +0200
-+Subject: [PATCH] workaround a linking problem on windows
-+
-+Linking scfiltlo.dll gives the following error:
-+
-+xmlcontext.o : error LNK2019: unresolved external symbol "char const * const orcus::XMLNS_UNKNOWN_ID" (?XMLNS_UNKNOWN_ID@orcus@@3QBDB) referenced in function "void __cdecl std::_For_each<unsigned int const *,class `anonymous namespace'::SetNamespaceAlias>(unsigned int const *,unsigned int const *,class `anonymous namespace'::SetNamespaceAlias &)" (??$_For_each@PBIVSetNamespaceAlias@?A0xafb5dd33@@@std@@YAXPBI0AAVSetNamespaceAlias@?A0xafb5dd33@@@Z)
-+C:/cygwin/home/tdf/lode/jenkins/workspace/lo_gerrit_master/Gerrit/Gerrit/Platform/Windows/instdir/program/scfiltlo.dll : fatal error LNK1120: 1 unresolved externals
-+
-+I have got no idea what is the cause of this: the constant--exported in
-+liborcus-parser.dll--is used in liborus.dll without any problem.
-+---
-+ include/orcus/types.hpp | 2 +-
-+ src/parser/types.cpp | 1 -
-+ 2 files changed, 1 insertion(+), 2 deletions(-)
-+
-+diff --git a/include/orcus/types.hpp b/include/orcus/types.hpp
-+index b6e3f83..8027f25 100644
-+--- a/include/orcus/types.hpp
-++++ b/include/orcus/types.hpp
-+@@ -21,7 +21,7 @@ namespace orcus {
-+ typedef size_t xml_token_t;
-+ typedef const char* xmlns_id_t;
-+
-+-ORCUS_PSR_DLLPUBLIC extern const xmlns_id_t XMLNS_UNKNOWN_ID;
-++const xmlns_id_t XMLNS_UNKNOWN_ID = NULL;
-+ ORCUS_PSR_DLLPUBLIC extern const xml_token_t XML_UNKNOWN_TOKEN;
-+ ORCUS_PSR_DLLPUBLIC extern const size_t index_not_found;
-+ ORCUS_PSR_DLLPUBLIC extern const size_t unspecified;
-+diff --git a/src/parser/types.cpp b/src/parser/types.cpp
-+index be4e304..0a1b4a7 100644
-+--- a/src/parser/types.cpp
-++++ b/src/parser/types.cpp
-+@@ -12,7 +12,6 @@
-+
-+ namespace orcus {
-+
-+-const xmlns_id_t XMLNS_UNKNOWN_ID = NULL;
-+ const xml_token_t XML_UNKNOWN_TOKEN = 0;
-+
-+ const size_t index_not_found = std::numeric_limits<size_t>::max();
-+--
-+2.4.1
-+
-diff --git a/external/liborcus/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk
-new file mode 100644
-index 0000000..96899e7
---- /dev/null
-+++ b/external/liborcus/ExternalPackage_liborcus.mk
-@@ -0,0 +1,22 @@
-+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-+#
-+# This file is part of the LibreOffice project.
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+#
-+
-+$(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,liborcus))
-+
-+$(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus))
-+
-+ifeq ($(OS),MACOSX)
-+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.10.0.dylib,src/liborcus/.libs/liborcus-0.10.0.dylib))
-+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.10.0.dylib,src/parser/.libs/liborcus-parser-0.10.0.dylib))
-+else ifeq ($(filter IOS ANDROID,$(OS)),)
-+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.10.so.0,src/liborcus/.libs/liborcus-0.10.so.0.0.0))
-+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.10.so.0,src/parser/.libs/liborcus-parser-0.10.so.0.0.0))
-+endif
-+
-+# vim: set noet sw=4 ts=4:
-diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
-index 90d453c..ff488bf 100644
---- a/external/liborcus/ExternalProject_liborcus.mk
-+++ b/external/liborcus/ExternalProject_liborcus.mk
-@@ -87,8 +87,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
- MDDS_LIBS=' ' \
- MAKE=$(MAKE) ./configure \
- --with-pic \
-- --enable-static \
-- --disable-shared \
-+ --enable-shared \
-+ --disable-static \
- $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
- --disable-spreadsheet-model \
- --without-tools \
-diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk
-new file mode 100644
-index 0000000..c3b4eec
---- /dev/null
-+++ b/external/liborcus/Library_orcus-parser.mk
-@@ -0,0 +1,55 @@
-+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-+#
-+# This file is part of the LibreOffice project.
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+#
-+
-+$(eval $(call gb_Library_Library,orcus-parser))
-+
-+$(eval $(call gb_Library_use_unpacked,orcus-parser,liborcus))
-+
-+$(eval $(call gb_Library_use_externals,orcus-parser,\
-+ boost_headers \
-+ boost_system \
-+ mdds_headers \
-+ zlib \
-+))
-+
-+$(eval $(call gb_Library_set_warnings_not_errors,orcus-parser))
-+
-+$(eval $(call gb_Library_set_include,orcus-parser,\
-+ -I$(call gb_UnpackedTarball_get_dir,liborcus)/include \
-+ $$(INCLUDE) \
-+))
-+
-+$(eval $(call gb_Library_add_defs,orcus-parser,\
-+ -DBOOST_ALL_NO_LIB \
-+ -D__ORCUS_PSR_BUILDING_DLL \
-+))
-+
-+$(eval $(call gb_Library_set_generated_cxx_suffix,orcus-parser,cpp))
-+
-+$(eval $(call gb_Library_add_generated_exception_objects,orcus-parser,\
-+ UnpackedTarball/liborcus/src/parser/base64 \
-+ UnpackedTarball/liborcus/src/parser/cell_buffer \
-+ UnpackedTarball/liborcus/src/parser/css_parser_base \
-+ UnpackedTarball/liborcus/src/parser/css_types \
-+ UnpackedTarball/liborcus/src/parser/csv_parser_base \
-+ UnpackedTarball/liborcus/src/parser/exception \
-+ UnpackedTarball/liborcus/src/parser/parser_global \
-+ UnpackedTarball/liborcus/src/parser/pstring \
-+ UnpackedTarball/liborcus/src/parser/sax_parser_base \
-+ UnpackedTarball/liborcus/src/parser/sax_token_parser \
-+ UnpackedTarball/liborcus/src/parser/stream \
-+ UnpackedTarball/liborcus/src/parser/string_pool \
-+ UnpackedTarball/liborcus/src/parser/tokens \
-+ UnpackedTarball/liborcus/src/parser/types \
-+ UnpackedTarball/liborcus/src/parser/xml_namespace \
-+ UnpackedTarball/liborcus/src/parser/zip_archive \
-+ UnpackedTarball/liborcus/src/parser/zip_archive_stream \
-+))
-+
-+# vim: set noet sw=4 ts=4:
-diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk
-new file mode 100644
-index 0000000..ae98d5e
---- /dev/null
-+++ b/external/liborcus/Library_orcus.mk
-@@ -0,0 +1,104 @@
-+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-+#
-+# This file is part of the LibreOffice project.
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+#
-+
-+$(eval $(call gb_Library_Library,orcus))
-+
-+$(eval $(call gb_Library_use_unpacked,orcus,liborcus))
-+
-+$(eval $(call gb_Library_use_externals,orcus,\
-+ boost_headers \
-+ boost_iostreams \
-+ boost_system \
-+ mdds_headers \
-+ zlib \
-+))
-+
-+$(eval $(call gb_Library_set_warnings_not_errors,orcus))
-+
-+$(eval $(call gb_Library_set_include,orcus,\
-+ -I$(call gb_UnpackedTarball_get_dir,liborcus)/include \
-+ $$(INCLUDE) \
-+))
-+
-+$(eval $(call gb_Library_add_defs,orcus,\
-+ -DBOOST_ALL_NO_LIB \
-+ -D__ORCUS_BUILDING_DLL \
-+))
-+
-+$(eval $(call gb_Library_use_libraries,orcus,\
-+ orcus-parser \
-+))
-+
-+$(eval $(call gb_Library_set_generated_cxx_suffix,orcus,cpp))
-+
-+$(eval $(call gb_Library_add_generated_exception_objects,orcus,\
-+ UnpackedTarball/liborcus/src/liborcus/config \
-+ UnpackedTarball/liborcus/src/liborcus/css_document_tree \
-+ UnpackedTarball/liborcus/src/liborcus/css_selector \
-+ UnpackedTarball/liborcus/src/liborcus/detection_result \
-+ UnpackedTarball/liborcus/src/liborcus/dom_tree \
-+ UnpackedTarball/liborcus/src/liborcus/format_detection \
-+ UnpackedTarball/liborcus/src/liborcus/global \
-+ UnpackedTarball/liborcus/src/liborcus/gnumeric_cell_context \
-+ UnpackedTarball/liborcus/src/liborcus/gnumeric_context \
-+ UnpackedTarball/liborcus/src/liborcus/gnumeric_detection_handler \
-+ UnpackedTarball/liborcus/src/liborcus/gnumeric_handler \
-+ UnpackedTarball/liborcus/src/liborcus/gnumeric_helper \
-+ UnpackedTarball/liborcus/src/liborcus/gnumeric_namespace_types \
-+ UnpackedTarball/liborcus/src/liborcus/gnumeric_sheet_context \
-+ UnpackedTarball/liborcus/src/liborcus/gnumeric_tokens \
-+ UnpackedTarball/liborcus/src/liborcus/interface \
-+ UnpackedTarball/liborcus/src/liborcus/measurement \
-+ UnpackedTarball/liborcus/src/liborcus/odf_namespace_types \
-+ UnpackedTarball/liborcus/src/liborcus/odf_para_context \
-+ UnpackedTarball/liborcus/src/liborcus/odf_styles \
-+ UnpackedTarball/liborcus/src/liborcus/odf_styles_context \
-+ UnpackedTarball/liborcus/src/liborcus/odf_tokens \
-+ UnpackedTarball/liborcus/src/liborcus/ods_content_xml_context \
-+ UnpackedTarball/liborcus/src/liborcus/ods_content_xml_handler \
-+ UnpackedTarball/liborcus/src/liborcus/ods_session_data \
-+ UnpackedTarball/liborcus/src/liborcus/ooxml_content_types \
-+ UnpackedTarball/liborcus/src/liborcus/ooxml_global \
-+ UnpackedTarball/liborcus/src/liborcus/ooxml_namespace_types \
-+ UnpackedTarball/liborcus/src/liborcus/ooxml_schemas \
-+ UnpackedTarball/liborcus/src/liborcus/ooxml_tokens \
-+ UnpackedTarball/liborcus/src/liborcus/ooxml_types \
-+ UnpackedTarball/liborcus/src/liborcus/opc_context \
-+ UnpackedTarball/liborcus/src/liborcus/opc_reader \
-+ UnpackedTarball/liborcus/src/liborcus/orcus_csv \
-+ UnpackedTarball/liborcus/src/liborcus/orcus_gnumeric \
-+ UnpackedTarball/liborcus/src/liborcus/orcus_ods \
-+ UnpackedTarball/liborcus/src/liborcus/orcus_xlsx \
-+ UnpackedTarball/liborcus/src/liborcus/orcus_xml \
-+ UnpackedTarball/liborcus/src/liborcus/session_context \
-+ UnpackedTarball/liborcus/src/liborcus/spreadsheet_interface \
-+ UnpackedTarball/liborcus/src/liborcus/spreadsheet_types \
-+ UnpackedTarball/liborcus/src/liborcus/xls_xml_namespace_types \
-+ UnpackedTarball/liborcus/src/liborcus/xlsx_autofilter_context \
-+ UnpackedTarball/liborcus/src/liborcus/xlsx_conditional_format_context \
-+ UnpackedTarball/liborcus/src/liborcus/xlsx_context \
-+ UnpackedTarball/liborcus/src/liborcus/xlsx_handler \
-+ UnpackedTarball/liborcus/src/liborcus/xlsx_helper \
-+ UnpackedTarball/liborcus/src/liborcus/xlsx_pivot_context \
-+ UnpackedTarball/liborcus/src/liborcus/xlsx_revision_context \
-+ UnpackedTarball/liborcus/src/liborcus/xlsx_session_data \
-+ UnpackedTarball/liborcus/src/liborcus/xlsx_sheet_context \
-+ UnpackedTarball/liborcus/src/liborcus/xlsx_table_context \
-+ UnpackedTarball/liborcus/src/liborcus/xlsx_types \
-+ UnpackedTarball/liborcus/src/liborcus/xlsx_workbook_context \
-+ UnpackedTarball/liborcus/src/liborcus/xml_context_base \
-+ UnpackedTarball/liborcus/src/liborcus/xml_context_global \
-+ UnpackedTarball/liborcus/src/liborcus/xml_map_tree \
-+ UnpackedTarball/liborcus/src/liborcus/xml_simple_stream_handler \
-+ UnpackedTarball/liborcus/src/liborcus/xml_stream_handler \
-+ UnpackedTarball/liborcus/src/liborcus/xml_stream_parser \
-+ UnpackedTarball/liborcus/src/liborcus/xml_structure_tree \
-+))
-+
-+# vim: set noet sw=4 ts=4:
-diff --git a/external/liborcus/Module_liborcus.mk b/external/liborcus/Module_liborcus.mk
-index 42f1715..e75b983 100644
---- a/external/liborcus/Module_liborcus.mk
-+++ b/external/liborcus/Module_liborcus.mk
-@@ -10,8 +10,23 @@
- $(eval $(call gb_Module_Module,liborcus))
-
- $(eval $(call gb_Module_add_targets,liborcus,\
-- ExternalProject_liborcus \
- UnpackedTarball_liborcus \
- ))
-
-+ifeq ($(COM),MSC)
-+
-+$(eval $(call gb_Module_add_targets,liborcus,\
-+ Library_orcus \
-+ Library_orcus-parser \
-+))
-+
-+else # !MSC
-+
-+$(eval $(call gb_Module_add_targets,liborcus,\
-+ ExternalPackage_liborcus \
-+ ExternalProject_liborcus \
-+))
-+
-+endif
-+
- # vim: set noet sw=4 ts=4:
-diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk
-index 126f250..ae569ed 100644
---- a/external/liborcus/UnpackedTarball_liborcus.mk
-+++ b/external/liborcus/UnpackedTarball_liborcus.mk
-@@ -11,28 +11,13 @@ $(eval $(call gb_UnpackedTarball_Unpacke
-
- $(eval $(call gb_UnpackedTarball_set_tarball,liborcus,$(ORCUS_TARBALL)))
-
--$(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,0))
--
--liborcus_patches :=
--
--# make config.sub recognize arm-linux-androideabi
--# liborcus_patches += liborcus_0.1.0-configure.patch
--
--# don't use dllimport
--liborcus_patches += liborcus_0.1.0-dllimport.patch
--
--# Any -fvisibility= etc. settings are passed into liborcus' CXXFLAGS via
--# gb_VISIBILITY_FLAGS[_CXX]:
--liborcus_patches += visibility.patch
--
--# <https://gitorious.org/orcus/orcus/merge_requests/2#
--# f60d6eecee72349993a392a9a63ddf3383d3b8c8-
--# f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>:
--
--liborcus_patches += liborcus_0.7.0-configure.gcc5.patch.0
-+$(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
-
- $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
-- $(foreach patch,$(liborcus_patches),external/liborcus/$(patch)) \
-+ 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 \
- ))
-
- # vim: set noet sw=4 ts=4:
-diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
-index ce19c0b..e418ed8 100644
---- a/sc/source/filter/html/htmlpars.cxx
-+++ b/sc/source/filter/html/htmlpars.cxx
-@@ -3170,6 +3170,34 @@ public:
- maPropName = MemStr();
- maPropValue = MemStr();
- }
-+
-+ // new members
-+ void simple_selector_type(const char* /*p*/, size_t /*n*/) {}
-+
-+ void simple_selector_class(const char* /*p*/, size_t /*n*/) {}
-+
-+ void simple_selector_pseudo_element(orcus::css::pseudo_element_t /*pe*/) {}
-+
-+ void simple_selector_pseudo_class(orcus::css::pseudo_class_t /*pc*/) {}
-+
-+ void simple_selector_id(const char* /*p*/, size_t /*n*/) {}
-+
-+ void end_simple_selector() {}
-+
-+ void end_selector() {}
-+
-+ void combinator(orcus::css::combinator_t /*combinator*/) {}
-+
-+ void rgb(uint8_t /*red*/ , uint8_t /*green*/ , uint8_t /*blue*/ ) {}
-+
-+ void rgba(uint8_t /*red*/ , uint8_t /*green*/ , uint8_t /*blue*/ , double /*alpha*/ ) {}
-+
-+ void hsl(uint8_t /*hue*/ , uint8_t /*sat*/ , uint8_t /*light*/ ) {}
-+
-+ void hsla(uint8_t /*hue*/ , uint8_t /*sat*/ , uint8_t /*light*/ , double /*alpha*/ ) {}
-+
-+ void url(const char* /*p*/, size_t /*n*/) {}
-+
- };
-
- }
-@@ -3183,7 +3211,7 @@ void ScHTMLQueryParser::ParseStyle(const OUString& rStrm)
- {
- aParser.parse();
- }
-- catch (const orcus::css_parse_error&)
-+ catch (const orcus::css::parse_error&)
- {
- // TODO: Parsing of CSS failed. Do nothing for now.
- }
-diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx
-index a778310..633b43d 100644
---- a/sc/source/filter/inc/orcusinterface.hxx
-+++ b/sc/source/filter/inc/orcusinterface.hxx
-@@ -43,6 +43,9 @@ public:
- ScOrcusGlobalSettings(ScDocumentImport& rDoc);
-
- virtual void set_origin_date(int year, int month, int day) SAL_OVERRIDE;
-+
-+ virtual void set_default_formula_grammar(orcus::spreadsheet::formula_grammar_t grammar) SAL_OVERRIDE;
-+ virtual orcus::spreadsheet::formula_grammar_t get_default_formula_grammar() const SAL_OVERRIDE;
- };
-
- class ScOrcusSharedStrings : public orcus::spreadsheet::iface::import_shared_strings
-@@ -120,9 +123,12 @@ public:
- orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, int year, int month, int day, int hour, int minute, double second) SAL_OVERRIDE;
-
- virtual void set_format(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t xf_index) SAL_OVERRIDE;
-+ virtual void set_format(orcus::spreadsheet::row_t row_start, orcus::spreadsheet::col_t col_start,
-+ orcus::spreadsheet::row_t row_end, orcus::spreadsheet::col_t col_end, size_t xf_index) SAL_OVERRIDE;
-
- virtual void set_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, const char* p, size_t n) SAL_OVERRIDE;
- virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n) SAL_OVERRIDE;
-+ virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, double val) SAL_OVERRIDE;
-
- virtual void set_shared_formula(
- orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, size_t sindex,
-@@ -203,6 +209,10 @@ public:
- virtual void set_cell_xf_count(size_t n) SAL_OVERRIDE;
- virtual size_t commit_cell_xf() SAL_OVERRIDE;
-
-+ // dxf
-+ virtual void set_dxf_count(size_t count) SAL_OVERRIDE;
-+ virtual size_t commit_dxf() SAL_OVERRIDE;
-+
- // xf (cell format) - used both by cell xf and cell style xf.
-
- virtual void set_xf_number_format(size_t index) SAL_OVERRIDE;
-diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
-index 3735f28..82b8f9e 100644
---- a/sc/source/filter/orcus/interface.cxx
-+++ b/sc/source/filter/orcus/interface.cxx
-@@ -35,6 +35,15 @@ void ScOrcusGlobalSettings::set_origin_date(int year, int month, int day)
- mrDoc.setOriginDate(year, month, day);
- }
-
-+void ScOrcusGlobalSettings::set_default_formula_grammar(orcus::spreadsheet::formula_grammar_t /*grammar*/)
-+{
-+}
-+
-+orcus::spreadsheet::formula_grammar_t ScOrcusGlobalSettings::get_default_formula_grammar() const
-+{
-+ return orcus::spreadsheet::formula_grammar_unknown;
-+}
-+
- ScOrcusFactory::StringCellCache::StringCellCache(const ScAddress& rPos, size_t nIndex) :
- maPos(rPos), mnIndex(nIndex) {}
-
-@@ -263,6 +272,11 @@ void ScOrcusSheet::set_format(os::row_t /*row*/, os::col_t /*col*/, size_t /*xf_
- {
- }
-
-+void ScOrcusSheet::set_format(os::row_t /*row*/, os::col_t /*col*/,
-+ os::row_t /*row_end*/, os::col_t /*col_end*/, size_t /*xf_index*/)
-+{
-+}
-+
- namespace {
-
- formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t grammar )
-@@ -270,16 +284,18 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t
- formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_ODFF;
- switch(grammar)
- {
-- case orcus::spreadsheet::ods:
-+ case orcus::spreadsheet::formula_grammar_ods:
- eGrammar = formula::FormulaGrammar::GRAM_ODFF;
- break;
-- case orcus::spreadsheet::xlsx_2007:
-- case orcus::spreadsheet::xlsx_2010:
-+ case orcus::spreadsheet::formula_grammar_xlsx_2007:
-+ case orcus::spreadsheet::formula_grammar_xlsx_2010:
- eGrammar = formula::FormulaGrammar::GRAM_OOXML;
- break;
-- case orcus::spreadsheet::gnumeric:
-+ case orcus::spreadsheet::formula_grammar_gnumeric:
- eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_A1;
- break;
-+ case orcus::spreadsheet::formula_grammar_unknown:
-+ break;
- }
-
- return eGrammar;
-@@ -309,6 +325,19 @@ void ScOrcusSheet::set_formula_result(os::row_t row, os::col_t col, const char*
- pCell->SetHybridString(mrDoc.getDoc().GetSharedStringPool().intern(aResult));
- }
-
-+void ScOrcusSheet::set_formula_result(os::row_t row, os::col_t col, double /*val*/)
-+{
-+ ScFormulaCell* pCell = mrDoc.getDoc().GetFormulaCell(ScAddress(col, row, mnTab));
-+ if (!pCell)
-+ {
-+ SAL_WARN("sc", "trying to set formula result for non formula \
-+ cell! Col: " << col << ";Row: " << row << ";Tab: " << mnTab);
-+ return;
-+ }
-+
-+ // TODO: FIXME
-+}
-+
- void ScOrcusSheet::set_shared_formula(
- os::row_t row, os::col_t col, os::formula_grammar_t grammar, size_t sindex,
- const char* p_formula, size_t n_formula)
-@@ -577,6 +606,17 @@ size_t ScOrcusStyles::commit_cell_xf()
- return 0;
- }
-
-+// dxf
-+
-+void ScOrcusStyles::set_dxf_count(size_t /*n*/)
-+{
-+}
-+
-+size_t ScOrcusStyles::commit_dxf()
-+{
-+ return 0;
-+}
-+
- // xf (cell format) - used both by cell xf and cell style xf.
-
- void ScOrcusStyles::set_xf_number_format(size_t /*index*/)
---
-1.7.9.5
-
%undefine with_system_hsqldb
%endif
-%define major_ver 5.0.2
+%define major_ver 5.1.0
Summary: LibreOffice - powerful office suite
Summary(pl.UTF-8): LibreOffice - potężny pakiet biurowy
Name: libreoffice
Version: %{major_ver}.1
-Release: 9
+Release: 1
License: GPL/LGPL
Group: X11/Applications
Source0: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-%{version}.tar.xz
-# Source0-md5: 1c8e92d9d7cb30ba0ec68c780ef61178
+# Source0-md5: ffe9ba75cad5bfe42d5ee6e858fe6518
Source1: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz
-# Source1-md5: faec52fd3cd74fc5068bda35287cdbd4
+# Source1-md5: 256c3f5d948a42349d9bad3760ae1204
Source2: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz
-# Source2-md5: 34208f0803ece06bf1600076f7d8000d
+# Source2-md5: 63ffc6c7deb13237ae75249bcfb2fa3f
Source3: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz
-# Source3-md5: 1842bb569fda247920e7a5c46e8a5a20
+# Source3-md5: bb6d31cc5e4934be3ebdbd5dca167ca5
# make fetch DO_FETCH_TARBALLS=1 WGET=wget
# Source28-md5: 4ca8a6ef0afeefc864e9ef21b9f14bd6
Patch0: disable-failing-test.patch
-Patch1: liborcus-0.9.patch
+Patch1: mdds-1.0.patch
Patch2: boost-1.59.patch
URL: http://www.documentfoundation.org/
BuildRequires: /usr/bin/getopt
BuildRequires: java-servletapi
BuildRequires: libabw-devel >= 0.1.0
BuildRequires: libe-book-devel >= 0.0.2
-BuildRequires: libetonyek-devel >= 0.1.1
+BuildRequires: libetonyek-devel >= 0.1.4
BuildRequires: libfreehand-devel >= 0.1.0
BuildRequires: liblangtag-devel
BuildRequires: libmspub-devel
Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
gudźarati.
+%package i18n-gug
+Summary: LibreOffice - interface in Paraguayan Gujarati language
+Summary(pl.UTF-8): LibreOffice - interfejs w języku paragwajskim gudźarati
+Group: I18n
+Requires: %{name}-core = %{version}-%{release}
+%if "%{_rpmversion}" >= "5"
+BuildArch: noarch
+%endif
+
+%description i18n-gug
+This package provides resources containing menus and dialogs in
+Paraguayan Gujarati language.
+
+%description i18n-gug -l pl.UTF-8
+Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
+paragwajskim gudźarati.
+
%package i18n-he
Summary: LibreOffice - interface in Hebrew language
Summary(pl.UTF-8): LibreOffice - interfejs w języku hebrajskim
Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
khmerskim.
+%package i18n-kmr-Latn
+Summary: LibreOffice - interface in Kurdisk language
+Summary(pl.UTF-8): LibreOffice - interfejs w języku kurdyjskim
+Group: I18n
+Requires: %{name}-core = %{version}-%{release}
+%if "%{_rpmversion}" >= "5"
+BuildArch: noarch
+%endif
+
+%description i18n-kmr-Latn
+This package provides resources containing menus and dialogs in
+Kurdish language.
+
+%description i18n-km -l pl.UTF-8
+Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
+kurdyjskim.
+
%package i18n-kn_IN
Summary: LibreOffice - interface in Kannada language
Summary(pl.UTF-8): LibreOffice - interfejs w języku kannara
Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
serbskim.
+%package i18n-sr-Latn
+Summary: LibreOffice - interface in Serbian language
+Summary(pl.UTF-8): LibreOffice - interfejs w języku serbskim
+Group: I18n
+Requires: %{name}-core = %{version}-%{release}
+%if "%{_rpmversion}" >= "5"
+BuildArch: noarch
+%endif
+
+%description i18n-sr-Latn
+This package provides resources containing menus and dialogs in
+Serbian language.
+
+%description i18n-sr-Latn -l pl.UTF-8
+Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
+serbskim.
+
%package i18n-ss
Summary: LibreOffice - interface in Swati language
Summary(pl.UTF-8): LibreOffice - interfejs w języku suazi (siswati)
%{__sed} -i -e '/.*\/help\/.*/d' $l.lang
done
-# Remove unsupported locale files to avoid confusion about unpackaged files
-#for l in kmr_Latn sr_Latn; do
-# for f in `cat file-lists/lang_${l}_list.txt` ; do
-# [ -f $RPM_BUILD_ROOT/$f ] || continue
-# %{__rm} -f $RPM_BUILD_ROOT/$f
-# done
-#done
-
%clean
rm -rf $RPM_BUILD_ROOT
%{_libdir}/%{name}/presets/basic
%dir %{_libdir}/%{name}/presets/config
%{_libdir}/%{name}/presets/config/autotbl.fmt
-%{_libdir}/%{name}/presets/config/*.so[bcdegh]
%{_libdir}/%{name}/presets/database
%{_libdir}/%{name}/presets/gallery
%attr(755,root,root) %{_libdir}/%{name}/program/libdlgprovlo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libdrawinglayerlo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libeditenglo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libegilo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libembobj.so
%attr(755,root,root) %{_libdir}/%{name}/program/libemboleobj.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libemelo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libepblo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libepglo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libepplo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libepslo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libeptlo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/liberalo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libetilo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libevtattlo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libexplo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libexpwraplo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libfilelo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libfilterconfiglo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libfwklo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libfwllo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libfwmlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libgielo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libguesslanglo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libhelplinkerlo.so
%{!?with_system_hunspell:%attr(755,root,root) %{_libdir}/%{name}/program/libhunspell.so}
%attr(755,root,root) %{_libdir}/%{name}/program/libi18npoollo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libi18nsearchlo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libi18nutil.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libicdlo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libicglo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libidxlo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libimelo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libindex_data.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libipblo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libipdlo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libipslo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libiptlo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libipxlo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libiralo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libitglo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libitilo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libldapbe2lo.so
%attr(755,root,root) %{_libdir}/%{name}/program/liblnglo.so
%attr(755,root,root) %{_libdir}/%{name}/program/liblnthlo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libucpftp1.so
%attr(755,root,root) %{_libdir}/%{name}/program/libucpgio1lo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libucphier1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucpimagelo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libucppkg1.so
%attr(755,root,root) %{_libdir}/%{name}/program/libucptdoc1lo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libunopkgapp.so
%{_libdir}/%{name}/program/opengl/textureFragmentShader.glsl
%{_libdir}/%{name}/program/opengl/textureVertexShader.glsl
%{_libdir}/%{name}/program/opengl/transformedTextureVertexShader.glsl
+%{_libdir}/%{name}/program/opengl/basicFragmentShader.glsl
+%{_libdir}/%{name}/program/opengl/fadeBlackFragmentShader.glsl
+%{_libdir}/%{name}/program/opengl/fadeFragmentShader.glsl
+%{_libdir}/%{name}/program/opengl/glitterFragmentShader.glsl
+%{_libdir}/%{name}/program/opengl/glitterVertexShader.glsl
+%{_libdir}/%{name}/program/opengl/honeycombFragmentShader.glsl
+%{_libdir}/%{name}/program/opengl/honeycombGeometryShader.glsl
+%{_libdir}/%{name}/program/opengl/honeycombVertexShader.glsl
+%{_libdir}/%{name}/program/opengl/reflectionFragmentShader.glsl
+%{_libdir}/%{name}/program/opengl/reflectionVertexShader.glsl
+%{_libdir}/%{name}/program/opengl/rippleFragmentShader.glsl
+%{_libdir}/%{name}/program/opengl/vortexFragmentShader.glsl
+%{_libdir}/%{name}/program/opengl/vortexVertexShader.glsl
# symlink
%{_libdir}/%{name}/program/resource
%{_datadir}/%{name}/share/filter
%{_datadir}/%{name}/share/fonts
%{_datadir}/%{name}/share/gallery
+%{_datadir}/%{name}/share/palette
%{_datadir}/%{name}/share/psprint
%dir %{_datadir}/%{name}/share/registry
%files libs-gtk
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/program/gnome-open-url
-%attr(755,root,root) %{_libdir}/%{name}/program/libgconfbe1lo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/liblibreofficekitgtk.so
%attr(755,root,root) %{_libdir}/%{name}/program/libqstart_gtklo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_gtk*.so
%{_datadir}/%{name}/share/registry/gnome.xcd
%{_datadir}/%{name}/share/config/soffice.cfg/modules/dbtdata/menubar
%{_datadir}/%{name}/share/config/soffice.cfg/modules/dbtdata/toolbar
%{_datadir}/%{name}/share/registry/base.xcd
+/usr/share/appdata/libreoffice-base.appdata.xml
%files calc
%defattr(644,root,root,755)
%{_datadir}/%{name}/share/config/soffice.cfg/modules/scalc/ui
%exclude %{_datadir}/%{name}/share/config/soffice.cfg/modules/scalc/ui/res/*
%{_datadir}/%{name}/share/registry/calc.xcd
+/usr/share/appdata/libreoffice-calc.appdata.xml
%files draw
%defattr(644,root,root,755)
%{_datadir}/%{name}/share/config/soffice.cfg/modules/sdraw/ui
%exclude %{_datadir}/%{name}/share/config/soffice.cfg/modules/sdraw/ui/res/*
%{_datadir}/%{name}/share/registry/draw.xcd
+/usr/share/appdata/libreoffice-draw.appdata.xml
%files emailmerge
%defattr(644,root,root,755)
%{_datadir}/%{name}/share/config/soffice.cfg/writerperfect
%exclude %{_datadir}/%{name}/share/config/soffice.cfg/modules/swriter/ui/res/*
%{_datadir}/%{name}/share/registry/writer.xcd
+/usr/share/appdata/libreoffice-writer.appdata.xml
%files impress
%defattr(644,root,root,755)
%exclude %{_datadir}/%{name}/share/config/soffice.cfg/modules/simpress/ui/res/*
%{_datadir}/%{name}/share/registry/impress.xcd
%{_datadir}/%{name}/share/registry/ogltrans.xcd
+/usr/share/appdata/libreoffice-impress.appdata.xml
%files math
%defattr(644,root,root,755)
%files i18n-gu -f gu.lang
%defattr(644,root,root,755)
+%files i18n-gug -f gug.lang
+%defattr(644,root,root,755)
+
%files i18n-he -f he.lang
%defattr(644,root,root,755)
%files i18n-km -f km.lang
%defattr(644,root,root,755)
+%files i18n-kmr-Latn -f kmr_Latn.lang
+%defattr(644,root,root,755)
+
%files i18n-kn_IN -f kn.lang
%defattr(644,root,root,755)
%files i18n-sr -f sr.lang
%defattr(644,root,root,755)
+%files i18n-sr-Latn -f sr_Latn.lang
+%defattr(644,root,root,755)
+
%files i18n-ss -f ss.lang
%defattr(644,root,root,755)
--- /dev/null
+From a7c3a2a9be83686657c06f37d521f9f6d2004ddd Mon Sep 17 00:00:00 2001
+From: Markus Mohrhard <markus.mohrhard@googlemail.com>
+Date: Fri, 9 Oct 2015 01:03:29 +0200
+Subject: update to mdds 1.0
+
+Change-Id: I5b6e928ab5a5f2bf84d50f3f0221c0585670d972
+Reviewed-on: https://gerrit.libreoffice.org/20251
+Tested-by: Jenkins <ci@libreoffice.org>
+Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
+Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
+
+diff --git a/configure.ac b/configure.ac
+index 57a41f7..e00df959 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8759,7 +8759,7 @@ AC_SUBST(SYSTEM_BOOST)
+ dnl ===================================================================
+ dnl Check for system mdds
+ dnl ===================================================================
+-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.12.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
++libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.0 >= 1.0.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
+
+ dnl ===================================================================
+ dnl Check for system glm
+diff --git a/download.lst b/download.lst
+index eabdbcf..8774343 100755
+--- a/download.lst
++++ b/download.lst
+@@ -93,8 +93,8 @@ export LIBXML_TARBALL := daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz
+ export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
+ export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
+ export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
+-export MDDS_MD5SUM := ef2560ed5416652a7fe195305b14cebe
+-export MDDS_TARBALL := mdds_0.12.1.tar.bz2
++export MDDS_MD5SUM := 74e0a81c5af4137285fe6a52217f71e4
++export MDDS_TARBALL := mdds_1.0.0.tar.bz2
+ export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
+ export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
+ export MWAW_MD5SUM := 4a8a53a9d997cf0e2bd208178797dbfb
+diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk
+index d296a1e..c98889b 100644
+--- a/external/libetonyek/ExternalProject_libetonyek.mk
++++ b/external/libetonyek/ExternalProject_libetonyek.mk
+@@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
+ --disable-werror \
+ --disable-weffc \
+ --without-tools \
+- --with-mdds=0.x \
++ --with-mdds=1.0 \
+ $(if $(filter WNT,$(OS_FOR_BUILD)),MKDIR_P="$(shell cygpath -m /usr/bin/mkdir) -p") \
+ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
+ $(if $(filter LINUX,$(OS)), \
+diff --git a/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 b/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1
+deleted file mode 100644
+index bed9c9c..0000000
+--- a/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1
++++ /dev/null
+@@ -1,55 +0,0 @@
+-From 5fc9214fb94595e1a2c0b9e0285037f5a2fa59bf Mon Sep 17 00:00:00 2001
+-From: David Tardon <dtardon@redhat.com>
+-Date: Mon, 29 Jun 2015 14:28:42 +0200
+-Subject: [PATCH] another step to allow fst to use any value type
+-
+-For some reason this is not a problem on modern compilers...
+----
+- include/mdds/flat_segment_tree.hpp | 1 -
+- include/mdds/flat_segment_tree_def.inl | 2 +-
+- src/flat_segment_tree_test.cpp | 4 ++++
+- 3 files changed, 5 insertions(+), 2 deletions(-)
+-
+-diff --git a/include/mdds/flat_segment_tree.hpp b/include/mdds/flat_segment_tree.hpp
+-index b656bc3..02cf87e 100644
+---- a/include/mdds/flat_segment_tree.hpp
+-+++ b/include/mdds/flat_segment_tree.hpp
+-@@ -32,7 +32,6 @@
+- #include <sstream>
+- #include <utility>
+- #include <cassert>
+--#include <limits>
+-
+- #include "mdds/node.hpp"
+- #include "mdds/flat_segment_tree_itr.hpp"
+-diff --git a/include/mdds/flat_segment_tree_def.inl b/include/mdds/flat_segment_tree_def.inl
+-index ebfee99..5fef1c3 100644
+---- a/include/mdds/flat_segment_tree_def.inl
+-+++ b/include/mdds/flat_segment_tree_def.inl
+-@@ -46,7 +46,7 @@ flat_segment_tree<_Key, _Value>::flat_segment_tree(key_type min_val, key_type ma
+- // We don't ever use the value of the right leaf node, but we need the
+- // value to be always the same, to make it easier to check for
+- // equality.
+-- m_right_leaf->value_leaf.value = ::std::numeric_limits<value_type>::max();
+-+ m_right_leaf->value_leaf.value = init_val;
+- }
+-
+- template<typename _Key, typename _Value>
+-diff --git a/src/flat_segment_tree_test.cpp b/src/flat_segment_tree_test.cpp
+-index 81858f5..f7aead7 100644
+---- a/src/flat_segment_tree_test.cpp
+-+++ b/src/flat_segment_tree_test.cpp
+-@@ -1943,6 +1943,10 @@ void fst_test_non_numeric_value()
+- db.search(1, result);
+-
+- assert(result == "hello world");
+-+
+-+ db_type db2(db);
+-+
+-+ assert(db == db2);
+- }
+-
+- void fst_test_non_numeric_key()
+---
+-2.4.2
+-
+diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk
+index 504406b..2627257 100644
+--- a/external/mdds/UnpackedTarball_mdds.mk
++++ b/external/mdds/UnpackedTarball_mdds.mk
+@@ -14,9 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL)))
+ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3))
+
+ $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
+- external/mdds/mdds_0.6.0.patch \
+ external/mdds/mdds-c++98.patch.0 \
+- external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 \
+ ))
+
+ # vim: set noet sw=4 ts=4:
+diff --git a/external/mdds/mdds_0.6.0.patch b/external/mdds/mdds_0.6.0.patch
+deleted file mode 100644
+index fba1502..0000000
+--- a/external/mdds/mdds_0.6.0.patch
++++ /dev/null
+@@ -1,54 +0,0 @@
+---- misc/mdds_0.6.0/include/mdds/mixed_type_matrix_def.inl 2011-07-13 13:26:27.000000000 -0600
+-+++ misc/build/mdds_0.6.0/include/mdds/mixed_type_matrix_def.inl 2011-07-20 02:02:21.164198900 -0600
+-@@ -216,8 +216,8 @@
+- // assignment to self.
+- return;
+-
+-- size_t row_count = ::std::min(mp_storage->rows(), r.mp_storage->rows());
+-- size_t col_count = ::std::min(mp_storage->cols(), r.mp_storage->cols());
+-+ size_t row_count = (::std::min)(mp_storage->rows(), r.mp_storage->rows());
+-+ size_t col_count = (::std::min)(mp_storage->cols(), r.mp_storage->cols());
+- for (size_t i = 0; i < row_count; ++i)
+- for (size_t j = 0; j < col_count; ++j)
+- mp_storage->get_element(i, j) = r.mp_storage->get_element(i, j);
+---- misc/mdds_0.6.0/include/mdds/mixed_type_matrix_storage_filled_linear.inl 2011-07-13 13:26:27.000000000 -0600
+-+++ misc/build/mdds_0.6.0/include/mdds/mixed_type_matrix_storage_filled_linear.inl 2011-07-20 02:02:21.179798900 -0600
+-@@ -354,8 +354,8 @@
+- }
+-
+- array_type new_array(new_size, &m_init_elem);
+-- size_t min_rows = ::std::min(row, m_rows);
+-- size_t min_cols = ::std::min(col, m_cols);
+-+ size_t min_rows = (::std::min)(row, m_rows);
+-+ size_t min_cols = (::std::min)(col, m_cols);
+- for (size_t i = 0; i < min_rows; ++i)
+- {
+- for (size_t j = 0; j < min_cols; ++j)
+-@@ -612,8 +612,8 @@
+- }
+-
+- array_type new_array(new_size, element(0.0));
+-- size_t min_rows = ::std::min(row, m_rows);
+-- size_t min_cols = ::std::min(col, m_cols);
+-+ size_t min_rows = (::std::min)(row, m_rows);
+-+ size_t min_cols = (::std::min)(col, m_cols);
+- for (size_t i = 0; i < min_rows; ++i)
+- {
+- for (size_t j = 0; j < min_cols; ++j)
+---- misc/mdds_0.6.0/include/mdds/point_quad_tree.hpp 2011-07-13 13:26:27.000000000 -0600
+-+++ misc/build/mdds_0.6.0/include/mdds/point_quad_tree.hpp 2011-07-20 02:04:36.088835900 -0600
+-@@ -623,10 +623,10 @@
+- template<typename _Key, typename _Data>
+- void point_quad_tree<_Key,_Data>::insert(key_type x, key_type y, data_type data)
+- {
+-- m_xrange.first = ::std::min(m_xrange.first, x);
+-- m_xrange.second = ::std::max(m_xrange.second, x);
+-- m_yrange.first = ::std::min(m_yrange.first, y);
+-- m_yrange.second = ::std::max(m_yrange.second, y);
+-+ m_xrange.first = (::std::min)(m_xrange.first, x);
+-+ m_xrange.second = (::std::max)(m_xrange.second, x);
+-+ m_yrange.first = (::std::min)(m_yrange.first, y);
+-+ m_yrange.second = (::std::max)(m_yrange.second, y);
+-
+- if (!m_root)
+- {
+--
+cgit v0.10.2
+
projects / packages / libreoffice.git / commitdiff