svn commit: r458699 - in head/editors/libreoffice: . files
Jung-uk Kim
jkim at FreeBSD.org
Wed Jan 10 22:40:09 UTC 2018
Author: jkim
Date: Wed Jan 10 22:40:07 2018
New Revision: 458699
URL: https://svnweb.freebsd.org/changeset/ports/458699
Log:
Catch up with liborcus 0.13.
Added:
head/editors/libreoffice/files/patch-sc_source_filter_inc_orcusinterface.hxx (contents, props changed)
head/editors/libreoffice/files/patch-sc_source_filter_orcus_interface.cxx (contents, props changed)
head/editors/libreoffice/files/patch-sc_source_ui_docshell_datastream.cxx (contents, props changed)
head/editors/libreoffice/files/patch-sfx2_source_control_emojiview.cxx (contents, props changed)
Modified:
head/editors/libreoffice/Makefile
head/editors/libreoffice/files/patch-configure
Modified: head/editors/libreoffice/Makefile
==============================================================================
--- head/editors/libreoffice/Makefile Wed Jan 10 22:39:26 2018 (r458698)
+++ head/editors/libreoffice/Makefile Wed Jan 10 22:40:07 2018 (r458699)
@@ -2,7 +2,7 @@
.include "${.CURDIR}/Makefile.common"
-PORTREVISION= 2
+PORTREVISION= 3
MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
http://dev-www.libreoffice.org/src/:src \
http://dev-www.libreoffice.org/extern/:ext
@@ -32,7 +32,7 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \
libboost_date_time.so:devel/boost-libs \
libicutu.so:devel/icu \
liblangtag.so:devel/liblangtag \
- liborcus-0.12.so:devel/liborcus \
+ liborcus-0.13.so:devel/liborcus \
libcurl.so:ftp/curl \
libcairo.so:graphics/cairo \
libgraphite2.so:graphics/graphite2 \
Modified: head/editors/libreoffice/files/patch-configure
==============================================================================
--- head/editors/libreoffice/files/patch-configure Wed Jan 10 22:39:26 2018 (r458698)
+++ head/editors/libreoffice/files/patch-configure Wed Jan 10 22:40:07 2018 (r458699)
@@ -1,6 +1,6 @@
---- configure.orig 2017-05-03 16:54:21 UTC
+--- configure.orig 2017-10-25 14:32:51 UTC
+++ configure
-@@ -5039,7 +5039,7 @@ fi
+@@ -5074,7 +5074,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PRODUCTNAME" >&5
$as_echo "$PRODUCTNAME" >&6; }
@@ -9,7 +9,57 @@
-@@ -32392,7 +32392,7 @@ fi
+@@ -30076,12 +30076,12 @@ if test -n "$ORCUS_CFLAGS"; then
+ pkg_cv_ORCUS_CFLAGS="$ORCUS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.12 >= 0.12.0\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "liborcus-0.12 >= 0.12.0") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.13 >= 0.13.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "liborcus-0.13 >= 0.13.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_ORCUS_CFLAGS=`$PKG_CONFIG --cflags "liborcus-0.12 >= 0.12.0" 2>/dev/null`
++ pkg_cv_ORCUS_CFLAGS=`$PKG_CONFIG --cflags "liborcus-0.13 >= 0.13.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -30093,12 +30093,12 @@ if test -n "$ORCUS_LIBS"; then
+ pkg_cv_ORCUS_LIBS="$ORCUS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.12 >= 0.12.0\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "liborcus-0.12 >= 0.12.0") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.13 >= 0.13.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "liborcus-0.13 >= 0.13.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_ORCUS_LIBS=`$PKG_CONFIG --libs "liborcus-0.12 >= 0.12.0" 2>/dev/null`
++ pkg_cv_ORCUS_LIBS=`$PKG_CONFIG --libs "liborcus-0.13 >= 0.13.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -30119,14 +30119,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- ORCUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liborcus-0.12 >= 0.12.0" 2>&1`
++ ORCUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liborcus-0.13 >= 0.13.0" 2>&1`
+ else
+- ORCUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liborcus-0.12 >= 0.12.0" 2>&1`
++ ORCUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liborcus-0.13 >= 0.13.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$ORCUS_PKG_ERRORS" >&5
+
+- as_fn_error $? "Package requirements (liborcus-0.12 >= 0.12.0) were not met:
++ as_fn_error $? "Package requirements (liborcus-0.13 >= 0.13.0) were not met:
+
+ $ORCUS_PKG_ERRORS
+
+@@ -32542,7 +32542,7 @@ fi
Added: head/editors/libreoffice/files/patch-sc_source_filter_inc_orcusinterface.hxx
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/libreoffice/files/patch-sc_source_filter_inc_orcusinterface.hxx Wed Jan 10 22:40:07 2018 (r458699)
@@ -0,0 +1,40 @@
+--- sc/source/filter/inc/orcusinterface.hxx.orig 2017-10-25 14:25:39 UTC
++++ sc/source/filter/inc/orcusinterface.hxx
+@@ -183,7 +183,8 @@ class ScOrcusSheetProperties : public orcus::spreadshe
+
+ virtual void set_row_hidden(orcus::spreadsheet::row_t row, bool hidden) override;
+
+- virtual void set_merge_cell_range(const char* p_range, size_t n_range) override;
++
++ virtual void set_merge_cell_range(const orcus::spreadsheet::range_t& range) override;
+ };
+
+ class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet
+@@ -243,6 +244,8 @@ class ScOrcusSheet : public orcus::spreadsheet::iface:
+ orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar,
+ const char* p, size_t n, const char* p_range, size_t n_range) override;
+
++ virtual orcus::spreadsheet::range_size_t get_sheet_size() const override;
++
+ SCTAB getIndex() const { return mnTab; }
+ };
+
+@@ -418,7 +421,7 @@ class ScOrcusStyles : public orcus::spreadsheet::iface
+ // border
+
+ virtual void set_border_count(size_t n) override;
+- virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, const char* s, size_t n) override;
++
+ virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, orcus::spreadsheet::border_style_t style) override;
+ virtual void set_border_color(orcus::spreadsheet::border_direction_t dir,
+ orcus::spreadsheet::color_elem_t alpha,
+@@ -508,7 +511,8 @@ class ScOrcusFactory : public orcus::spreadsheet::ifac
+ public:
+ ScOrcusFactory(ScDocument& rDoc);
+
+- virtual orcus::spreadsheet::iface::import_sheet* append_sheet(const char *sheet_name, size_t sheet_name_length) override;
++ virtual orcus::spreadsheet::iface::import_sheet* append_sheet(
++ orcus::spreadsheet::sheet_t sheet_index, const char *sheet_name, size_t sheet_name_length) override;
+ virtual orcus::spreadsheet::iface::import_sheet* get_sheet(const char *sheet_name, size_t sheet_name_length) override;
+ virtual orcus::spreadsheet::iface::import_sheet* get_sheet(orcus::spreadsheet::sheet_t sheet_index) override;
+ virtual orcus::spreadsheet::iface::import_global_settings* get_global_settings() override;
Added: head/editors/libreoffice/files/patch-sc_source_filter_orcus_interface.cxx
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/libreoffice/files/patch-sc_source_filter_orcus_interface.cxx Wed Jan 10 22:40:07 2018 (r458699)
@@ -0,0 +1,59 @@
+--- sc/source/filter/orcus/interface.cxx.orig 2017-10-25 14:25:39 UTC
++++ sc/source/filter/orcus/interface.cxx
+@@ -84,7 +84,8 @@ ScOrcusFactory::ScOrcusFactory(ScDocument& rDoc) :
+ maStyles(rDoc),
+ mnProgress(0) {}
+
+-orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::append_sheet(const char* sheet_name, size_t sheet_name_length)
++orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::append_sheet(
++ orcus::spreadsheet::sheet_t /*sheet_index*/, const char* sheet_name, size_t sheet_name_length)
+ {
+ OUString aTabName(sheet_name, sheet_name_length, RTL_TEXTENCODING_UTF8);
+ if (!maDoc.appendSheet(aTabName))
+@@ -296,7 +297,7 @@ void ScOrcusSheetProperties::set_row_hidden(os::row_t
+ mrDoc.getDoc().SetRowHidden(row, row, mnTab, hidden);
+ }
+
+-void ScOrcusSheetProperties::set_merge_cell_range(const char* /*p_range*/, size_t /*n_range*/)
++void ScOrcusSheetProperties::set_merge_cell_range(const orcus::spreadsheet::range_t& /*range*/)
+ {
+ }
+
+@@ -576,6 +577,9 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrc
+ case orcus::spreadsheet::formula_grammar_t::gnumeric:
+ eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_A1;
+ break;
++ case orcus::spreadsheet::formula_grammar_t::xls_xml:
++ eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1;
++ break;
+ case orcus::spreadsheet::formula_grammar_t::unknown:
+ break;
+ }
+@@ -693,6 +697,15 @@ void ScOrcusSheet::set_array_formula(
+ {
+ }
+
++orcus::spreadsheet::range_size_t ScOrcusSheet::get_sheet_size() const
++{
++ orcus::spreadsheet::range_size_t ret;
++ ret.rows = MAXROWCOUNT;
++ ret.columns = MAXCOLCOUNT;
++
++ return ret;
++}
++
+ ScOrcusSharedStrings::ScOrcusSharedStrings(ScOrcusFactory& rFactory) :
+ mrFactory(rFactory) {}
+
+@@ -1281,11 +1294,6 @@ size_t ScOrcusStyles::commit_fill()
+ void ScOrcusStyles::set_border_count(size_t /*n*/)
+ {
+ // needed at all?
+-}
+-
+-void ScOrcusStyles::set_border_style(orcus::spreadsheet::border_direction_t /*dir*/, const char* /*s*/, size_t /*n*/)
+-{
+- // implement later
+ }
+
+ void ScOrcusStyles::set_border_style(
Added: head/editors/libreoffice/files/patch-sc_source_ui_docshell_datastream.cxx
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/libreoffice/files/patch-sc_source_ui_docshell_datastream.cxx Wed Jan 10 22:40:07 2018 (r458699)
@@ -0,0 +1,11 @@
+--- sc/source/ui/docshell/datastream.cxx.orig 2017-10-25 14:25:39 UTC
++++ sc/source/ui/docshell/datastream.cxx
+@@ -84,7 +84,7 @@ class CSVHandler (public)
+ static void begin_row() {}
+ static void end_row() {}
+
+- void cell(const char* p, size_t n)
++ void cell(const char* p, size_t n, bool /*transient*/)
+ {
+ if (mnCols >= mnColCount)
+ return;
Added: head/editors/libreoffice/files/patch-sfx2_source_control_emojiview.cxx
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/libreoffice/files/patch-sfx2_source_control_emojiview.cxx Wed Jan 10 22:40:07 2018 (r458699)
@@ -0,0 +1,26 @@
+--- sfx2/source/control/emojiview.cxx.orig 2017-10-25 14:25:39 UTC
++++ sfx2/source/control/emojiview.cxx
+@@ -104,12 +104,12 @@ void EmojiView::Populate()
+ }
+
+ // TODO::populate view using the orcus json parser
+- using node = orcus::json_document_tree::node;
++ using node = orcus::json::node;
+
+ // default json config
+ orcus::json_config config;
+
+- orcus::json_document_tree aEmojiInfo;
++ orcus::json::document_tree aEmojiInfo;
+
+ // Load JSON string into a document tree.
+ aEmojiInfo.load(msJSONData, config);
+@@ -122,7 +122,7 @@ void EmojiView::Populate()
+ orcus::pstring key = *it;
+ node value = root.child(key);
+
+- if(value.type() == orcus::json_node_t::object)
++ if(value.type() == orcus::json::node_t::object)
+ {
+ // iterate each element to get the keys
+ std::vector<orcus::pstring> aEmojiParams = value.keys();
More information about the svn-ports-head
mailing list