Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=01b888c9bcc63c0feee533f69777a284f2aace48
commit 01b888c9bcc63c0feee533f69777a284f2aace48 Author: Miklos Vajna <[email protected]> Date: Thu Feb 2 14:57:27 2017 +0100 libreoffice-5.3.0.3-1-x86_64 - 5.2 -> 5.3 - new import filters: zmf and staroffice - update bundled xmlsec (still not there to use a system one) diff --git a/source/xoffice/libreoffice/0001-Add-odf-strikeout-to-orcus-interface.patch b/source/xoffice/libreoffice/0001-Add-odf-strikeout-to-orcus-interface.patch deleted file mode 100644 index cd8c89e..0000000 --- a/source/xoffice/libreoffice/0001-Add-odf-strikeout-to-orcus-interface.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 872c5e0c807ae248387ee425615e4c8080d01221 Mon Sep 17 00:00:00 2001 -From: Jaskaran Singh <[email protected]> -Date: Thu, 28 Jul 2016 14:00:46 +0530 -Subject: [PATCH] Add odf strikeout to orcus interface - -Change-Id: Ibf8d1e7b0272fe4112fda0249eafef1aa5438d9a ---- - sc/source/filter/inc/orcusinterface.hxx | 7 +++ - sc/source/filter/orcus/interface.cxx | 88 +++++++++++++++++++++++++++++---- - 2 files changed, 85 insertions(+), 10 deletions(-) - -diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx -index 9754ea4..9afc218 100644 ---- a/sc/source/filter/inc/orcusinterface.hxx -+++ b/sc/source/filter/inc/orcusinterface.hxx -@@ -390,6 +393,10 @@ public: - orcus::spreadsheet::color_elem_t red, - orcus::spreadsheet::color_elem_t green, - orcus::spreadsheet::color_elem_t blue) override; -+ virtual void set_strikethrough_style(orcus::spreadsheet::strikethrough_style_t s) override; -+ virtual void set_strikethrough_type(orcus::spreadsheet::strikethrough_type_t s) override; -+ virtual void set_strikethrough_width(orcus::spreadsheet::strikethrough_width_t s) override; -+ virtual void set_strikethrough_text(orcus::spreadsheet::strikethrough_text_t s) override; - virtual size_t commit_font() override; - - // fill -diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx -index 1be81262..5f30120 100644 ---- a/sc/source/filter/orcus/interface.cxx -+++ b/sc/source/filter/orcus/interface.cxx -@@ -1141,6 +1149,22 @@ void ScOrcusStyles::set_font_color(orcus::spreadsheet::color_elem_t alpha, - maCurrentFont.maColor = Color(alpha, red, green, blue); - } - -+void ScOrcusStyles::set_strikethrough_style(orcus::spreadsheet::strikethrough_style_t /*s*/) -+{ -+} -+ -+void ScOrcusStyles::set_strikethrough_type(orcus::spreadsheet::strikethrough_type_t /*s*/) -+{ -+} -+ -+void ScOrcusStyles::set_strikethrough_width(orcus::spreadsheet::strikethrough_width_t /*s*/) -+{ -+} -+ -+void ScOrcusStyles::set_strikethrough_text(orcus::spreadsheet::strikethrough_text_t /*s*/) -+{ -+} -+ - size_t ScOrcusStyles::commit_font() - { - SAL_INFO("sc.orcus.style", "commit font"); --- -2.9.3 - diff --git a/source/xoffice/libreoffice/0001-Declare-font-border-protection-orcus-interface-metho.patch b/source/xoffice/libreoffice/0001-Declare-font-border-protection-orcus-interface-metho.patch deleted file mode 100644 index 9e8aff7..0000000 --- a/source/xoffice/libreoffice/0001-Declare-font-border-protection-orcus-interface-metho.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 5a2b92977df1ce28f99b1a391fdfd3a37bd727f9 Mon Sep 17 00:00:00 2001 -From: Jaskaran Singh <[email protected]> -Date: Sun, 26 Jun 2016 13:13:42 +0530 -Subject: [PATCH] Declare font, border, protection orcus interface methods - -Change-Id: I486d861ba3c2c763964cdc3af2312661ef1a533d ---- - sc/source/filter/inc/orcusinterface.hxx | 10 +++++++++ - sc/source/filter/orcus/interface.cxx | 38 +++++++++++++++++++++++++++++++++ - 2 files changed, 48 insertions(+) - -diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx -index 3046b44..521b388 100644 ---- a/sc/source/filter/inc/orcusinterface.hxx -+++ b/sc/source/filter/inc/orcusinterface.hxx -@@ -357,6 +357,13 @@ public: - virtual void set_font_name(const char* s, size_t n) override; - virtual void set_font_size(double point) override; - virtual void set_font_underline(orcus::spreadsheet::underline_t e) override; -+ virtual void set_font_underline_width(orcus::spreadsheet::underline_width_t e) override; -+ virtual void set_font_underline_mode(orcus::spreadsheet::underline_mode_t e) override; -+ virtual void set_font_underline_type(orcus::spreadsheet::underline_type_t e) override; -+ virtual void set_font_underline_color(orcus::spreadsheet::color_elem_t alpha, -+ orcus::spreadsheet::color_elem_t red, -+ orcus::spreadsheet::color_elem_t green, -+ orcus::spreadsheet::color_elem_t blue) override; - virtual void set_font_color( orcus::spreadsheet::color_elem_t alpha, - orcus::spreadsheet::color_elem_t red, - orcus::spreadsheet::color_elem_t green, -@@ -381,11 +388,14 @@ public: - orcus::spreadsheet::color_elem_t red, - orcus::spreadsheet::color_elem_t green, - orcus::spreadsheet::color_elem_t blue) override; -+ virtual void set_border_width(orcus::spreadsheet::border_direction_t dir, orcus::length_t width) override; - virtual size_t commit_border() override; - - // cell protection - virtual void set_cell_hidden(bool b) override; - virtual void set_cell_locked(bool b) override; -+ virtual void set_cell_print_content(bool b) override; -+ virtual void set_cell_formula_hidden(bool b) override; - virtual size_t commit_cell_protection() override; - - // number format -diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx -index e8a2dba..dbeb6aa 100644 ---- a/sc/source/filter/orcus/interface.cxx -+++ b/sc/source/filter/orcus/interface.cxx -@@ -961,6 +961,29 @@ void ScOrcusStyles::set_font_underline(orcus::spreadsheet::underline_t e) - } - } - -+void ScOrcusStyles::set_font_underline_width(orcus::spreadsheet::underline_width_t /* e */) -+{ -+ -+} -+ -+void ScOrcusStyles::set_font_underline_mode(orcus::spreadsheet::underline_mode_t /* e */) -+{ -+ -+} -+ -+void ScOrcusStyles::set_font_underline_type(orcus::spreadsheet::underline_type_t /* e */) -+{ -+ -+} -+ -+void ScOrcusStyles::set_font_underline_color(orcus::spreadsheet::color_elem_t /*alpha*/, -+ orcus::spreadsheet::color_elem_t /*red*/, -+ orcus::spreadsheet::color_elem_t /*green*/, -+ orcus::spreadsheet::color_elem_t /*blue*/) -+{ -+ -+} -+ - void ScOrcusStyles::set_font_color(orcus::spreadsheet::color_elem_t alpha, - orcus::spreadsheet::color_elem_t red, - orcus::spreadsheet::color_elem_t green, -@@ -1035,6 +1058,11 @@ void ScOrcusStyles::set_border_color(orcus::spreadsheet::border_direction_t dir, - current_line.maColor = Color(alpha, red, green, blue); - } - -+void ScOrcusStyles::set_border_width(orcus::spreadsheet::border_direction_t /* dir */, orcus::length_t /* width */) -+{ -+ -+} -+ - size_t ScOrcusStyles::commit_border() - { - SAL_INFO("sc.orcus.style", "commit border"); -@@ -1054,6 +1082,16 @@ void ScOrcusStyles::set_cell_locked(bool b) - maCurrentProtection.mbLocked = b; - } - -+void ScOrcusStyles::set_cell_print_content(bool /* b */) -+{ -+ -+} -+ -+void ScOrcusStyles::set_cell_formula_hidden(bool /* b */) -+{ -+ -+} -+ - size_t ScOrcusStyles::commit_cell_protection() - { - SAL_INFO("sc.orcus.style", "commit cell protection"); --- -2.9.3 - diff --git a/source/xoffice/libreoffice/0001-Reform-orcus-interface-to-set-border-width.patch b/source/xoffice/libreoffice/0001-Reform-orcus-interface-to-set-border-width.patch deleted file mode 100644 index 878de28..0000000 --- a/source/xoffice/libreoffice/0001-Reform-orcus-interface-to-set-border-width.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 933ae1905617a2e2cc177a34a7060a2b26e5827c Mon Sep 17 00:00:00 2001 -From: Jaskaran Singh <[email protected]> -Date: Thu, 28 Jul 2016 15:40:22 +0530 -Subject: [PATCH] Reform orcus interface to set border width - -Change-Id: Ic93b334205221548e4bd7920551034b1ccee4fa8 ---- - sc/source/filter/inc/orcusinterface.hxx | 2 +- - sc/source/filter/orcus/interface.cxx | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx -index 9afc218..f3520b4 100644 ---- a/sc/source/filter/inc/orcusinterface.hxx -+++ b/sc/source/filter/inc/orcusinterface.hxx -@@ -417,7 +417,7 @@ public: - orcus::spreadsheet::color_elem_t red, - orcus::spreadsheet::color_elem_t green, - orcus::spreadsheet::color_elem_t blue) override; -- virtual void set_border_width(orcus::spreadsheet::border_direction_t dir, orcus::length_t width) override; -+ virtual void set_border_width(orcus::spreadsheet::border_direction_t dir, double val, orcus::length_unit_t unit) override; - virtual size_t commit_border() override; - - // cell protection -diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx -index 5f30120..ff8c7465 100644 ---- a/sc/source/filter/orcus/interface.cxx -+++ b/sc/source/filter/orcus/interface.cxx -@@ -1318,8 +1318,8 @@ void ScOrcusStyles::set_border_color(orcus::spreadsheet::border_direction_t dir, - current_line.maColor = Color(alpha, red, green, blue); - } - --void ScOrcusStyles::set_border_width(orcus::spreadsheet::border_direction_t /* dir */, orcus::length_t /* width */) -+void ScOrcusStyles::set_border_width(orcus::spreadsheet::border_direction_t /* dir */, double /* val */, orcus::length_unit_t /* unit */) - { - - } - - size_t ScOrcusStyles::commit_border() --- -2.9.3 - diff --git a/source/xoffice/libreoffice/0001-Switch-from-orcus-0.11-to-orcus-0.12.patch b/source/xoffice/libreoffice/0001-Switch-from-orcus-0.11-to-orcus-0.12.patch deleted file mode 100644 index 74f6fce..0000000 --- a/source/xoffice/libreoffice/0001-Switch-from-orcus-0.11-to-orcus-0.12.patch +++ /dev/null @@ -1,160 +0,0 @@ -From 08f105a770ac20641cd287f9e999dc70eaafa343 Mon Sep 17 00:00:00 2001 -From: Jaskaran Singh <[email protected]> -Date: Fri, 24 Jun 2016 19:53:11 +0530 -Subject: [PATCH] Switch from orcus-0.11 to orcus-0.12 - -Change-Id: I837ed3a30fae6fbe6cb658f1feecce1e88279ae0 -(cherry picked from commit 92be10ca0669fc05565507c4e62c674c5224e49f) ---- - RepositoryExternal.mk | 4 ++-- - configure.ac | 2 +- - download.lst | 4 ++-- - .../liborcus/0001-workaround-a-linking-problem-on-windows.patch | 4 ++-- - external/liborcus/ExternalPackage_liborcus.mk | 8 ++++---- - external/liborcus/ExternalProject_liborcus.mk | 4 ++-- - external/liborcus/Library_orcus-parser.mk | 3 +++ - external/liborcus/Library_orcus.mk | 1 + - 8 files changed, 17 insertions(+), 13 deletions(-) - -diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk -index 0fc7d25..6094333 100644 ---- a/RepositoryExternal.mk -+++ b/RepositoryExternal.mk -@@ -3108,7 +3108,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.11 \ -+ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.12 \ - ) - - $(if $(SYSTEM_BOOST), \ -@@ -3127,7 +3127,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.11 \ -+ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.12 \ - ) - - endef -diff --git a/configure.ac b/configure.ac -index d271db2..8421640 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -9173,7 +9173,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.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 "$SYSTEM_BOOST" = "TRUE"; then - # =========================================================== -diff --git a/download.lst b/download.lst -index 7632f99..19e4752 100644 ---- a/download.lst -+++ b/download.lst -@@ -118,8 +118,8 @@ export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 - export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz - export OPENSSL_MD5SUM := 9392e65072ce4b614c1392eefc1f23d0 - export OPENSSL_TARBALL := openssl-1.0.2h.tar.gz --export ORCUS_MD5SUM := 205badaee72adf99422add8c4c49d669 --export ORCUS_TARBALL := liborcus-0.11.2.tar.gz -+export ORCUS_MD5SUM := b3b3efc8d6c92bb8016464e42cab3d06 -+export ORCUS_TARBALL := b3b3efc8d6c92bb8016464e42cab3d06-liborcus-0.12.0.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 := 5c4985a68be0b79d3f809da5e12b143c -diff --git a/external/liborcus/0001-workaround-a-linking-problem-on-windows.patch b/external/liborcus/0001-workaround-a-linking-problem-on-windows.patch -index 5710877..308e51c 100644 ---- a/external/liborcus/0001-workaround-a-linking-problem-on-windows.patch -+++ b/external/liborcus/0001-workaround-a-linking-problem-on-windows.patch -@@ -24,7 +24,7 @@ index b6e3f83..8027f25 100644 - 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; -++const xmlns_id_t XMLNS_UNKNOWN_ID = nullptr; - 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; -@@ -36,7 +36,7 @@ index be4e304..0a1b4a7 100644 - - 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 size_t index_not_found = std::numeric_limits<size_t>::max(); -diff --git a/external/liborcus/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk -index 56debe9..4a8b5f8 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 gb_ExternalPackage_use_external_project,liborcus,liborcus)) - - 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-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-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.12.0.dylib,src/parser/.libs/liborcus-parser-0.12.0.dylib)) - 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-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-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.12.so.0,src/parser/.libs/liborcus-parser-0.12.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 580ef847..dce7d63 100644 ---- a/external/liborcus/ExternalProject_liborcus.mk -+++ b/external/liborcus/ExternalProject_liborcus.mk -@@ -113,8 +113,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : - $(MAKE) \ - $(if $(filter MACOSX,$(OS)),\ - && $(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/parser/.libs/liborcus-parser-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.12.0.dylib \ - ) \ - ) - -diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk -index 28af14e..4c2ca7f 100644 ---- a/external/liborcus/Library_orcus-parser.mk -+++ b/external/liborcus/Library_orcus-parser.mk -@@ -39,12 +39,15 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus-parser,\ - UnpackedTarball/liborcus/src/parser/css_types \ - UnpackedTarball/liborcus/src/parser/csv_parser_base \ - UnpackedTarball/liborcus/src/parser/exception \ -+ UnpackedTarball/liborcus/src/parser/json_global \ - 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_global \ - UnpackedTarball/liborcus/src/parser/pstring \ - UnpackedTarball/liborcus/src/parser/sax_parser_base \ - UnpackedTarball/liborcus/src/parser/sax_token_parser \ -+ UnpackedTarball/liborcus/src/parser/sax_token_parser_thread \ - UnpackedTarball/liborcus/src/parser/stream \ - UnpackedTarball/liborcus/src/parser/string_pool \ - UnpackedTarball/liborcus/src/parser/tokens \ -diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk -index e49adca..adc43cb 100644 ---- a/external/liborcus/Library_orcus.mk -+++ b/external/liborcus/Library_orcus.mk -@@ -65,6 +65,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\ - UnpackedTarball/liborcus/src/liborcus/measurement \ - UnpackedTarball/liborcus/src/liborcus/odf_helper \ - 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_styles_context \ - UnpackedTarball/liborcus/src/liborcus/odf_styles \ --- -2.9.3 - diff --git a/source/xoffice/libreoffice/FrugalBuild b/source/xoffice/libreoffice/FrugalBuild index fbea87e..ba66711 100644 --- a/source/xoffice/libreoffice/FrugalBuild +++ b/source/xoffice/libreoffice/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Laszlo Dvornik <[email protected]> pkgname=libreoffice -pkgver=5.2.5.1 +pkgver=5.3.0.3 minor=${pkgver:0:5} # x.y.z major=${pkgver:0:3} # x.y pkgrel=1 @@ -39,6 +39,8 @@ depends=( 'librdf' 'libsndfile' 'libvisio>=0.0.24-2' + 'libzmf' + 'libstaroffice' 'libwps>=0.4.0' 'libxaw>=1.0.5' 'libxml2' @@ -97,15 +99,11 @@ do source=(${source[@]} $mirror/libreoffice-$i${pkgver/_/-}.tar.xz) signatures=("${signatures[@]}" $mirror/libreoffice-$i${pkgver/_/-}.tar.xz.asc) done -source+=(icu58.1.patch \ - 0001-Switch-from-orcus-0.11-to-orcus-0.12.patch \ - 0001-Declare-font-border-protection-orcus-interface-metho.patch \ - 0001-Add-odf-strikeout-to-orcus-interface.patch \ - 0001-Reform-orcus-interface-to-set-border-width.patch) -signatures+=('' '' '' '' '') +source+=() +signatures+=() ext_source=(http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll \ - http://dev-www.libreoffice.org/src/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz \ + http://dev-www.libreoffice.org/src/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz \ http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip \ http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip \ http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip \ diff --git a/source/xoffice/libreoffice/icu58.1.patch b/source/xoffice/libreoffice/icu58.1.patch deleted file mode 100644 index 58ce601..0000000 --- a/source/xoffice/libreoffice/icu58.1.patch +++ /dev/null @@ -1,278 +0,0 @@ -From: Eike Rathke <[email protected]> -Date: Wed, 2 Nov 2016 12:07:48 +0000 (+0100) -Subject: upgrade to ICU 58 -X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff_plain;h=3e42714c76b1347babfdea0564009d8d82a83af4 - -upgrade to ICU 58 - -Change-Id: I4a992447df65b337721a2a2627d974172a14cba5 -Reviewed-on: https://gerrit.libreoffice.org/30487 -Reviewed-by: Eike Rathke <[email protected]> -Tested-by: Eike Rathke <[email protected]> ---- - -diff --git a/configure.ac b/configure.ac -index f06ef8e..66a11a9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -9136,7 +9136,7 @@ SYSTEM_GENBRK= - SYSTEM_GENCCODE= - SYSTEM_GENCMN= - --ICU_MAJOR=57 -+ICU_MAJOR=58 - ICU_MINOR=1 - ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE" - ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE" -diff --git a/download.lst b/download.lst -index 4571338..0770a4d 100644 ---- a/download.lst -+++ b/download.lst -@@ -62,7 +62,7 @@ export HARFBUZZ_TARBALL := harfbuzz-1.3.2.tar.bz2 - export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - export HUNSPELL_TARBALL := 33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz - export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz --export ICU_TARBALL := 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz -+export ICU_TARBALL := 1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz - export JFREEREPORT_FLOW_ENGINE_TARBALL := ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - export JFREEREPORT_FLUTE_TARBALL := d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - export JFREEREPORT_LIBBASE_TARBALL := eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip -diff --git a/external/icu/icu-ubsan.patch.0 b/external/icu/icu-ubsan.patch.0 -index 6d1d3bc..8a47242 100644 ---- a/external/icu/icu-ubsan.patch.0 -+++ b/external/icu/icu-ubsan.patch.0 -@@ -151,14 +151,3 @@ - length(len), next(subNode) {} - virtual UBool operator==(const Node &other) const; - virtual int32_t markRightEdgesFirst(int32_t edgeNumber); ----- source/common/unifiedcache.h --+++ source/common/unifiedcache.h --@@ -139,7 +139,7 @@ -- : CacheKey<T>(other), fLoc(other.fLoc) { } -- virtual ~LocaleCacheKey() { } -- virtual int32_t hashCode() const { --- return 37 *CacheKey<T>::hashCode() + fLoc.hashCode(); --+ return 37U *CacheKey<T>::hashCode() + fLoc.hashCode(); -- } -- virtual UBool operator == (const CacheKeyBase &other) const { -- // reflexive -diff --git a/external/icu/icu4c-warnings.patch b/external/icu/icu4c-warnings.patch -index d146093..96608d7 100644 ---- a/external/icu/icu4c-warnings.patch -+++ b/external/icu/icu4c-warnings.patch -@@ -8,15 +8,3 @@ - } \ - } - ----- misc/icu/source/common/unicode/utypes.h --+++ misc/build/icu/source/common/unicode/utypes.h --@@ -399,7 +399,7 @@ -- * some Linux/Unix compilers have problems with defining global new/delete. -- * On Windows, it is _MSC_VER>=1200 for MSVC 6.0 and higher. -- */ ---#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && (_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && (defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || defined(U_LAYOUTEX_IMPLEMENTATION)) --+#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && defined (_MSC_VER) && (_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && (defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || defined(U_LAYOUTEX_IMPLEMENTATION)) -- -- #ifndef U_HIDE_INTERNAL_API -- /** -- -diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx -index 3b0b227..76ae209 100644 ---- a/i18npool/source/breakiterator/breakiterator_unicode.cxx -+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx -@@ -63,10 +63,13 @@ BreakIterator_Unicode::~BreakIterator_Unicode() - class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator - { - public: -+#if (U_ICU_VERSION_MAJOR_NUM < 58) -+ // RuleBasedBreakIterator::setBreakType() is private as of ICU 58. - inline void publicSetBreakType(int32_t type) - { - setBreakType(type); - }; -+#endif - OOoRuleBasedBreakIterator(UDataMemory* image, - UErrorCode &status) - : RuleBasedBreakIterator(image, status) -@@ -142,12 +145,21 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Local - } - } - if (rbi) { -+#if (U_ICU_VERSION_MAJOR_NUM < 58) -+ // ICU 58 made RuleBasedBreakIterator::setBreakType() private -+ // instead of protected, so the old workaround of -+ // https://ssl.icu-project.org/trac/ticket/5498 -+ // doesn't work anymore. However, they also claim to have fixed -+ // the cause that an initial fBreakType==-1 would lead to an -+ // endless loop under some circumstances. -+ // Let's see ... - switch (rBreakType) { - case LOAD_CHARACTER_BREAKITERATOR: rbi->publicSetBreakType(UBRK_CHARACTER); break; - case LOAD_WORD_BREAKITERATOR: rbi->publicSetBreakType(UBRK_WORD); break; - case LOAD_SENTENCE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_SENTENCE); break; - case LOAD_LINE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_LINE); break; - } -+#endif - icuBI->aBreakIterator = rbi; - } - } -diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx -index bb82bbf..984c5f7 100644 ---- a/i18nutil/source/utility/unicode.cxx -+++ b/i18nutil/source/utility/unicode.cxx -@@ -957,6 +957,32 @@ OString SAL_CALL unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript) - sRet = "sa-Sidd"; - break; - #endif -+#if (U_ICU_VERSION_MAJOR_NUM >= 58) -+ case USCRIPT_ADLAM: -+ sRet = "mis"; // Adlm - Adlam for Fulani, no language code -+ break; -+ case USCRIPT_BHAIKSUKI: -+ sRet = "mis"; // Bhks - Bhaiksuki for some Buddhist texts, no language code -+ break; -+ case USCRIPT_MARCHEN: -+ sRet = "bo-Marc"; -+ break; -+ case USCRIPT_NEWA: -+ sRet = "new-Newa"; -+ break; -+ case USCRIPT_OSAGE: -+ sRet = "osa-Osge"; -+ break; -+ case USCRIPT_HAN_WITH_BOPOMOFO: -+ sRet = "mis"; // Hanb - Han with Bopomofo, zh-Hanb ? -+ break; -+ case USCRIPT_JAMO: -+ sRet = "mis"; // Jamo - Jamo subset of Hangul, ko-Jamo ? -+ break; -+ case USCRIPT_SYMBOLS_EMOJI: -+ sRet = "mis"; // Zsye - Emoji variant -+ break; -+#endif - } - return sRet; - } -diff --git a/include/svx/ucsubset.hrc b/include/svx/ucsubset.hrc -index adf1cf6..1157a7e 100644 ---- a/include/svx/ucsubset.hrc -+++ b/include/svx/ucsubset.hrc -@@ -291,6 +291,17 @@ - #define RID_SUBSETSTR_OLD_HUNGARIAN (RID_SUBSET_START + 263) - #define RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS (RID_SUBSET_START + 264) - #define RID_SUBSETSTR_SUTTON_SIGNWRITING (RID_SUBSET_START + 265) -+#define RID_SUBSETSTR_ADLAM (RID_SUBSET_START + 266) -+#define RID_SUBSETSTR_BHAIKSUKI (RID_SUBSET_START + 267) -+#define RID_SUBSETSTR_CYRILLIC_EXTENDED_C (RID_SUBSET_START + 268) -+#define RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT (RID_SUBSET_START + 269) -+#define RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION (RID_SUBSET_START + 270) -+#define RID_SUBSETSTR_MARCHEN (RID_SUBSET_START + 271) -+#define RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT (RID_SUBSET_START + 272) -+#define RID_SUBSETSTR_NEWA (RID_SUBSET_START + 273) -+#define RID_SUBSETSTR_OSAGE (RID_SUBSET_START + 274) -+#define RID_SUBSETSTR_TANGUT (RID_SUBSET_START + 275) -+#define RID_SUBSETSTR_TANGUT_COMPONENTS (RID_SUBSET_START + 276) - - // RID_SUBSET_END (RID_SUBSET_START + 299) - -diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx -index bcc7cef..ff201a6 100644 ---- a/svx/source/dialog/charmap.cxx -+++ b/svx/source/dialog/charmap.cxx -@@ -1594,6 +1594,41 @@ void SubsetMap::InitList() - aAllSubsets.push_back( Subset( 0x1D800, 0x1DAAF, RID_SUBSETSTR_SUTTON_SIGNWRITING ) ); - break; - #endif -+#if (U_ICU_VERSION_MAJOR_NUM >= 58) -+ case UBLOCK_ADLAM: -+ aAllSubsets.push_back( Subset( 0x1E900, 0x1E95F, RID_SUBSETSTR_ADLAM ) ); -+ break; -+ case UBLOCK_BHAIKSUKI: -+ aAllSubsets.push_back( Subset( 0x11C00, 0x11C6F, RID_SUBSETSTR_BHAIKSUKI ) ); -+ break; -+ case UBLOCK_CYRILLIC_EXTENDED_C: -+ aAllSubsets.push_back( Subset( 0x1C80, 0x1C8F, RID_SUBSETSTR_CYRILLIC_EXTENDED_C ) ); -+ break; -+ case UBLOCK_GLAGOLITIC_SUPPLEMENT: -+ aAllSubsets.push_back( Subset( 0x1E000, 0x1E02F, RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT ) ); -+ break; -+ case UBLOCK_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION: -+ aAllSubsets.push_back( Subset( 0x16FE0, 0x16FFF, RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION ) ); -+ break; -+ case UBLOCK_MARCHEN: -+ aAllSubsets.push_back( Subset( 0x11C70, 0x11CBF, RID_SUBSETSTR_MARCHEN ) ); -+ break; -+ case UBLOCK_MONGOLIAN_SUPPLEMENT: -+ aAllSubsets.push_back( Subset( 0x11660, 0x1167F, RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT ) ); -+ break; -+ case UBLOCK_NEWA: -+ aAllSubsets.push_back( Subset( 0x11400, 0x1147F, RID_SUBSETSTR_NEWA ) ); -+ break; -+ case UBLOCK_OSAGE: -+ aAllSubsets.push_back( Subset( 0x104B0, 0x104FF, RID_SUBSETSTR_OSAGE ) ); -+ break; -+ case UBLOCK_TANGUT: -+ aAllSubsets.push_back( Subset( 0x17000, 0x187FF, RID_SUBSETSTR_TANGUT ) ); -+ break; -+ case UBLOCK_TANGUT_COMPONENTS: -+ aAllSubsets.push_back( Subset( 0x18800, 0x18AFF, RID_SUBSETSTR_TANGUT_COMPONENTS ) ); -+ break; -+#endif - - } - -diff --git a/svx/source/dialog/ucsubset.src b/svx/source/dialog/ucsubset.src -index 06630cc..a7765c3 100644 ---- a/svx/source/dialog/ucsubset.src -+++ b/svx/source/dialog/ucsubset.src -@@ -1079,6 +1079,50 @@ Resource RID_SUBSETMAP - { - Text [ en-US ] = "Sutton Signwriting"; - }; -+ String RID_SUBSETSTR_ADLAM -+ { -+ Text [ en-US ] = "Adlam"; -+ }; -+ String RID_SUBSETSTR_BHAIKSUKI -+ { -+ Text [ en-US ] = "Bhaiksuki"; -+ }; -+ String RID_SUBSETSTR_CYRILLIC_EXTENDED_C -+ { -+ Text [ en-US ] = "Cyrillic Extended-C"; -+ }; -+ String RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT -+ { -+ Text [ en-US ] = "Glagolitic Supplement"; -+ }; -+ String RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION -+ { -+ Text [ en-US ] = "Ideographic Symbols and Punctuation"; -+ }; -+ String RID_SUBSETSTR_MARCHEN -+ { -+ Text [ en-US ] = "Marchen"; -+ }; -+ String RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT -+ { -+ Text [ en-US ] = "Mongolian Supplement"; -+ }; -+ String RID_SUBSETSTR_NEWA -+ { -+ Text [ en-US ] = "Newa"; -+ }; -+ String RID_SUBSETSTR_OSAGE -+ { -+ Text [ en-US ] = "Osage"; -+ }; -+ String RID_SUBSETSTR_TANGUT -+ { -+ Text [ en-US ] = "Tangut"; -+ }; -+ String RID_SUBSETSTR_TANGUT_COMPONENTS -+ { -+ Text [ en-US ] = "Tangut Components"; -+ }; - }; - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
