From owner-svn-ports-head@freebsd.org Sun Nov 13 22:38:17 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3F1EBC40B51; Sun, 13 Nov 2016 22:38:17 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 187FE1EB9; Sun, 13 Nov 2016 22:38:17 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uADMcGCS036439; Sun, 13 Nov 2016 22:38:16 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uADMcFkP036435; Sun, 13 Nov 2016 22:38:15 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201611132238.uADMcFkP036435@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 13 Nov 2016 22:38:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426069 - in head/editors/libreoffice: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Nov 2016 22:38:17 -0000 Author: bapt Date: Sun Nov 13 22:38:15 2016 New Revision: 426069 URL: https://svnweb.freebsd.org/changeset/ports/426069 Log: Fix runtime issues related to thread_locale __cxa_thread_atexit which is needed when building c++11 program using thread_locale is only defined on FreeBSD 11-STABLE and 12-CURRENT Backout the change in libreoffice which happened during the 5.2 dev phase adding thread_locale PR: 214473 Reported by: Dušan Vejnovič Tested by: Dušan Vejnovič Added: head/editors/libreoffice/files/patch-vcl_inc_unx_gtk_gtkinst.hxx (contents, props changed) head/editors/libreoffice/files/patch-vcl_unx_gtk_gtkinst.cxx (contents, props changed) Modified: head/editors/libreoffice/Makefile.common head/editors/libreoffice/files/patch-Makefile.in Modified: head/editors/libreoffice/Makefile.common ============================================================================== --- head/editors/libreoffice/Makefile.common Sun Nov 13 22:26:53 2016 (r426068) +++ head/editors/libreoffice/Makefile.common Sun Nov 13 22:38:15 2016 (r426069) @@ -2,7 +2,7 @@ PORTNAME= libreoffice PORTVERSION= 5.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= editors MAINTAINER= office@FreeBSD.org Modified: head/editors/libreoffice/files/patch-Makefile.in ============================================================================== --- head/editors/libreoffice/files/patch-Makefile.in Sun Nov 13 22:26:53 2016 (r426068) +++ head/editors/libreoffice/files/patch-Makefile.in Sun Nov 13 22:38:15 2016 (r426069) @@ -1,4 +1,4 @@ ---- 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 Added: head/editors/libreoffice/files/patch-vcl_inc_unx_gtk_gtkinst.hxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/libreoffice/files/patch-vcl_inc_unx_gtk_gtkinst.hxx Sun Nov 13 22:38:15 2016 (r426069) @@ -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 yieldCounts; ++ std::list aYieldStack; + + public: + GtkYieldMutex() {} Added: head/editors/libreoffice/files/patch-vcl_unx_gtk_gtkinst.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/libreoffice/files/patch-vcl_unx_gtk_gtkinst.cxx Sun Nov 13 22:38:15 2016 (r426069) @@ -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 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,