commit: 62efa8c1c4d870cfa0dfe7f4fe7af87ffe65a380 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Dec 13 10:59:13 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Dec 13 11:01:10 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62efa8c1
app-office/libreoffice: Drop upstreamed patch Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/libreoffice-6.1.4.1-gtk3_kde5-fix.patch | 47 ---------------------- app-office/libreoffice/libreoffice-6.1.4.2.ebuild | 3 -- 2 files changed, 50 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 deleted file mode 100644 index 5f970b058f4..00000000000 --- a/app-office/libreoffice/files/libreoffice-6.1.4.1-gtk3_kde5-fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -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) - { diff --git a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild index f297a839ea8..6070b09e9e5 100644 --- a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild @@ -249,9 +249,6 @@ PATCHES=( "${FILESDIR}/${PN}-5.4-system-pyuno.patch" "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" - - # pending upstream review - "${FILESDIR}/${P}-gtk3_kde5-fix.patch" # tdf#121399 ) S="${WORKDIR}/${PN}-${MY_PV}"
