Index: head/editors/libreoffice/Makefile.common
===================================================================
--- head/editors/libreoffice/Makefile.common	(revision 426068)
+++ head/editors/libreoffice/Makefile.common	(revision 426069)
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
 PORTNAME=	libreoffice
 PORTVERSION=	5.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	editors
 
 MAINTAINER=	office@FreeBSD.org
 
 LICENSE=	LGPL3+ MPL
 LICENSE_COMB=	dual
 
 LOVERSION=	${PORTVERSION}.${RCVER}
 RCVER=		3
Index: head/editors/libreoffice/files/patch-Makefile.in
===================================================================
--- head/editors/libreoffice/files/patch-Makefile.in	(revision 426068)
+++ head/editors/libreoffice/files/patch-Makefile.in	(revision 426069)
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2016-11-11 12:49:08 UTC
+--- Makefile.in.orig	2016-10-28 14:50:26 UTC
 +++ Makefile.in
 @@ -52,7 +52,7 @@ $(BUILDDIR)/config_host.mk : $(wildcard 
  
  else # MAKE_RESTARTS
  
 -all: check-if-root build
 +all: build
  
  check-if-root:
  	@if test `id -u` = 0; then \
Index: head/editors/libreoffice/files/patch-vcl_inc_unx_gtk_gtkinst.hxx
===================================================================
--- head/editors/libreoffice/files/patch-vcl_inc_unx_gtk_gtkinst.hxx	(nonexistent)
+++ head/editors/libreoffice/files/patch-vcl_inc_unx_gtk_gtkinst.hxx	(revision 426069)
@@ -0,0 +1,11 @@
+--- vcl/inc/unx/gtk/gtkinst.hxx.orig	2016-10-28 14:50:26 UTC
++++ vcl/inc/unx/gtk/gtkinst.hxx
+@@ -46,7 +46,7 @@ class GtkPrintWrapper;
+ class GenPspGraphics;
+ class GtkYieldMutex : public SalYieldMutex
+ {
+-    thread_local static std::stack<sal_uIntPtr> yieldCounts;
++    std::list<sal_uLong> aYieldStack;
+ 
+ public:
+          GtkYieldMutex() {}

Property changes on: head/editors/libreoffice/files/patch-vcl_inc_unx_gtk_gtkinst.hxx
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/editors/libreoffice/files/patch-vcl_unx_gtk_gtkinst.cxx
===================================================================
--- head/editors/libreoffice/files/patch-vcl_unx_gtk_gtkinst.cxx	(nonexistent)
+++ head/editors/libreoffice/files/patch-vcl_unx_gtk_gtkinst.cxx	(revision 426069)
@@ -0,0 +1,42 @@
+--- vcl/unx/gtk/gtkinst.cxx.orig	2016-11-13 15:24:04 UTC
++++ vcl/unx/gtk/gtkinst.cxx
+@@ -298,28 +298,29 @@ SalPrinter* GtkInstance::CreatePrinter( 
+  * for each pair, so we can accurately restore
+  * it later.
+  */
+-thread_local std::stack<sal_uIntPtr> GtkYieldMutex::yieldCounts;
+ 
+ void GtkYieldMutex::ThreadsEnter()
+ {
+     acquire();
+-    if (!yieldCounts.empty()) {
+-        auto n = yieldCounts.top();
+-        yieldCounts.pop();
+-        for (; n != 0; --n) {
++    if( !aYieldStack.empty() )
++    { /* Previously called ThreadsLeave() */
++        sal_uLong nCount = aYieldStack.front();
++        aYieldStack.pop_front();
++        while( nCount-- > 1 )
+             acquire();
+-        }
+     }
+ }
+ 
+ void GtkYieldMutex::ThreadsLeave()
+ {
++    aYieldStack.push_front( mnCount );
+     assert(mnCount != 0);
+-    auto n = mnCount - 1;
+-    yieldCounts.push(n);
+-    for (sal_uIntPtr i = 0; i != n + 1; ++i) {
++    SAL_WARN_IF(
++        mnThreadId && mnThreadId != osl::Thread::getCurrentIdentifier(),
++        "vcl.gtk", "other thread " << mnThreadId << " owns the mutex");
++    while( mnCount > 1 )
+         release();
+-    }
++    release();
+ }
+ 
+ SalVirtualDevice* GtkInstance::CreateVirtualDevice( SalGraphics *pG,

Property changes on: head/editors/libreoffice/files/patch-vcl_unx_gtk_gtkinst.cxx
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property