libreoffice-4.2.3.3-kde4-timer-mutex.patch.out

libreoffice-4.2.3.3-kde4-timer-mutex.patch.out (text/plain), 7.40 KB, created by Coacher on 2014-04-15 12:37:21 UTC

***** libreoffice-4.2.3.3-kde4-timer-mutex.patch *****
PWD: /var/tmp/portage/app-office/libreoffice-4.2.3.3/work/libreoffice-4.2.3.3

======================================================

PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch  < '/var/portage/app-office/libreoffice/files/libreoffice-4.2.3.3-kde4-timer-mutex.patch'

======================================================
can't find file to patch at input line 28
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 7dba6e0a71d090f06a6a1a39e87572674593b48a Mon Sep 17 00:00:00 2001
|From: Jan-Marek Glogowski <[e-mail]>
|Date: Mon, 10 Mar 2014 14:44:05 +0000
|Subject: fdo#73115: Always run timeouts as events
|
|Right-click popup menus run click events throught the LO main loop.
|In case of KDE4 the LO main loop is run by a timer in the main thread,
|with Qt::DirectConnection execution.
|
|If the timeout actually starts a nested event loop for a new dialog,
|the timer is blocked, the nested mainloop detects it was started
|from the timeout and drops the blocked timout from polling, which
|blocks any further LibreOffice event loop processing.
|
|This changes the timers to Qt::QueuedConnection, so they always
|generate an event and are processed by the Qt event loop.
|
|Change-Id: Ie626b22be3d8f9b8934bcc5e9e0e67a365549cfc
|(cherry picked from commit aeda478a02523cec146f6af69710f0391061db56)
|Reviewed-on: https://gerrit.libreoffice.org/8514
|Reviewed-by: Caolán McNamara <[e-mail]>
|Tested-by: Caolán McNamara <[e-mail]>
|---
|diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
|index b4be6d6..4a9b70b 100644
|--- a/vcl/unx/kde4/KDEXLib.cxx
|+++ b/vcl/unx/kde4/KDEXLib.cxx
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored

patch program exited with status 1
======================================================

PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch  < '/var/portage/app-office/libreoffice/files/libreoffice-4.2.3.3-kde4-timer-mutex.patch'

======================================================
patching file vcl/unx/kde4/KDEXLib.cxx
Hunk #1 FAILED at 67.
1 out of 1 hunk FAILED -- saving rejects to file vcl/unx/kde4/KDEXLib.cxx.rej

patch program exited with status 1
======================================================

PATCH COMMAND:  patch -p2 -g0 -E --no-backup-if-mismatch  < '/var/portage/app-office/libreoffice/files/libreoffice-4.2.3.3-kde4-timer-mutex.patch'

======================================================
can't find file to patch at input line 28
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 7dba6e0a71d090f06a6a1a39e87572674593b48a Mon Sep 17 00:00:00 2001
|From: Jan-Marek Glogowski <[e-mail]>
|Date: Mon, 10 Mar 2014 14:44:05 +0000
|Subject: fdo#73115: Always run timeouts as events
|
|Right-click popup menus run click events throught the LO main loop.
|In case of KDE4 the LO main loop is run by a timer in the main thread,
|with Qt::DirectConnection execution.
|
|If the timeout actually starts a nested event loop for a new dialog,
|the timer is blocked, the nested mainloop detects it was started
|from the timeout and drops the blocked timout from polling, which
|blocks any further LibreOffice event loop processing.
|
|This changes the timers to Qt::QueuedConnection, so they always
|generate an event and are processed by the Qt event loop.
|
|Change-Id: Ie626b22be3d8f9b8934bcc5e9e0e67a365549cfc
|(cherry picked from commit aeda478a02523cec146f6af69710f0391061db56)
|Reviewed-on: https://gerrit.libreoffice.org/8514
|Reviewed-by: Caolán McNamara <[e-mail]>
|Tested-by: Caolán McNamara <[e-mail]>
|---
|diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
|index b4be6d6..4a9b70b 100644
|--- a/vcl/unx/kde4/KDEXLib.cxx
|+++ b/vcl/unx/kde4/KDEXLib.cxx
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored

patch program exited with status 1
======================================================

PATCH COMMAND:  patch -p3 -g0 -E --no-backup-if-mismatch  < '/var/portage/app-office/libreoffice/files/libreoffice-4.2.3.3-kde4-timer-mutex.patch'

======================================================
can't find file to patch at input line 28
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 7dba6e0a71d090f06a6a1a39e87572674593b48a Mon Sep 17 00:00:00 2001
|From: Jan-Marek Glogowski <[e-mail]>
|Date: Mon, 10 Mar 2014 14:44:05 +0000
|Subject: fdo#73115: Always run timeouts as events
|
|Right-click popup menus run click events throught the LO main loop.
|In case of KDE4 the LO main loop is run by a timer in the main thread,
|with Qt::DirectConnection execution.
|
|If the timeout actually starts a nested event loop for a new dialog,
|the timer is blocked, the nested mainloop detects it was started
|from the timeout and drops the blocked timout from polling, which
|blocks any further LibreOffice event loop processing.
|
|This changes the timers to Qt::QueuedConnection, so they always
|generate an event and are processed by the Qt event loop.
|
|Change-Id: Ie626b22be3d8f9b8934bcc5e9e0e67a365549cfc
|(cherry picked from commit aeda478a02523cec146f6af69710f0391061db56)
|Reviewed-on: https://gerrit.libreoffice.org/8514
|Reviewed-by: Caolán McNamara <[e-mail]>
|Tested-by: Caolán McNamara <[e-mail]>
|---
|diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
|index b4be6d6..4a9b70b 100644
|--- a/vcl/unx/kde4/KDEXLib.cxx
|+++ b/vcl/unx/kde4/KDEXLib.cxx
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored

patch program exited with status 1
======================================================

PATCH COMMAND:  patch -p4 -g0 -E --no-backup-if-mismatch  < '/var/portage/app-office/libreoffice/files/libreoffice-4.2.3.3-kde4-timer-mutex.patch'

======================================================
can't find file to patch at input line 28
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 7dba6e0a71d090f06a6a1a39e87572674593b48a Mon Sep 17 00:00:00 2001
|From: Jan-Marek Glogowski <[e-mail]>
|Date: Mon, 10 Mar 2014 14:44:05 +0000
|Subject: fdo#73115: Always run timeouts as events
|
|Right-click popup menus run click events throught the LO main loop.
|In case of KDE4 the LO main loop is run by a timer in the main thread,
|with Qt::DirectConnection execution.
|
|If the timeout actually starts a nested event loop for a new dialog,
|the timer is blocked, the nested mainloop detects it was started
|from the timeout and drops the blocked timout from polling, which
|blocks any further LibreOffice event loop processing.
|
|This changes the timers to Qt::QueuedConnection, so they always
|generate an event and are processed by the Qt event loop.
|
|Change-Id: Ie626b22be3d8f9b8934bcc5e9e0e67a365549cfc
|(cherry picked from commit aeda478a02523cec146f6af69710f0391061db56)
|Reviewed-on: https://gerrit.libreoffice.org/8514
|Reviewed-by: Caolán McNamara <[e-mail]>
|Tested-by: Caolán McNamara <[e-mail]>
|---
|diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
|index b4be6d6..4a9b70b 100644
|--- a/vcl/unx/kde4/KDEXLib.cxx
|+++ b/vcl/unx/kde4/KDEXLib.cxx
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored

patch program exited with status 1