Attachment #190866 for bug #224288





.include "${.CURDIR}/Makefile.common"

PORTREVISION=	4
MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
		http://dev-www.libreoffice.org/src/:src \
		http://dev-www.libreoffice.org/extern/:ext

		libicutu.so:devel/icu \
		liblangtag.so:devel/liblangtag \
		liborcus-0.13.so:devel/liborcus \
		libcppunit.so:devel/cppunit \
		libcurl.so:ftp/curl \
		libcairo.so:graphics/cairo \
		libgraphite2.so:graphics/graphite2 \

		libexttextcat-2.0.so:textproc/libexttextcat \
		libmwaw-0.3.so:textproc/libmwaw03 \
		libodfgen-0.1.so:textproc/libodfgen01 \
		libepubgen-0.1.so:textproc/libepubgen \
		librevenge-0.0.so:textproc/librevenge \
		libstaroffice-0.0.so:textproc/libstaroffice \
		libvisio-0.1.so:textproc/libvisio01 \
		libwpd-0.10.so:textproc/libwpd010 \
		libwps-0.4.so:textproc/libwps \
		libxml2.so:textproc/libxml2 \
		libxmlsec1-nss.so:security/xmlsec1 \
		libxslt.so:textproc/libxslt \
		libmythes-1.2.so:textproc/mythes \
		libqxp-0.0.so:textproc/libqxp \
		librdf.so:textproc/redland \
		libserf-1.so:www/serf
RUN_DEPENDS=	xdg-open:devel/xdg-utils \

		${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:x11-fonts/liberation-fonts-ttf \
		${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g

DISTFILES+=	4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src
#		pdfium-3312.tar.bz2:src
		cppunit-1.13.2.tar.gz:src

NOT_FOR_ARCHS=		aarch64 armv6 armv7
NOT_FOR_ARCHS_REASON=	Unsupported host_cpu


CONFLICTS_INSTALL=	libreoffice4-4.*

INSTALL_TARGET=	distro-pack-install
WRKSRC=		${WRKDIR}/${PORTNAME}-${LOVERSION}

SHEBANG_GLOB=	*.py

GNU_CONFIGURE=	yes
USE_GL=		gl glew glu
USE_OPENLDAP=	yes

USE_QT4=	# empty but required
USE_XORG=	xaw xrandr
USES=		autoreconf:build bison compiler:c++11-lib cpe gmake jpeg \
		perl5 pkgconfig python shebangfix shared-mime-info tar:xz

OPTIONS_DEFINE=	CUPS GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK SYSTRAY \
		TEST WEBDAV
OPTIONS_DEFAULT=	CUPS GTK3 MMEDIA

GTK2_DESC=	GTK+ 2 GUI toolkit support
GTK3_DESC=	GTK+ 3 GUI toolkit support
JAVA_DESC=	Add Java support (XML filters, macros, DB connections)
MMEDIA_DESC=	Enable multimedia backend for Impress
PGSQL_DESC=	Build with PostgreSQL-SDBC driver
SDK_DESC=	Build with SDK
SYSTRAY_DESC=	Enable systemtray quickstarter
TEST_DESC=	Run all regression tests
WEBDAV_DESC=	Enable WebDAV protocol

CUPS_CONFIGURE_ENABLE=	cups
CUPS_LIB_DEPENDS=	libcups.so:print/cups

GNOME_CONFIGURE_ENABLE=	dbus dconf
GNOME_IMPLIES=	GTK3
GNOME_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
GNOME_USE=	GNOME=dconf


		--disable-mergelibs \
		--disable-online-update \
		--enable-cairo-canvas \
		--enable-graphite \
		--enable-python=system \
		--enable-release-build \
		--disable-pdfium \
		--exec-prefix=${PREFIX} \
		--with-alloc=system \
		--with-boost=${LOCALBASE} \

		--with-gnu-patch=${LOCALBASE}/bin/gpatch \
		--with-os-version=${OSVERSION} \
		--with-parallelism=${MAKE_JOBS_NUMBER} \
		--with-system-cppunit \
		--with-system-curl \
		--with-system-dicts \
		--with-system-libs \

		--with-system-zlib \
		--with-vendor="FreeBSD ports" \
		--without-fonts \
		--without-myspell-dicts
		--without-system-cppunit

CONFIGURE_ENV=	DMAKE=${LOCALBASE}/bin/dmake \
		GNUTAR="${TAR}" \

	    -exec ${ECHO_CMD} "@dir {}" \; >> ${TMPPLIST}
	@cd ${STAGEDIR}${PREFIX} && \
	${FIND} -s bin lib man -not -type d >> ${TMPPLIST}
.for subdir in appdata application-registry applications bash-completion icons mime mime-info
	@cd ${STAGEDIR}${PREFIX} && \
	${FIND} -s share/${subdir} -not -type d >> ${TMPPLIST}
.endfor

Lines 1-7 Link Here

(-)i/editors/libreoffice/Makefile.common (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= libreoffice	3	PORTNAME= libreoffice
4	PORTVERSION= 5.3.7	4	PORTVERSION= 6.0.1
5	CATEGORIES+= editors	5	CATEGORIES+= editors
6		6
7	MAINTAINER= office@FreeBSD.org	7	MAINTAINER= office@FreeBSD.org
Lines 10-13 LICENSE= LGPL3+ MPL20 Link Here
10	LICENSE_COMB= dual	10	LICENSE_COMB= dual
11		11
12	LOVERSION= ${PORTVERSION}.${RCVER}	12	LOVERSION= ${PORTVERSION}.${RCVER}
13	RCVER= 2	13	RCVER= 1




TIMESTAMP = 1519232542
SHA256 (libreoffice/libreoffice-6.0.1.1.tar.xz) = 8f802a9c6ed645218a07b34530113f357b694f2653d734fe8a9003068b5670a9
SIZE (libreoffice/libreoffice-6.0.1.1.tar.xz) = 203420780
SHA256 (libreoffice/libreoffice-help-6.0.1.1.tar.xz) = 4466ffc014f5dd3bc7b2676c18e25687c95b00f0379b61c8db988091a4a5d647
SIZE (libreoffice/libreoffice-help-6.0.1.1.tar.xz) = 2972872
SHA256 (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb
SIZE (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 555291
SHA256 (libreoffice/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz) = 41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f
SIZE (libreoffice/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz) = 1794694
SHA256 (libreoffice/cppunit-1.13.2.tar.gz) = 3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f
SIZE (libreoffice/cppunit-1.13.2.tar.gz) = 953596
SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
SIZE (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = 3519470
SHA256 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b




 
 # create bash completion
-mkdir -p $DESTDIR/usr/share/bash-completion/completions
-"${SRCDIR?}"/bin/generate-bash-completion.py bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh
-test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
+mkdir -p $DESTDIR/${PREFIXDIR}/share/bash-completion/completions
+"${SRCDIR?}"/bin/generate-bash-completion.py bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh
+test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
 if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then
-    "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh
-    test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
+    "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/ooffice.sh
+    test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
 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
 
 




--- libreofficekit/source/gtk/lokdocview.cxx.orig	2018-01-31 18:56:05.312032000 +0300
+++ libreofficekit/source/gtk/lokdocview.cxx	2018-01-31 18:56:30.075522000 +0300
@@ -3218,6 +3218,7 @@
                      G_TYPE_STRING);
 
     /**
+     * LOKDocView::ruler:
      * The key ruler related properties on change are reported by this.
      *
      * The payload format is:
@@ -3244,6 +3245,7 @@
                      G_TYPE_STRING);
 
     /**
+     * LOKDocView::invalidate-header:
      * The column/row header is no more valid because of a column/row insertion
      * or a similar event. Clients must query a new column/row header set.
      *




--- sal/osl/unx/system.cxx.orig	2016-10-28 14:50:26 UTC
+++ sal/osl/unx/system.cxx
@@ -247,6 +247,9 @@ int macxp_resolveAlias(char *path, int b
 #endif /* NO_PTHREAD_RTL */
 
 #if defined(FREEBSD)
+
+#include <cmath>
+
 char *fcvt(double value, int ndigit, int *decpt, int *sign)
 {
   static char ret[256];




--- sal/osl/unx/thread.cxx.orig	2017-12-12 17:31:34.756103000 +0300
+++ sal/osl/unx/thread.cxx	2017-12-12 17:33:13.924729000 +0300
@@ -45,6 +45,10 @@
 #include <sys/syscall.h>
 #endif
 
+#ifdef __FreeBSD_kernel__
+#include <pthread_np.h>
+#endif
+
 /****************************************************************************
  * @@@ TODO @@@
  *
@@ -545,7 +549,7 @@
     if ( 0 != err )
         SAL_WARN("sal.osl", "pthread_setname_np failed with errno " << err);
 #elif defined __FreeBSD_kernel__
-    pthread_setname_np( pthread_self(), name );
+    pthread_set_name_np( pthread_self(), name );
 #elif defined MACOSX || defined IOS
     pthread_setname_np( name );
 #else




--- 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;




--- 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(

Removed Link Here

(-)c/editors/libreoffice/files/patch-sc_source_ui_docshell_datastream.cxx (-11 lines)
1	--- sc/source/ui/docshell/datastream.cxx.orig 2017-10-25 14:25:39 UTC
2	+++ sc/source/ui/docshell/datastream.cxx
3	@@ -84,7 +84,7 @@ class CSVHandler (public)
4	static void begin_row() {}
5	static void end_row() {}
6
7	- void cell(const char* p, size_t n)
8	+ void cell(const char* p, size_t n, bool /transient/)
9	{
10	if (mnCols >= mnColCount)
11	return;




--- 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();




--- shell/source/unix/exec/shellexec.cxx.orig	2017-12-08 02:26:19.000000000 +0300
+++ shell/source/unix/exec/shellexec.cxx	2017-12-12 15:51:21.551684000 +0300
@@ -145,7 +145,7 @@
         aBuffer.append("open --");
 #else
         // Just use xdg-open on non-Mac
-        aBuffer.append("/usr/bin/xdg-open");
+        aBuffer.append("%%LOCALBASE%%/bin/xdg-open");
         }
 #endif
         aBuffer.append(" ");
         escapeForShell(aBuffer, OUStringToOString(aURL, osl_getThreadTextEncoding()));




--- vcl/CppunitTest_vcl_wmf_test.mk.orig	2017-05-03 16:46:29 UTC
+++ vcl/CppunitTest_vcl_wmf_test.mk
@@ -131,10 +131,9 @@ $(eval $(call gb_CppunitTest_use_externals,vcl_wmf_tes
 ))
 endif
 else
-ifeq ($(OS),LINUX)
+ifeq ($(OS), $(filter LINUX %BSD, $(OS)))
 $(eval $(call gb_CppunitTest_add_libs,vcl_wmf_test,\
-    -lm \
-    -ldl \
+    -lm $(DLOPEN_LIBS) \
     -lpthread \
     -lGL \
     -lX11 \

Lines 11-19 Link Here

(-)i/editors/libreoffice/files/patch-vcl_Executable__visualbackendtest.mk (-2 lines)
11	- -ldl \	11	- -ldl \
12	+ -lm $(DLOPEN_LIBS) \	12	+ -lm $(DLOPEN_LIBS) \
13	-lpthread \	13	-lpthread \
14	- -lGL \
15	- -lX11 \	14	- -lX11 \
16	+ -lGL \
17	+ -lX11 \	15	+ -lX11 \
18	))	16	))
19		17




--- vcl/Library_vcl.mk.orig	2017-05-03 16:46:29 UTC
+++ vcl/Library_vcl.mk
@@ -643,13 +643,12 @@ else
     vcl/source/opengl/OpenGLHelper \
     vcl/source/window/openglwin \
  ))
-ifeq ($(OS),LINUX)
+ifeq ($(OS), $(filter LINUX %BSD, $(OS)))
 $(eval $(call gb_Library_add_libs,vcl,\
-	-lm \
-	-ldl \
+	-lm $(DLOPEN_LIBS) \
 	-lpthread \
-    -lGL \
-    -lX11 \
+	-lGL \
+	-lX11 \
 ))
 endif
 endif




--- vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx.orig	2017-01-12 00:54:33 UTC
+++ vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -436,10 +436,13 @@ dialog_remove_buttons( GtkDialog *pDialo
 {
     g_return_if_fail( GTK_IS_DIALOG( pDialog ) );
 
-#if GTK_CHECK_VERSION(3,0,0)
 #if GTK_CHECK_VERSION(3,12,0)
-    dialog_remove_buttons(gtk_dialog_get_header_bar(pDialog));
+    GtkWidget *pHeaderBar = gtk_dialog_get_header_bar( pDialog );
+    if( pHeaderBar != nullptr )
+        dialog_remove_buttons( pHeaderBar );
+    else
 #endif
+#if GTK_CHECK_VERSION(2,14,0)
     dialog_remove_buttons(gtk_dialog_get_action_area(pDialog));
 #else
     dialog_remove_buttons(pDialog->action_area);

Return to bug 224288

Lines 2-8 Link Here

(-)i/editors/libreoffice/Makefile (-16 / +21 lines)
2		2
3	.include "${.CURDIR}/Makefile.common"	3	.include "${.CURDIR}/Makefile.common"
4		4
5	PORTREVISION= 4
6	MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \	5	MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
7	http://dev-www.libreoffice.org/src/:src \	6	http://dev-www.libreoffice.org/src/:src \
8	http://dev-www.libreoffice.org/extern/:ext	7	http://dev-www.libreoffice.org/extern/:ext
Lines 33-38 LIB_DEPENDS= libapr-1.so:devel/apr1 \ Link Here
33	libicutu.so:devel/icu \	32	libicutu.so:devel/icu \
34	liblangtag.so:devel/liblangtag \	33	liblangtag.so:devel/liblangtag \
35	liborcus-0.13.so:devel/liborcus \	34	liborcus-0.13.so:devel/liborcus \
		35	libcppunit.so:devel/cppunit \
36	libcurl.so:ftp/curl \	36	libcurl.so:ftp/curl \
37	libcairo.so:graphics/cairo \	37	libcairo.so:graphics/cairo \
38	libgraphite2.so:graphics/graphite2 \	38	libgraphite2.so:graphics/graphite2 \
Lines 63-76 LIB_DEPENDS= libapr-1.so:devel/apr1 \ Link Here
63	libexttextcat-2.0.so:textproc/libexttextcat \	63	libexttextcat-2.0.so:textproc/libexttextcat \
64	libmwaw-0.3.so:textproc/libmwaw03 \	64	libmwaw-0.3.so:textproc/libmwaw03 \
65	libodfgen-0.1.so:textproc/libodfgen01 \	65	libodfgen-0.1.so:textproc/libodfgen01 \
		66	libepubgen-0.1.so:textproc/libepubgen \
66	librevenge-0.0.so:textproc/librevenge \	67	librevenge-0.0.so:textproc/librevenge \
67	libstaroffice-0.0.so:textproc/libstaroffice \	68	libstaroffice-0.0.so:textproc/libstaroffice \
68	libvisio-0.1.so:textproc/libvisio01 \	69	libvisio-0.1.so:textproc/libvisio01 \
69	libwpd-0.10.so:textproc/libwpd010 \	70	libwpd-0.10.so:textproc/libwpd010 \
70	libwps-0.4.so:textproc/libwps \	71	libwps-0.4.so:textproc/libwps \
71	libxml2.so:textproc/libxml2 \	72	libxml2.so:textproc/libxml2 \
		73	libxmlsec1-nss.so:security/xmlsec1 \
72	libxslt.so:textproc/libxslt \	74	libxslt.so:textproc/libxslt \
73	libmythes-1.2.so:textproc/mythes \	75	libmythes-1.2.so:textproc/mythes \
		76	libqxp-0.0.so:textproc/libqxp \
74	librdf.so:textproc/redland \	77	librdf.so:textproc/redland \
75	libserf-1.so:www/serf	78	libserf-1.so:www/serf
76	RUN_DEPENDS= xdg-open:devel/xdg-utils \	79	RUN_DEPENDS= xdg-open:devel/xdg-utils \
Lines 82-90 RUN_DEPENDS= xdg-open:devel/xdg-utils \ Link Here
82	${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:x11-fonts/liberation-fonts-ttf \	85	${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:x11-fonts/liberation-fonts-ttf \
83	${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g	86	${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g
84		87
85	DISTFILES+= 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src \	88	DISTFILES+= 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src
86	86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz:src \	89	# pdfium-3312.tar.bz2:src
87	cppunit-1.13.2.tar.gz:src
88		90
89	NOT_FOR_ARCHS= aarch64 armv6 armv7	91	NOT_FOR_ARCHS= aarch64 armv6 armv7
90	NOT_FOR_ARCHS_REASON= Unsupported host_cpu	92	NOT_FOR_ARCHS_REASON= Unsupported host_cpu
Lines 95-103 MASTER_SITES+= http://dev-builds.libreoffice.org/pre-releases/src/ Link Here
95		97
96	CONFLICTS_INSTALL= libreoffice4-4.*	98	CONFLICTS_INSTALL= libreoffice4-4.*
97		99
98	INSTALL_TARGET= distro-pack-install-strip	100	INSTALL_TARGET= distro-pack-install
99	WRKSRC= ${WRKDIR}/${PORTNAME}-${LOVERSION}	101	WRKSRC= ${WRKDIR}/${PORTNAME}-${LOVERSION}
100		102
		103	SHEBANG_GLOB= *.py
		104
101	GNU_CONFIGURE= yes	105	GNU_CONFIGURE= yes
102	USE_GL= gl glew glu	106	USE_GL= gl glew glu
103	USE_OPENLDAP= yes	107	USE_OPENLDAP= yes
Lines 105-130 USE_PERL5= build Link Here
105	USE_QT4= # empty but required	109	USE_QT4= # empty but required
106	USE_XORG= xaw xrandr	110	USE_XORG= xaw xrandr
107	USES= autoreconf:build bison compiler:c++11-lib cpe gmake jpeg \	111	USES= autoreconf:build bison compiler:c++11-lib cpe gmake jpeg \
108	perl5 pkgconfig python shared-mime-info tar:xz	112	perl5 pkgconfig python shebangfix shared-mime-info tar:xz
109		113
110	OPTIONS_DEFINE= CUPS GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK SYSTRAY \	114	OPTIONS_DEFINE= CUPS GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK SYSTRAY \
111	TEST WEBDAV	115	TEST WEBDAV
112	OPTIONS_DEFAULT= CUPS GTK2 MMEDIA	116	OPTIONS_DEFAULT= CUPS GTK3 MMEDIA
113		117
114	GTK3_DESC= GTK+ 3 GUI toolkit support (experimental)	118	GTK2_DESC= GTK+ 2 GUI toolkit support
115	JAVA_DESC= Add Java support (XML filters, macros)	119	GTK3_DESC= GTK+ 3 GUI toolkit support
116	MMEDIA_DESC= Enable multimedia backend for impress	120	JAVA_DESC= Add Java support (XML filters, macros, DB connections)
		121	MMEDIA_DESC= Enable multimedia backend for Impress
117	PGSQL_DESC= Build with PostgreSQL-SDBC driver	122	PGSQL_DESC= Build with PostgreSQL-SDBC driver
118	SDK_DESC= Build with SDK	123	SDK_DESC= Build with SDK
119	SYSTRAY_DESC= Enable systemtray quickstarter	124	SYSTRAY_DESC= Enable systemtray quickstarter
120	TEST_DESC= Run all regression tests	125	TEST_DESC= Run all regression tests
121	WEBDAV_DESC= Enable webdav protocol	126	WEBDAV_DESC= Enable WebDAV protocol
122		127
123	CUPS_CONFIGURE_ENABLE= cups	128	CUPS_CONFIGURE_ENABLE= cups
124	CUPS_LIB_DEPENDS= libcups.so:print/cups	129	CUPS_LIB_DEPENDS= libcups.so:print/cups
125		130
126	GNOME_CONFIGURE_ENABLE= dbus dconf	131	GNOME_CONFIGURE_ENABLE= dbus dconf
127	GNOME_IMPLIES= GTK2	132	GNOME_IMPLIES= GTK3
128	GNOME_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib	133	GNOME_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib
129	GNOME_USE= GNOME=dconf	134	GNOME_USE= GNOME=dconf
130		135
Lines 227-235 CONFIGURE_ARGS= --disable-dependency-tracking \ Link Here
227	--disable-mergelibs \	232	--disable-mergelibs \
228	--disable-online-update \	233	--disable-online-update \
229	--enable-cairo-canvas \	234	--enable-cairo-canvas \
230	--enable-graphite \
231	--enable-python=system \	235	--enable-python=system \
232	--enable-release-build \	236	--enable-release-build \
		237	--disable-pdfium \
233	--exec-prefix=${PREFIX} \	238	--exec-prefix=${PREFIX} \
234	--with-alloc=system \	239	--with-alloc=system \
235	--with-boost=${LOCALBASE} \	240	--with-boost=${LOCALBASE} \
Lines 241-246 CONFIGURE_ARGS= --disable-dependency-tracking \ Link Here
241	--with-gnu-patch=${LOCALBASE}/bin/gpatch \	246	--with-gnu-patch=${LOCALBASE}/bin/gpatch \
242	--with-os-version=${OSVERSION} \	247	--with-os-version=${OSVERSION} \
243	--with-parallelism=${MAKE_JOBS_NUMBER} \	248	--with-parallelism=${MAKE_JOBS_NUMBER} \
		249	--with-system-cppunit \
244	--with-system-curl \	250	--with-system-curl \
245	--with-system-dicts \	251	--with-system-dicts \
246	--with-system-libs \	252	--with-system-libs \
Lines 250-257 CONFIGURE_ARGS= --disable-dependency-tracking \ Link Here
250	--with-system-zlib \	256	--with-system-zlib \
251	--with-vendor="FreeBSD ports" \	257	--with-vendor="FreeBSD ports" \
252	--without-fonts \	258	--without-fonts \
253	--without-myspell-dicts \	259	--without-myspell-dicts
254	--without-system-cppunit
255		260
256	CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dmake \	261	CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dmake \
257	GNUTAR="${TAR}" \	262	GNUTAR="${TAR}" \
Lines 311-317 post-install: Link Here
311	-exec ${ECHO_CMD} "@dir {}" \; >> ${TMPPLIST}	316	-exec ${ECHO_CMD} "@dir {}" \; >> ${TMPPLIST}
312	@cd ${STAGEDIR}${PREFIX} && \	317	@cd ${STAGEDIR}${PREFIX} && \
313	${FIND} -s bin lib man -not -type d >> ${TMPPLIST}	318	${FIND} -s bin lib man -not -type d >> ${TMPPLIST}
314	.for subdir in appdata application-registry applications bash-completion icons mime mime-info mimelnk	319	.for subdir in appdata application-registry applications bash-completion icons mime mime-info
315	@cd ${STAGEDIR}${PREFIX} && \	320	@cd ${STAGEDIR}${PREFIX} && \
316	${FIND} -s share/${subdir} -not -type d >> ${TMPPLIST}	321	${FIND} -s share/${subdir} -not -type d >> ${TMPPLIST}
317	.endfor	322	.endfor

Lines 1-14 Link Here

(-)i/editors/libreoffice/distinfo (-9 / +5 lines)
1	TIMESTAMP = 1508961364	1	TIMESTAMP = 1519232542
2	SHA256 (libreoffice/libreoffice-5.3.7.2.tar.xz) = c3d7ceecdf4d97dfd2ed748c4479152a1c9b8c879587a63a4f403209aed6ee7c	2	SHA256 (libreoffice/libreoffice-6.0.1.1.tar.xz) = 8f802a9c6ed645218a07b34530113f357b694f2653d734fe8a9003068b5670a9
3	SIZE (libreoffice/libreoffice-5.3.7.2.tar.xz) = 189508568	3	SIZE (libreoffice/libreoffice-6.0.1.1.tar.xz) = 203420780
4	SHA256 (libreoffice/libreoffice-help-5.3.7.2.tar.xz) = f65e68322c50c52382093153ef0753852dde97962e63c1426256a05ce007ae2c	4	SHA256 (libreoffice/libreoffice-help-6.0.1.1.tar.xz) = 4466ffc014f5dd3bc7b2676c18e25687c95b00f0379b61c8db988091a4a5d647
5	SIZE (libreoffice/libreoffice-help-5.3.7.2.tar.xz) = 2124656	5	SIZE (libreoffice/libreoffice-help-6.0.1.1.tar.xz) = 2972872
6	SHA256 (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb	6	SHA256 (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb
7	SIZE (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 555291	7	SIZE (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 555291
8	SHA256 (libreoffice/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz) = 41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f
9	SIZE (libreoffice/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz) = 1794694
10	SHA256 (libreoffice/cppunit-1.13.2.tar.gz) = 3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f
11	SIZE (libreoffice/cppunit-1.13.2.tar.gz) = 953596
12	SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370	8	SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
13	SIZE (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = 3519470	9	SIZE (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = 3519470
14	SHA256 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b	10	SHA256 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b

Lines 48-62 Link Here

(-)i/editors/libreoffice/files/patch-bin_distro-install-desktop-integration (-4 / +4 lines)
48		48
49	# create bash completion	49	# create bash completion
50	-mkdir -p $DESTDIR/usr/share/bash-completion/completions	50	-mkdir -p $DESTDIR/usr/share/bash-completion/completions
51	-"${SRCDIR?}"/bin/generate-bash-completion bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh	51	-"${SRCDIR?}"/bin/generate-bash-completion.py bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh
52	-test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand	52	-test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
53	+mkdir -p $DESTDIR/${PREFIXDIR}/share/bash-completion/completions	53	+mkdir -p $DESTDIR/${PREFIXDIR}/share/bash-completion/completions
54	+"${SRCDIR?}"/bin/generate-bash-completion bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh	54	+"${SRCDIR?}"/bin/generate-bash-completion.py bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh
55	+test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand	55	+test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
56	if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then	56	if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then
57	- "${SRCDIR?}"/bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh	57	- "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh
58	- test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand	58	- test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
59	+ "${SRCDIR?}"/bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/ooffice.sh	59	+ "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/ooffice.sh
60	+ test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand	60	+ test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
61	fi	61	fi
62		62

Lines 9-64 Link Here

(-)i/editors/libreoffice/files/patch-configure (-50 lines)
9		9
10		10
11		11
12	@@ -30076,12 +30076,12 @@ if test -n "$ORCUS_CFLAGS"; then
13	pkg_cv_ORCUS_CFLAGS="$ORCUS_CFLAGS"
14	elif test -n "$PKG_CONFIG"; then
15	if test -n "$PKG_CONFIG" && \
16	- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.12 >= 0.12.0\""; } >&5
17	- ($PKG_CONFIG --exists --print-errors "liborcus-0.12 >= 0.12.0") 2>&5
18	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.13 >= 0.13.0\""; } >&5
19	+ ($PKG_CONFIG --exists --print-errors "liborcus-0.13 >= 0.13.0") 2>&5
20	ac_status=$?
21	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
22	test $ac_status = 0; }; then
23	- pkg_cv_ORCUS_CFLAGS=`$PKG_CONFIG --cflags "liborcus-0.12 >= 0.12.0" 2>/dev/null`
24	+ pkg_cv_ORCUS_CFLAGS=`$PKG_CONFIG --cflags "liborcus-0.13 >= 0.13.0" 2>/dev/null`
25	test "x$?" != "x0" && pkg_failed=yes
26	else
27	pkg_failed=yes
28	@@ -30093,12 +30093,12 @@ if test -n "$ORCUS_LIBS"; then
29	pkg_cv_ORCUS_LIBS="$ORCUS_LIBS"
30	elif test -n "$PKG_CONFIG"; then
31	if test -n "$PKG_CONFIG" && \
32	- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.12 >= 0.12.0\""; } >&5
33	- ($PKG_CONFIG --exists --print-errors "liborcus-0.12 >= 0.12.0") 2>&5
34	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.13 >= 0.13.0\""; } >&5
35	+ ($PKG_CONFIG --exists --print-errors "liborcus-0.13 >= 0.13.0") 2>&5
36	ac_status=$?
37	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
38	test $ac_status = 0; }; then
39	- pkg_cv_ORCUS_LIBS=`$PKG_CONFIG --libs "liborcus-0.12 >= 0.12.0" 2>/dev/null`
40	+ pkg_cv_ORCUS_LIBS=`$PKG_CONFIG --libs "liborcus-0.13 >= 0.13.0" 2>/dev/null`
41	test "x$?" != "x0" && pkg_failed=yes
42	else
43	pkg_failed=yes
44	@@ -30119,14 +30119,14 @@ else
45	_pkg_short_errors_supported=no
46	fi
47	if test $_pkg_short_errors_supported = yes; then
48	- ORCUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liborcus-0.12 >= 0.12.0" 2>&1`
49	+ ORCUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liborcus-0.13 >= 0.13.0" 2>&1`
50	else
51	- ORCUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liborcus-0.12 >= 0.12.0" 2>&1`
52	+ ORCUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liborcus-0.13 >= 0.13.0" 2>&1`
53	fi
54	# Put the nasty error message in config.log where it belongs
55	echo "$ORCUS_PKG_ERRORS" >&5
56
57	- as_fn_error $? "Package requirements (liborcus-0.12 >= 0.12.0) were not met:
58	+ as_fn_error $? "Package requirements (liborcus-0.13 >= 0.13.0) were not met:
59
60	$ORCUS_PKG_ERRORS
61
62	@@ -32542,7 +32542,7 @@ fi	12	@@ -32542,7 +32542,7 @@ fi
63		13
64		14

Added Link Here

(-)i/editors/libreoffice/files/patch-libreofficekit_source_gtk_lokdocview.cxx (+18 lines)
1	--- libreofficekit/source/gtk/lokdocview.cxx.orig 2018-01-31 18:56:05.312032000 +0300
2	+++ libreofficekit/source/gtk/lokdocview.cxx 2018-01-31 18:56:30.075522000 +0300
3	@@ -3218,6 +3218,7 @@
4	G_TYPE_STRING);
5
6	/**
7	+ * LOKDocView::ruler:
8	* The key ruler related properties on change are reported by this.
9	*
10	* The payload format is:
11	@@ -3244,6 +3245,7 @@
12	G_TYPE_STRING);
13
14	/**
15	+ * LOKDocView::invalidate-header:
16	* The column/row header is no more valid because of a column/row insertion
17	* or a similar event. Clients must query a new column/row header set.
18	*

Removed Link Here

(-)c/editors/libreoffice/files/patch-sal_osl_unx_system.cxx (-12 lines)
1	--- sal/osl/unx/system.cxx.orig 2016-10-28 14:50:26 UTC
2	+++ sal/osl/unx/system.cxx
3	@@ -247,6 +247,9 @@ int macxp_resolveAlias(char *path, int b
4	#endif /* NO_PTHREAD_RTL */
5
6	#if defined(FREEBSD)
7	+
8	+#include <cmath>
9	+
10	char fcvt(double value, int ndigit, int decpt, int *sign)
11	{
12	static char ret[256];

Added Link Here

(-)i/editors/libreoffice/files/patch-sal_osl_unx_thread.cxx (+22 lines)
1	--- sal/osl/unx/thread.cxx.orig 2017-12-12 17:31:34.756103000 +0300
2	+++ sal/osl/unx/thread.cxx 2017-12-12 17:33:13.924729000 +0300
3	@@ -45,6 +45,10 @@
4	#include <sys/syscall.h>
5	#endif
6
7	+#ifdef __FreeBSD_kernel__
8	+#include <pthread_np.h>
9	+#endif
10	+
11	/****************************************************************************
12	* @@@ TODO @@@
13	*
14	@@ -545,7 +549,7 @@
15	if ( 0 != err )
16	SAL_WARN("sal.osl", "pthread_setname_np failed with errno " << err);
17	#elif defined __FreeBSD_kernel__
18	- pthread_setname_np( pthread_self(), name );
19	+ pthread_set_name_np( pthread_self(), name );
20	#elif defined MACOSX \|\| defined IOS
21	pthread_setname_np( name );
22	#else

Removed Link Here

(-)c/editors/libreoffice/files/patch-sc_source_filter_inc_orcusinterface.hxx (-40 lines)
1	--- sc/source/filter/inc/orcusinterface.hxx.orig 2017-10-25 14:25:39 UTC
2	+++ sc/source/filter/inc/orcusinterface.hxx
3	@@ -183,7 +183,8 @@ class ScOrcusSheetProperties : public orcus::spreadshe
4
5	virtual void set_row_hidden(orcus::spreadsheet::row_t row, bool hidden) override;
6
7	- virtual void set_merge_cell_range(const char* p_range, size_t n_range) override;
8	+
9	+ virtual void set_merge_cell_range(const orcus::spreadsheet::range_t& range) override;
10	};
11
12	class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet
13	@@ -243,6 +244,8 @@ class ScOrcusSheet : public orcus::spreadsheet::iface:
14	orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar,
15	const char* p, size_t n, const char* p_range, size_t n_range) override;
16
17	+ virtual orcus::spreadsheet::range_size_t get_sheet_size() const override;
18	+
19	SCTAB getIndex() const { return mnTab; }
20	};
21
22	@@ -418,7 +421,7 @@ class ScOrcusStyles : public orcus::spreadsheet::iface
23	// border
24
25	virtual void set_border_count(size_t n) override;
26	- virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, const char* s, size_t n) override;
27	+
28	virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, orcus::spreadsheet::border_style_t style) override;
29	virtual void set_border_color(orcus::spreadsheet::border_direction_t dir,
30	orcus::spreadsheet::color_elem_t alpha,
31	@@ -508,7 +511,8 @@ class ScOrcusFactory : public orcus::spreadsheet::ifac
32	public:
33	ScOrcusFactory(ScDocument& rDoc);
34
35	- virtual orcus::spreadsheet::iface::import_sheet* append_sheet(const char *sheet_name, size_t sheet_name_length) override;
36	+ virtual orcus::spreadsheet::iface::import_sheet* append_sheet(
37	+ orcus::spreadsheet::sheet_t sheet_index, const char *sheet_name, size_t sheet_name_length) override;
38	virtual orcus::spreadsheet::iface::import_sheet* get_sheet(const char *sheet_name, size_t sheet_name_length) override;
39	virtual orcus::spreadsheet::iface::import_sheet* get_sheet(orcus::spreadsheet::sheet_t sheet_index) override;
40	virtual orcus::spreadsheet::iface::import_global_settings* get_global_settings() override;

Removed Link Here

(-)c/editors/libreoffice/files/patch-sc_source_filter_orcus_interface.cxx (-59 lines)
1	--- sc/source/filter/orcus/interface.cxx.orig 2017-10-25 14:25:39 UTC
2	+++ sc/source/filter/orcus/interface.cxx
3	@@ -84,7 +84,8 @@ ScOrcusFactory::ScOrcusFactory(ScDocument& rDoc) :
4	maStyles(rDoc),
5	mnProgress(0) {}
6
7	-orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::append_sheet(const char* sheet_name, size_t sheet_name_length)
8	+orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::append_sheet(
9	+ orcus::spreadsheet::sheet_t /sheet_index/, const char* sheet_name, size_t sheet_name_length)
10	{
11	OUString aTabName(sheet_name, sheet_name_length, RTL_TEXTENCODING_UTF8);
12	if (!maDoc.appendSheet(aTabName))
13	@@ -296,7 +297,7 @@ void ScOrcusSheetProperties::set_row_hidden(os::row_t
14	mrDoc.getDoc().SetRowHidden(row, row, mnTab, hidden);
15	}
16
17	-void ScOrcusSheetProperties::set_merge_cell_range(const char* /p_range/, size_t /n_range/)
18	+void ScOrcusSheetProperties::set_merge_cell_range(const orcus::spreadsheet::range_t& /range/)
19	{
20	}
21
22	@@ -576,6 +577,9 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrc
23	case orcus::spreadsheet::formula_grammar_t::gnumeric:
24	eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_A1;
25	break;
26	+ case orcus::spreadsheet::formula_grammar_t::xls_xml:
27	+ eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1;
28	+ break;
29	case orcus::spreadsheet::formula_grammar_t::unknown:
30	break;
31	}
32	@@ -693,6 +697,15 @@ void ScOrcusSheet::set_array_formula(
33	{
34	}
35
36	+orcus::spreadsheet::range_size_t ScOrcusSheet::get_sheet_size() const
37	+{
38	+ orcus::spreadsheet::range_size_t ret;
39	+ ret.rows = MAXROWCOUNT;
40	+ ret.columns = MAXCOLCOUNT;
41	+
42	+ return ret;
43	+}
44	+
45	ScOrcusSharedStrings::ScOrcusSharedStrings(ScOrcusFactory& rFactory) :
46	mrFactory(rFactory) {}
47
48	@@ -1281,11 +1294,6 @@ size_t ScOrcusStyles::commit_fill()
49	void ScOrcusStyles::set_border_count(size_t /n/)
50	{
51	// needed at all?
52	-}
53	-
54	-void ScOrcusStyles::set_border_style(orcus::spreadsheet::border_direction_t /dir/, const char* /s/, size_t /n/)
55	-{
56	- // implement later
57	}
58
59	void ScOrcusStyles::set_border_style(

Removed Link Here

(-)c/editors/libreoffice/files/patch-sfx2_source_control_emojiview.cxx (-26 lines)
1	--- sfx2/source/control/emojiview.cxx.orig 2017-10-25 14:25:39 UTC
2	+++ sfx2/source/control/emojiview.cxx
3	@@ -104,12 +104,12 @@ void EmojiView::Populate()
4	}
5
6	// TODO::populate view using the orcus json parser
7	- using node = orcus::json_document_tree::node;
8	+ using node = orcus::json::node;
9
10	// default json config
11	orcus::json_config config;
12
13	- orcus::json_document_tree aEmojiInfo;
14	+ orcus::json::document_tree aEmojiInfo;
15
16	// Load JSON string into a document tree.
17	aEmojiInfo.load(msJSONData, config);
18	@@ -122,7 +122,7 @@ void EmojiView::Populate()
19	orcus::pstring key = *it;
20	node value = root.child(key);
21
22	- if(value.type() == orcus::json_node_t::object)
23	+ if(value.type() == orcus::json::node_t::object)
24	{
25	// iterate each element to get the keys
26	std::vector<orcus::pstring> aEmojiParams = value.keys();

Lines 1-11 Link Here

(-)i/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx (-9 / +9 lines)
1	--- shell/source/unix/exec/shellexec.cxx.orig 2017-01-12 00:54:33 UTC	1	--- shell/source/unix/exec/shellexec.cxx.orig 2017-12-08 02:26:19.000000000 +0300
2	+++ shell/source/unix/exec/shellexec.cxx	2	+++ shell/source/unix/exec/shellexec.cxx 2017-12-12 15:51:21.551684000 +0300
3	@@ -157,7 +157,7 @@ void SAL_CALL ShellExec::execute( const	3	@@ -145,7 +145,7 @@
4	if (std::getenv("LIBO_FLATPAK") != nullptr) {	4	aBuffer.append("open --");
5	aBuffer.append("/app/bin/xdg-open");	5	#else
6	} else {	6	// Just use xdg-open on non-Mac
7	- aBuffer.append("/usr/bin/xdg-open");	7	- aBuffer.append("/usr/bin/xdg-open");
8	+ aBuffer.append("%%LOCALBASE%%/bin/xdg-open");	8	+ aBuffer.append("%%LOCALBASE%%/bin/xdg-open");
9	}
10	#endif	9	#endif
11	aBuffer.append(" ");	10	aBuffer.append(" ");
		11	escapeForShell(aBuffer, OUStringToOString(aURL, osl_getThreadTextEncoding()));

Removed Link Here

(-)c/editors/libreoffice/files/patch-vcl_CppunitTest__vcl__wmf__test.mk (-15 lines)
1	--- vcl/CppunitTest_vcl_wmf_test.mk.orig 2017-05-03 16:46:29 UTC
2	+++ vcl/CppunitTest_vcl_wmf_test.mk
3	@@ -131,10 +131,9 @@ $(eval $(call gb_CppunitTest_use_externals,vcl_wmf_tes
4	))
5	endif
6	else
7	-ifeq ($(OS),LINUX)
8	+ifeq ($(OS), $(filter LINUX %BSD, $(OS)))
9	$(eval $(call gb_CppunitTest_add_libs,vcl_wmf_test,\
10	- -lm \
11	- -ldl \
12	+ -lm $(DLOPEN_LIBS) \
13	-lpthread \
14	-lGL \
15	-lX11 \

Removed Link Here

(-)c/editors/libreoffice/files/patch-vcl_Library__vcl.mk (-20 lines)
1	--- vcl/Library_vcl.mk.orig 2017-05-03 16:46:29 UTC
2	+++ vcl/Library_vcl.mk
3	@@ -643,13 +643,12 @@ else
4	vcl/source/opengl/OpenGLHelper \
5	vcl/source/window/openglwin \
6	))
7	-ifeq ($(OS),LINUX)
8	+ifeq ($(OS), $(filter LINUX %BSD, $(OS)))
9	$(eval $(call gb_Library_add_libs,vcl,\
10	- -lm \
11	- -ldl \
12	+ -lm $(DLOPEN_LIBS) \
13	-lpthread \
14	- -lGL \
15	- -lX11 \
16	+ -lGL \
17	+ -lX11 \
18	))
19	endif
20	endif

Removed Link Here

(-)c/editors/libreoffice/files/patch-vcl_unx_gtk_fpicker_SalGtkFilePicker.cxx (-18 lines)
1	--- vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx.orig 2017-01-12 00:54:33 UTC
2	+++ vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
3	@@ -436,10 +436,13 @@ dialog_remove_buttons( GtkDialog *pDialo
4	{
5	g_return_if_fail( GTK_IS_DIALOG( pDialog ) );
6
7	-#if GTK_CHECK_VERSION(3,0,0)
8	#if GTK_CHECK_VERSION(3,12,0)
9	- dialog_remove_buttons(gtk_dialog_get_header_bar(pDialog));
10	+ GtkWidget *pHeaderBar = gtk_dialog_get_header_bar( pDialog );
11	+ if( pHeaderBar != nullptr )
12	+ dialog_remove_buttons( pHeaderBar );
13	+ else
14	#endif
15	+#if GTK_CHECK_VERSION(2,14,0)
16	dialog_remove_buttons(gtk_dialog_get_action_area(pDialog));
17	#else
18	dialog_remove_buttons(pDialog->action_area);