Date: Tue, 7 Feb 2017 19:42:00 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433584 - in head/editors/libreoffice: . files Message-ID: <201702071942.v17Jg0Zb037773@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Tue Feb 7 19:42:00 2017 New Revision: 433584 URL: https://svnweb.freebsd.org/changeset/ports/433584 Log: - Catch up with liborcus 0.12.1. - Make option GNOME imply GTK2 again. 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) Modified: head/editors/libreoffice/Makefile head/editors/libreoffice/Makefile.common head/editors/libreoffice/files/patch-configure Modified: head/editors/libreoffice/Makefile ============================================================================== --- head/editors/libreoffice/Makefile Tue Feb 7 19:39:31 2017 (r433583) +++ head/editors/libreoffice/Makefile Tue Feb 7 19:42:00 2017 (r433584) @@ -2,6 +2,7 @@ .include "${.CURDIR}/Makefile.common" +PORTREVISION= 1 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 +33,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.11.so:devel/liborcus \ + liborcus-0.12.so:devel/liborcus \ libcurl.so:ftp/curl \ libcairo.so:graphics/cairo \ libgraphite2.so:graphics/graphite2 \ @@ -116,7 +117,7 @@ CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS= libcups.so:print/cups GNOME_CONFIGURE_ENABLE= dbus dconf -GNOME_IMPLIES= GTK3 +GNOME_IMPLIES= GTK2 GNOME_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib GNOME_USE= GNOME=dconf Modified: head/editors/libreoffice/Makefile.common ============================================================================== --- head/editors/libreoffice/Makefile.common Tue Feb 7 19:39:31 2017 (r433583) +++ head/editors/libreoffice/Makefile.common Tue Feb 7 19:42:00 2017 (r433584) @@ -2,7 +2,6 @@ PORTNAME= libreoffice PORTVERSION= 5.2.5 -PORTREVISION= 0 CATEGORIES+= editors MAINTAINER= office@FreeBSD.org Modified: head/editors/libreoffice/files/patch-configure ============================================================================== --- head/editors/libreoffice/files/patch-configure Tue Feb 7 19:39:31 2017 (r433583) +++ head/editors/libreoffice/files/patch-configure Tue Feb 7 19:42:00 2017 (r433584) @@ -1,6 +1,56 @@ ---- configure.orig 2016-10-28 14:59:52 UTC +--- configure.orig 2017-01-12 01:09:22 UTC +++ configure -@@ -31912,7 +31912,7 @@ fi +@@ -29353,12 +29353,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.11 >= 0.11.2\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "liborcus-0.11 >= 0.11.2") 2>&5 ++ { { $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 + 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.11 >= 0.11.2" 2>/dev/null` ++ pkg_cv_ORCUS_CFLAGS=`$PKG_CONFIG --cflags "liborcus-0.12 >= 0.12.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -29370,12 +29370,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.11 >= 0.11.2\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "liborcus-0.11 >= 0.11.2") 2>&5 ++ { { $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 + 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.11 >= 0.11.2" 2>/dev/null` ++ pkg_cv_ORCUS_LIBS=`$PKG_CONFIG --libs "liborcus-0.12 >= 0.12.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -29396,14 +29396,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.11 >= 0.11.2" 2>&1` ++ ORCUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liborcus-0.12 >= 0.12.0" 2>&1` + else +- ORCUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liborcus-0.11 >= 0.11.2" 2>&1` ++ ORCUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liborcus-0.12 >= 0.12.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.11 >= 0.11.2) were not met: ++ as_fn_error $? "Package requirements (liborcus-0.12 >= 0.12.0) were not met: + + $ORCUS_PKG_ERRORS + +@@ -31927,7 +31927,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 Tue Feb 7 19:42:00 2017 (r433584) @@ -0,0 +1,39 @@ +--- sc/source/filter/inc/orcusinterface.hxx.orig 2017-01-12 00:54:33 UTC ++++ sc/source/filter/inc/orcusinterface.hxx +@@ -357,10 +357,21 @@ 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, + 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 +@@ -381,11 +392,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, double val, orcus::length_unit_t unit) 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 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 Tue Feb 7 19:42:00 2017 (r433584) @@ -0,0 +1,84 @@ +--- sc/source/filter/orcus/interface.cxx.orig 2017-01-12 00:54:33 UTC ++++ sc/source/filter/orcus/interface.cxx +@@ -961,6 +961,29 @@ void ScOrcusStyles::set_font_underline(o + } + } + ++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, +@@ -969,6 +992,22 @@ void ScOrcusStyles::set_font_color(orcus + 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"); +@@ -1035,6 +1074,11 @@ void ScOrcusStyles::set_border_color(orc + current_line.maColor = Color(alpha, red, green, blue); + } + ++void ScOrcusStyles::set_border_width(orcus::spreadsheet::border_direction_t /* dir */, double /* val */, orcus::length_unit_t /* unit */) ++{ ++ ++} ++ + size_t ScOrcusStyles::commit_border() + { + SAL_INFO("sc.orcus.style", "commit border"); +@@ -1054,6 +1098,16 @@ void ScOrcusStyles::set_cell_locked(bool + 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");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702071942.v17Jg0Zb037773>