svn commit: r464902 - head/editors/libreoffice/files

[Antoine Brodin]

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