| 1 |
From 08f105a770ac20641cd287f9e999dc70eaafa343 Mon Sep 17 00:00:00 2001 |
| 2 |
From: Jaskaran Singh <jvsg1303@gmail.com> |
| 3 |
Date: Fri, 24 Jun 2016 19:53:11 +0530 |
| 4 |
Subject: [PATCH] Switch from orcus-0.11 to orcus-0.12 |
| 5 |
|
| 6 |
Change-Id: I837ed3a30fae6fbe6cb658f1feecce1e88279ae0 |
| 7 |
(cherry picked from commit 92be10ca0669fc05565507c4e62c674c5224e49f) |
| 8 |
--- |
| 9 |
RepositoryExternal.mk | 4 ++-- |
| 10 |
configure.ac | 2 +- |
| 11 |
download.lst | 4 ++-- |
| 12 |
.../liborcus/0001-workaround-a-linking-problem-on-windows.patch | 4 ++-- |
| 13 |
external/liborcus/ExternalPackage_liborcus.mk | 8 ++++---- |
| 14 |
external/liborcus/ExternalProject_liborcus.mk | 4 ++-- |
| 15 |
external/liborcus/Library_orcus-parser.mk | 3 +++ |
| 16 |
external/liborcus/Library_orcus.mk | 1 + |
| 17 |
8 files changed, 17 insertions(+), 13 deletions(-) |
| 18 |
|
| 19 |
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk |
| 20 |
index 0fc7d25..6094333 100644 |
| 21 |
--- a/RepositoryExternal.mk |
| 22 |
+++ b/RepositoryExternal.mk |
| 23 |
@@ -3108,7 +3108,7 @@ $(call gb_LinkTarget_set_include,$(1),\ |
| 24 |
) |
| 25 |
|
| 26 |
$(call gb_LinkTarget_add_libs,$(1),\ |
| 27 |
- -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.11 \ |
| 28 |
+ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.12 \ |
| 29 |
) |
| 30 |
|
| 31 |
$(if $(SYSTEM_BOOST), \ |
| 32 |
@@ -3127,7 +3127,7 @@ $(call gb_LinkTarget_set_include,$(1),\ |
| 33 |
) |
| 34 |
|
| 35 |
$(call gb_LinkTarget_add_libs,$(1),\ |
| 36 |
- -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.11 \ |
| 37 |
+ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.12 \ |
| 38 |
) |
| 39 |
|
| 40 |
endef |
| 41 |
diff --git a/configure.ac b/configure.ac |
| 42 |
index d271db2..8421640 100644 |
| 43 |
--- a/configure.ac |
| 44 |
+++ b/configure.ac |
| 45 |
@@ -9173,7 +9173,7 @@ if test -z "$enable_orcus" -o "$enable_orcus" != no; then |
| 46 |
ENABLE_ORCUS="TRUE" |
| 47 |
AC_DEFINE(ENABLE_ORCUS) |
| 48 |
|
| 49 |
- libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.11 >= 0.11.2]) |
| 50 |
+ libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.12 >= 0.12.0]) |
| 51 |
if test "$with_system_orcus" != "yes"; then |
| 52 |
if test "$SYSTEM_BOOST" = "TRUE"; then |
| 53 |
# =========================================================== |
| 54 |
diff --git a/download.lst b/download.lst |
| 55 |
index 7632f99..19e4752 100644 |
| 56 |
--- a/download.lst |
| 57 |
+++ b/download.lst |
| 58 |
@@ -118,8 +118,8 @@ export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 |
| 59 |
export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz |
| 60 |
export OPENSSL_MD5SUM := 9392e65072ce4b614c1392eefc1f23d0 |
| 61 |
export OPENSSL_TARBALL := openssl-1.0.2h.tar.gz |
| 62 |
-export ORCUS_MD5SUM := 205badaee72adf99422add8c4c49d669 |
| 63 |
-export ORCUS_TARBALL := liborcus-0.11.2.tar.gz |
| 64 |
+export ORCUS_MD5SUM := b3b3efc8d6c92bb8016464e42cab3d06 |
| 65 |
+export ORCUS_TARBALL := b3b3efc8d6c92bb8016464e42cab3d06-liborcus-0.12.0.tar.gz |
| 66 |
export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2 |
| 67 |
export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz |
| 68 |
export PAGEMAKER_MD5SUM := 5c4985a68be0b79d3f809da5e12b143c |
| 69 |
diff --git a/external/liborcus/0001-workaround-a-linking-problem-on-windows.patch b/external/liborcus/0001-workaround-a-linking-problem-on-windows.patch |
| 70 |
index 5710877..308e51c 100644 |
| 71 |
--- a/external/liborcus/0001-workaround-a-linking-problem-on-windows.patch |
| 72 |
+++ b/external/liborcus/0001-workaround-a-linking-problem-on-windows.patch |
| 73 |
@@ -24,7 +24,7 @@ index b6e3f83..8027f25 100644 |
| 74 |
typedef const char* xmlns_id_t; |
| 75 |
|
| 76 |
-ORCUS_PSR_DLLPUBLIC extern const xmlns_id_t XMLNS_UNKNOWN_ID; |
| 77 |
-+const xmlns_id_t XMLNS_UNKNOWN_ID = NULL; |
| 78 |
++const xmlns_id_t XMLNS_UNKNOWN_ID = nullptr; |
| 79 |
ORCUS_PSR_DLLPUBLIC extern const xml_token_t XML_UNKNOWN_TOKEN; |
| 80 |
ORCUS_PSR_DLLPUBLIC extern const size_t index_not_found; |
| 81 |
ORCUS_PSR_DLLPUBLIC extern const size_t unspecified; |
| 82 |
@@ -36,7 +36,7 @@ index be4e304..0a1b4a7 100644 |
| 83 |
|
| 84 |
namespace orcus { |
| 85 |
|
| 86 |
--const xmlns_id_t XMLNS_UNKNOWN_ID = NULL; |
| 87 |
+-const xmlns_id_t XMLNS_UNKNOWN_ID = nullptr; |
| 88 |
const xml_token_t XML_UNKNOWN_TOKEN = 0; |
| 89 |
|
| 90 |
const size_t index_not_found = std::numeric_limits<size_t>::max(); |
| 91 |
diff --git a/external/liborcus/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk |
| 92 |
index 56debe9..4a8b5f8 100644 |
| 93 |
--- a/external/liborcus/ExternalPackage_liborcus.mk |
| 94 |
+++ b/external/liborcus/ExternalPackage_liborcus.mk |
| 95 |
@@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,liborcus)) |
| 96 |
$(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus)) |
| 97 |
|
| 98 |
ifeq ($(OS),MACOSX) |
| 99 |
-$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.11.0.dylib,src/liborcus/.libs/liborcus-0.11.0.dylib)) |
| 100 |
-$(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)) |
| 101 |
+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.12.0.dylib,src/liborcus/.libs/liborcus-0.12.0.dylib)) |
| 102 |
+$(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)) |
| 103 |
else ifeq ($(DISABLE_DYNLOADING),) |
| 104 |
-$(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)) |
| 105 |
-$(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)) |
| 106 |
+$(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)) |
| 107 |
+$(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)) |
| 108 |
endif |
| 109 |
|
| 110 |
# vim: set noet sw=4 ts=4: |
| 111 |
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk |
| 112 |
index 580ef847..dce7d63 100644 |
| 113 |
--- a/external/liborcus/ExternalProject_liborcus.mk |
| 114 |
+++ b/external/liborcus/ExternalProject_liborcus.mk |
| 115 |
@@ -113,8 +113,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : |
| 116 |
$(MAKE) \ |
| 117 |
$(if $(filter MACOSX,$(OS)),\ |
| 118 |
&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ |
| 119 |
- $(gb_Package_SOURCEDIR_liborcus)/src/liborcus/.libs/liborcus-0.11.0.dylib \ |
| 120 |
- $(gb_Package_SOURCEDIR_liborcus)/src/parser/.libs/liborcus-parser-0.11.0.dylib \ |
| 121 |
+ $(gb_Package_SOURCEDIR_liborcus)/src/liborcus/.libs/liborcus-0.12.0.dylib \ |
| 122 |
+ $(gb_Package_SOURCEDIR_liborcus)/src/parser/.libs/liborcus-parser-0.12.0.dylib \ |
| 123 |
) \ |
| 124 |
) |
| 125 |
|
| 126 |
diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk |
| 127 |
index 28af14e..4c2ca7f 100644 |
| 128 |
--- a/external/liborcus/Library_orcus-parser.mk |
| 129 |
+++ b/external/liborcus/Library_orcus-parser.mk |
| 130 |
@@ -39,12 +39,15 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus-parser,\ |
| 131 |
UnpackedTarball/liborcus/src/parser/css_types \ |
| 132 |
UnpackedTarball/liborcus/src/parser/csv_parser_base \ |
| 133 |
UnpackedTarball/liborcus/src/parser/exception \ |
| 134 |
+ UnpackedTarball/liborcus/src/parser/json_global \ |
| 135 |
UnpackedTarball/liborcus/src/parser/json_parser_base \ |
| 136 |
+ UnpackedTarball/liborcus/src/parser/json_parser_thread \ |
| 137 |
UnpackedTarball/liborcus/src/parser/parser_base \ |
| 138 |
UnpackedTarball/liborcus/src/parser/parser_global \ |
| 139 |
UnpackedTarball/liborcus/src/parser/pstring \ |
| 140 |
UnpackedTarball/liborcus/src/parser/sax_parser_base \ |
| 141 |
UnpackedTarball/liborcus/src/parser/sax_token_parser \ |
| 142 |
+ UnpackedTarball/liborcus/src/parser/sax_token_parser_thread \ |
| 143 |
UnpackedTarball/liborcus/src/parser/stream \ |
| 144 |
UnpackedTarball/liborcus/src/parser/string_pool \ |
| 145 |
UnpackedTarball/liborcus/src/parser/tokens \ |
| 146 |
diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk |
| 147 |
index e49adca..adc43cb 100644 |
| 148 |
--- a/external/liborcus/Library_orcus.mk |
| 149 |
+++ b/external/liborcus/Library_orcus.mk |
| 150 |
@@ -65,6 +65,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\ |
| 151 |
UnpackedTarball/liborcus/src/liborcus/measurement \ |
| 152 |
UnpackedTarball/liborcus/src/liborcus/odf_helper \ |
| 153 |
UnpackedTarball/liborcus/src/liborcus/odf_namespace_types \ |
| 154 |
+ UnpackedTarball/liborcus/src/liborcus/odf_number_formatting_context \ |
| 155 |
UnpackedTarball/liborcus/src/liborcus/odf_para_context \ |
| 156 |
UnpackedTarball/liborcus/src/liborcus/odf_styles_context \ |
| 157 |
UnpackedTarball/liborcus/src/liborcus/odf_styles \ |
| 158 |
-- |
| 159 |
2.9.3 |
| 160 |
|
Parent Directory
| 
Revision Log