From owner-svn-ports-all@freebsd.org Sun Mar 18 12:06:25 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD6C0F4DAF2; Sun, 18 Mar 2018 12:06:25 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7F8756DEB1; Sun, 18 Mar 2018 12:06:25 +0000 (UTC) (envelope-from antoine@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A9BC2048E; Sun, 18 Mar 2018 12:06:25 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2IC6PH0027287; Sun, 18 Mar 2018 12:06:25 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2IC6PAE027285; Sun, 18 Mar 2018 12:06:25 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201803181206.w2IC6PAE027285@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 18 Mar 2018 12:06:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464902 - head/editors/libreoffice/files X-SVN-Group: ports-head X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: head/editors/libreoffice/files X-SVN-Commit-Revision: 464902 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2018 12:06:26 -0000 Author: antoine Date: Sun Mar 18 12:06:25 2018 New Revision: 464902 URL: https://svnweb.freebsd.org/changeset/ports/464902 Log: Unbreak make patch on 10.3 Reported by: pkg-fallout Modified: head/editors/libreoffice/files/extrapatch-vcl_inc_unx_gtk_gtkinst.hxx head/editors/libreoffice/files/extrapatch-vcl_unx_gtk_gtkinst.cxx Modified: head/editors/libreoffice/files/extrapatch-vcl_inc_unx_gtk_gtkinst.hxx ============================================================================== --- head/editors/libreoffice/files/extrapatch-vcl_inc_unx_gtk_gtkinst.hxx Sun Mar 18 11:46:30 2018 (r464901) +++ head/editors/libreoffice/files/extrapatch-vcl_inc_unx_gtk_gtkinst.hxx Sun Mar 18 12:06:25 2018 (r464902) @@ -1,4 +1,4 @@ ---- vcl/inc/unx/gtk/gtkinst.hxx.orig 2016-10-28 14:50:26 UTC +--- vcl/inc/unx/gtk/gtkinst.hxx.orig 2018-02-22 17:45:41 UTC +++ vcl/inc/unx/gtk/gtkinst.hxx @@ -46,7 +46,7 @@ class GtkPrintWrapper; class GenPspGraphics; Modified: head/editors/libreoffice/files/extrapatch-vcl_unx_gtk_gtkinst.cxx ============================================================================== --- head/editors/libreoffice/files/extrapatch-vcl_unx_gtk_gtkinst.cxx Sun Mar 18 11:46:30 2018 (r464901) +++ head/editors/libreoffice/files/extrapatch-vcl_unx_gtk_gtkinst.cxx Sun Mar 18 12:06:25 2018 (r464902) @@ -1,6 +1,6 @@ ---- vcl/unx/gtk/gtkinst.cxx.orig 2016-11-13 15:24:04 UTC +--- vcl/unx/gtk/gtkinst.cxx.orig 2018-02-22 17:45:41 UTC +++ vcl/unx/gtk/gtkinst.cxx -@@ -298,28 +298,29 @@ SalPrinter* GtkInstance::CreatePrinter( +@@ -302,28 +302,29 @@ SalPrinter* GtkInstance::CreatePrinter( * for each pair, so we can accurately restore * it later. */ @@ -25,15 +25,15 @@ void GtkYieldMutex::ThreadsLeave() { -+ aYieldStack.push_front( mnCount ); - assert(mnCount != 0); -- auto n = mnCount - 1; ++ aYieldStack.push_front( m_nCount ); + assert(m_nCount != 0); +- auto n = m_nCount - 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 ) ++ m_nThreadId && m_nThreadId != osl::Thread::getCurrentIdentifier(), ++ "vcl.gtk", "other thread " << m_nThreadId << " owns the mutex"); ++ while( m_nCount > 1 ) release(); - } + release();