mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch from orcus-0.11 to orcus-0.12

Browse Source 
Change-Id: I837ed3a30fae6fbe6cb658f1feecce1e88279ae0
This commit is contained in:
Jaskaran Singh
2016-06-24 19:53:11 +05:30
committed by Markus Mohrhard
parent e28d523873
commit 92be10ca06
8 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RepositoryExternal.mk
View File

@@ -3214,7 +3214,7 @@ $(call gb_LinkTarget_set_include,$(1),\
) )
$(call gb_LinkTarget_add_libs,$(1),\ $(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.11 \ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.12 \
) )
$(if $(SYSTEM_BOOST), \ $(if $(SYSTEM_BOOST), \
@@ -3233,7 +3233,7 @@ $(call gb_LinkTarget_set_include,$(1),\
) )
$(call gb_LinkTarget_add_libs,$(1),\ $(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.11 \ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.12 \
) )
endef endef

2
configure.ac
View File

@@ -9307,7 +9307,7 @@ if test -z "$enable_orcus" -o "$enable_orcus" != no; then
ENABLE_ORCUS="TRUE" ENABLE_ORCUS="TRUE"
AC_DEFINE(ENABLE_ORCUS) AC_DEFINE(ENABLE_ORCUS)
libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.11 >= 0.11.2]) libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.12 >= 0.12.0])
if test "$with_system_orcus" != "yes"; then if test "$with_system_orcus" != "yes"; then
if test "$SYSTEM_BOOST" = "TRUE"; then if test "$SYSTEM_BOOST" = "TRUE"; then
# =========================================================== # ===========================================================

4
download.lst
View File

@@ -122,8 +122,8 @@ export OPENLDAP_MD5SUM := 693ac26de86231f8dcae2b4e9d768e51
export OPENLDAP_TARBALL := openldap-2.4.44.tgz export OPENLDAP_TARBALL := openldap-2.4.44.tgz
export OPENSSL_MD5SUM := 9392e65072ce4b614c1392eefc1f23d0 export OPENSSL_MD5SUM := 9392e65072ce4b614c1392eefc1f23d0
export OPENSSL_TARBALL := openssl-1.0.2h.tar.gz export OPENSSL_TARBALL := openssl-1.0.2h.tar.gz
export ORCUS_MD5SUM := 205badaee72adf99422add8c4c49d669 export ORCUS_MD5SUM := b3b3efc8d6c92bb8016464e42cab3d06
export ORCUS_TARBALL := liborcus-0.11.2.tar.gz export ORCUS_TARBALL := b3b3efc8d6c92bb8016464e42cab3d06-liborcus-0.12.0.tar.gz
export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2 export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz
export PAGEMAKER_MD5SUM := 5c4985a68be0b79d3f809da5e12b143c export PAGEMAKER_MD5SUM := 5c4985a68be0b79d3f809da5e12b143c

4
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch vendored
View File

@@ -24,7 +24,7 @@ index b6e3f83..8027f25 100644
typedef const char* xmlns_id_t; typedef const char* xmlns_id_t;
-ORCUS_PSR_DLLPUBLIC extern const xmlns_id_t XMLNS_UNKNOWN_ID; -ORCUS_PSR_DLLPUBLIC extern const xmlns_id_t XMLNS_UNKNOWN_ID;
+const xmlns_id_t XMLNS_UNKNOWN_ID = NULL; +const xmlns_id_t XMLNS_UNKNOWN_ID = nullptr;
ORCUS_PSR_DLLPUBLIC extern const xml_token_t XML_UNKNOWN_TOKEN; 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 index_not_found;
ORCUS_PSR_DLLPUBLIC extern const size_t unspecified; ORCUS_PSR_DLLPUBLIC extern const size_t unspecified;
@@ -36,7 +36,7 @@ index be4e304..0a1b4a7 100644
namespace orcus { namespace orcus {
-const xmlns_id_t XMLNS_UNKNOWN_ID = NULL; -const xmlns_id_t XMLNS_UNKNOWN_ID = nullptr;
const xml_token_t XML_UNKNOWN_TOKEN = 0; const xml_token_t XML_UNKNOWN_TOKEN = 0;
const size_t index_not_found = std::numeric_limits<size_t>::max(); const size_t index_not_found = std::numeric_limits<size_t>::max();

8
external/liborcus/ExternalPackage_liborcus.mk vendored
View File

@@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,liborcus))
$(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus)) $(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus))
ifeq ($(OS),MACOSX) ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.11.0.dylib,src/liborcus/.libs/liborcus-0.11.0.dylib)) $(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.12.0.dylib,src/liborcus/.libs/liborcus-0.12.0.dylib))
$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.11.0.dylib,src/parser/.libs/liborcus-parser-0.11.0.dylib)) $(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.12.0.dylib,src/parser/.libs/liborcus-parser-0.12.0.dylib))
else ifeq ($(DISABLE_DYNLOADING),) else ifeq ($(DISABLE_DYNLOADING),)
$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.11.so.0,src/liborcus/.libs/liborcus-0.11.so.0.0.0)) $(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.12.so.0,src/liborcus/.libs/liborcus-0.12.so.0.0.0))
$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.11.so.0,src/parser/.libs/liborcus-parser-0.11.so.0.0.0)) $(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.12.so.0,src/parser/.libs/liborcus-parser-0.12.so.0.0.0))
endif endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

4
external/liborcus/ExternalProject_liborcus.mk vendored
View File

@@ -113,8 +113,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
$(MAKE) \ $(MAKE) \
$(if $(filter MACOSX,$(OS)),\ $(if $(filter MACOSX,$(OS)),\
&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
$(gb_Package_SOURCEDIR_liborcus)/src/liborcus/.libs/liborcus-0.11.0.dylib \ $(gb_Package_SOURCEDIR_liborcus)/src/liborcus/.libs/liborcus-0.12.0.dylib \
$(gb_Package_SOURCEDIR_liborcus)/src/parser/.libs/liborcus-parser-0.11.0.dylib \ $(gb_Package_SOURCEDIR_liborcus)/src/parser/.libs/liborcus-parser-0.12.0.dylib \
) \ ) \
) )

3
external/liborcus/Library_orcus-parser.mk vendored
View File

@@ -39,12 +39,15 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus-parser,\
UnpackedTarball/liborcus/src/parser/css_types \ UnpackedTarball/liborcus/src/parser/css_types \
UnpackedTarball/liborcus/src/parser/csv_parser_base \ UnpackedTarball/liborcus/src/parser/csv_parser_base \
UnpackedTarball/liborcus/src/parser/exception \ UnpackedTarball/liborcus/src/parser/exception \
UnpackedTarball/liborcus/src/parser/json_global \
UnpackedTarball/liborcus/src/parser/json_parser_base \ UnpackedTarball/liborcus/src/parser/json_parser_base \
UnpackedTarball/liborcus/src/parser/json_parser_thread \
UnpackedTarball/liborcus/src/parser/parser_base \ UnpackedTarball/liborcus/src/parser/parser_base \
UnpackedTarball/liborcus/src/parser/parser_global \ UnpackedTarball/liborcus/src/parser/parser_global \
UnpackedTarball/liborcus/src/parser/pstring \ UnpackedTarball/liborcus/src/parser/pstring \
UnpackedTarball/liborcus/src/parser/sax_parser_base \ UnpackedTarball/liborcus/src/parser/sax_parser_base \
UnpackedTarball/liborcus/src/parser/sax_token_parser \ UnpackedTarball/liborcus/src/parser/sax_token_parser \
UnpackedTarball/liborcus/src/parser/sax_token_parser_thread \
UnpackedTarball/liborcus/src/parser/stream \ UnpackedTarball/liborcus/src/parser/stream \
UnpackedTarball/liborcus/src/parser/string_pool \ UnpackedTarball/liborcus/src/parser/string_pool \
UnpackedTarball/liborcus/src/parser/tokens \ UnpackedTarball/liborcus/src/parser/tokens \

1
external/liborcus/Library_orcus.mk vendored
View File

@@ -65,6 +65,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\
UnpackedTarball/liborcus/src/liborcus/measurement \ UnpackedTarball/liborcus/src/liborcus/measurement \
UnpackedTarball/liborcus/src/liborcus/odf_helper \ UnpackedTarball/liborcus/src/liborcus/odf_helper \
UnpackedTarball/liborcus/src/liborcus/odf_namespace_types \ UnpackedTarball/liborcus/src/liborcus/odf_namespace_types \
UnpackedTarball/liborcus/src/liborcus/odf_number_formatting_context \
UnpackedTarball/liborcus/src/liborcus/odf_para_context \ UnpackedTarball/liborcus/src/liborcus/odf_para_context \
UnpackedTarball/liborcus/src/liborcus/odf_styles_context \ UnpackedTarball/liborcus/src/liborcus/odf_styles_context \
UnpackedTarball/liborcus/src/liborcus/odf_styles \ UnpackedTarball/liborcus/src/liborcus/odf_styles \