diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2018-03-18 12:06:25 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2018-03-18 12:06:25 +0000 |
| commit | 112fc2f57a22072a86d71db0a7855e7e0717ac5e (patch) | |
| tree | c88ec0b5661df97785f264953b81872a2164a7aa /editors/libreoffice | |
| parent | ef9f8f3e5c66f56dc995dcfb516e4cc3615d8778 (diff) | |
| download | freebsd-ports-112fc2f57a22072a86d71db0a7855e7e0717ac5e.zip | |
Unbreak make patch on 10.3
Reported by: pkg-fallout
Diffstat (limited to 'editors/libreoffice')
| -rw-r--r-- | editors/libreoffice/files/extrapatch-vcl_inc_unx_gtk_gtkinst.hxx | 2 | ||||
| -rw-r--r-- | editors/libreoffice/files/extrapatch-vcl_unx_gtk_gtkinst.cxx | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/editors/libreoffice/files/extrapatch-vcl_inc_unx_gtk_gtkinst.hxx b/editors/libreoffice/files/extrapatch-vcl_inc_unx_gtk_gtkinst.hxx index c9ab6a82b920..d78a411da83a 100644 --- a/editors/libreoffice/files/extrapatch-vcl_inc_unx_gtk_gtkinst.hxx +++ b/editors/libreoffice/files/extrapatch-vcl_inc_unx_gtk_gtkinst.hxx @@ -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; diff --git a/editors/libreoffice/files/extrapatch-vcl_unx_gtk_gtkinst.cxx b/editors/libreoffice/files/extrapatch-vcl_unx_gtk_gtkinst.cxx index b53a62613794..1f7167aa9df7 100644 --- a/editors/libreoffice/files/extrapatch-vcl_unx_gtk_gtkinst.cxx +++ b/editors/libreoffice/files/extrapatch-vcl_unx_gtk_gtkinst.cxx @@ -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(); |