forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <[email protected]>
- Loading branch information
Showing
3 changed files
with
624 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
app-office/libreoffice/files/libreoffice-6.1.4.1-gtk3_kde5-fix.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
From 8e395b1c1476122963082861c02adaa976d91e9b Mon Sep 17 00:00:00 2001 | ||
From: Michael Weghorn <[email protected]> | ||
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) | ||
{ |
Oops, something went wrong.