| 1 |
commit: 2f661486a6cbd40050d651f9e76cb66709bed663 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 31 23:07:10 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 1 20:14:20 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f661486 |
| 7 |
|
| 8 |
app-office/libreoffice: Set KFileWidget's custom widget only once |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
...-set-kfilewidgets-custom-widget-only-once.patch | 42 ++++++++++++++++++++++ |
| 14 |
app-office/libreoffice/libreoffice-6.1.5.2.ebuild | 1 + |
| 15 |
2 files changed, 43 insertions(+) |
| 16 |
|
| 17 |
diff --git a/app-office/libreoffice/files/libreoffice-6.1.5.2-gtk3_kde5-set-kfilewidgets-custom-widget-only-once.patch b/app-office/libreoffice/files/libreoffice-6.1.5.2-gtk3_kde5-set-kfilewidgets-custom-widget-only-once.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..69134a8b992 |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-office/libreoffice/files/libreoffice-6.1.5.2-gtk3_kde5-set-kfilewidgets-custom-widget-only-once.patch |
| 22 |
@@ -0,0 +1,42 @@ |
| 23 |
+From 7b54f3db98e96231fc9f16429f325cdb1f37498c Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Michael Weghorn <m.weghorn@××××××.de> |
| 25 |
+Date: Thu, 31 Jan 2019 09:52:51 +0100 |
| 26 |
+Subject: tdf#123077 gtk3_kde5: Set KFileWidget's custom widget only once |
| 27 |
+ |
| 28 |
+Since the event filter is only used to set the custom |
| 29 |
+widget in the KFileWidget, it can and needs to be removed |
| 30 |
+again once this has been done; which also avoids crashes. |
| 31 |
+ |
| 32 |
+(s. https://gerrit.libreoffice.org/#/c/67185/ for more |
| 33 |
+infos, where the same thing is done for kde5) |
| 34 |
+ |
| 35 |
+Change-Id: I5c719fb17510916b4730ed5c00bb638df2f183e3 |
| 36 |
+Reviewed-on: https://gerrit.libreoffice.org/67184 |
| 37 |
+Tested-by: Jenkins |
| 38 |
+Reviewed-by: Michael Weghorn <m.weghorn@××××××.de> |
| 39 |
+(cherry picked from commit 30cc54a4532a732a0cf6dfe9943521978ff7292f) |
| 40 |
+Reviewed-on: https://gerrit.libreoffice.org/67203 |
| 41 |
+Reviewed-by: Katarina Behrens <Katarina.Behrens@×××.de> |
| 42 |
+--- |
| 43 |
+ vcl/unx/gtk3_kde5/kde5_filepicker.cxx | 4 ++++ |
| 44 |
+ 1 file changed, 4 insertions(+) |
| 45 |
+ |
| 46 |
+diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx |
| 47 |
+index 33f64ad0..9914869 100644 |
| 48 |
+--- a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx |
| 49 |
++++ b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx |
| 50 |
+@@ -265,7 +265,11 @@ bool KDE5FilePicker::eventFilter(QObject* o, QEvent* e) |
| 51 |
+ { |
| 52 |
+ KWindowSystem::setMainWindow(w, _winId); |
| 53 |
+ if (auto* fileWidget = w->findChild<KFileWidget*>({}, Qt::FindDirectChildrenOnly)) |
| 54 |
++ { |
| 55 |
+ fileWidget->setCustomWidget(_extraControls); |
| 56 |
++ // remove event filter again; the only purpose was to set the custom widget here |
| 57 |
++ qApp->removeEventFilter(this); |
| 58 |
++ } |
| 59 |
+ } |
| 60 |
+ } |
| 61 |
+ return QObject::eventFilter(o, e); |
| 62 |
+-- |
| 63 |
+cgit v1.1 |
| 64 |
+ |
| 65 |
|
| 66 |
diff --git a/app-office/libreoffice/libreoffice-6.1.5.2.ebuild b/app-office/libreoffice/libreoffice-6.1.5.2.ebuild |
| 67 |
index e59e17836c2..3524ee2f86e 100644 |
| 68 |
--- a/app-office/libreoffice/libreoffice-6.1.5.2.ebuild |
| 69 |
+++ b/app-office/libreoffice/libreoffice-6.1.5.2.ebuild |
| 70 |
@@ -252,6 +252,7 @@ PATCHES=( |
| 71 |
|
| 72 |
# master branch |
| 73 |
"${FILESDIR}/${P}-gtk3_kde5-non-native-fpicker-for-non-plasma.patch" |
| 74 |
+ "${FILESDIR}/${P}-gtk3_kde5-set-kfilewidgets-custom-widget-only-once.patch" |
| 75 |
) |
| 76 |
|
| 77 |
S="${WORKDIR}/${PN}-${MY_PV}" |
Archives