diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-12-04 21:33:00 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-12-13 10:54:43 +0100 |
| commit | f3c3373bf27b6999f95e5c6c5426d91563031918 (patch) | |
| tree | 73587943b91bd60065a8ce3f701d3777b3e0497f /app-office/libreoffice/files | |
| parent | sys-fs/shake: Drop 0.999 (diff) | |
| download | gentoo-f3c3373bf27b6999f95e5c6c5426d91563031918.tar.gz gentoo-f3c3373bf27b6999f95e5c6c5426d91563031918.tar.bz2 gentoo-f3c3373bf27b6999f95e5c6c5426d91563031918.zip | |
app-office/libreoffice: 6.1.4.2 version bump
Includes gtk3_kde5 fix finally upstreamed:
See also: https://bugs.documentfoundation.org/show_bug.cgi?id=121399
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-office/libreoffice/files')
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-6.1.4.1-gtk3_kde5-fix.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/app-office/libreoffice/files/libreoffice-6.1.4.1-gtk3_kde5-fix.patch b/app-office/libreoffice/files/libreoffice-6.1.4.1-gtk3_kde5-fix.patch new file mode 100644 index 000000000000..5f970b058f47 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.1.4.1-gtk3_kde5-fix.patch @@ -0,0 +1,47 @@ +From 8e395b1c1476122963082861c02adaa976d91e9b Mon Sep 17 00:00:00 2001 +From: Michael Weghorn <m.weghorn@posteo.de> +Date: Tue, 04 Dec 2018 14:42:31 +0100 +Subject: [PATCH] tdf#121399 Join cmd reading thread in gtk3_kde5 + +Stop reading commands from the pipe on kde5 side once +the "Quit" command has been sent, in order to have +the thread that is reading commands from stdin finish +properly. + +Join the thread in the 'FilePickerIpc' destructor, rather than +just deleting it while it may still be running, which +resulted in 'terminate()' being called. + +Change-Id: Ia184987e7994cc1de0208ff2757a3cf06c8b7194 +--- + +diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx b/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx +index 550e1d8..a2ea6b7 100644 +--- a/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx ++++ b/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx +@@ -192,6 +192,12 @@ + readCommandArgs(command, args); + + emit ipc->commandReceived(messageId, command, args); ++ ++ // stop processing once 'Quit' command has been sent ++ if (command == Commands::Quit) ++ { ++ return; ++ } + } + } + +@@ -211,7 +217,11 @@ + m_ipcReaderThread = std::unique_ptr<std::thread>{ new std::thread(readCommands, this) }; + } + +-FilePickerIpc::~FilePickerIpc() = default; ++FilePickerIpc::~FilePickerIpc() ++{ ++ // join thread that reads commands ++ m_ipcReaderThread->join(); ++}; + + bool FilePickerIpc::handleCommand(uint64_t messageId, Commands command, QList<QVariant> args) + { |