1 |
commit: 307511d8ac390a0332969963ba0196673bc7e808 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 1 17:19:18 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 1 20:31:33 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=307511d8 |
7 |
|
8 |
kde-misc/kdiff3: Fix crash when clipboard is not available |
9 |
|
10 |
Upstream commit 643edc26bcc8f8e083a97e87c2686f62ffd01f31 |
11 |
|
12 |
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=419722 |
13 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
15 |
|
16 |
.../files/kdiff3-1.8.2-crash-w-o-clipboard.patch | 36 +++++++++++++++++++ |
17 |
kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild | 41 ++++++++++++++++++++++ |
18 |
2 files changed, 77 insertions(+) |
19 |
|
20 |
diff --git a/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch b/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..b1d00a12f47 |
23 |
--- /dev/null |
24 |
+++ b/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch |
25 |
@@ -0,0 +1,36 @@ |
26 |
+From 643edc26bcc8f8e083a97e87c2686f62ffd01f31 Mon Sep 17 00:00:00 2001 |
27 |
+From: Christoph Feck <cfeck@×××.org> |
28 |
+Date: Thu, 30 Apr 2020 18:27:58 -0400 |
29 |
+Subject: Fix crash when clipboard is not available |
30 |
+ |
31 |
+Summary: |
32 |
+QClipboard::mimeData() can be nullptr according to documentation. |
33 |
+ |
34 |
+BUG: 419722 |
35 |
+FIXED-IN: 1.8.3 |
36 |
+ |
37 |
+Reviewers: mreeves |
38 |
+ |
39 |
+Reviewed By: mreeves |
40 |
+ |
41 |
+Differential Revision: https://phabricator.kde.org/D29248 |
42 |
+--- |
43 |
+ src/pdiff.cpp | 2 +- |
44 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
45 |
+ |
46 |
+diff --git a/src/pdiff.cpp b/src/pdiff.cpp |
47 |
+index f3f2284..3588e3e 100644 |
48 |
+--- a/src/pdiff.cpp |
49 |
++++ b/src/pdiff.cpp |
50 |
+@@ -1577,7 +1577,7 @@ void KDiff3App::slotClipboardChanged() |
51 |
+ { |
52 |
+ const QClipboard* clipboard = QApplication::clipboard(); |
53 |
+ const QMimeData* mimeData = clipboard->mimeData(); |
54 |
+- if(mimeData->hasText()) |
55 |
++ if(mimeData && mimeData->hasText()) |
56 |
+ { |
57 |
+ QString s = clipboard->text(); |
58 |
+ editPaste->setEnabled(!s.isEmpty()); |
59 |
+-- |
60 |
+cgit v1.1 |
61 |
+ |
62 |
|
63 |
diff --git a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild b/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild |
64 |
new file mode 100644 |
65 |
index 00000000000..114f5b83e86 |
66 |
--- /dev/null |
67 |
+++ b/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild |
68 |
@@ -0,0 +1,41 @@ |
69 |
+# Copyright 1999-2020 Gentoo Authors |
70 |
+# Distributed under the terms of the GNU General Public License v2 |
71 |
+ |
72 |
+EAPI=7 |
73 |
+ |
74 |
+ECM_HANDBOOK="forceoptional" |
75 |
+KFMIN=5.60.0 |
76 |
+QTMIN=5.12.3 |
77 |
+inherit ecm kde.org |
78 |
+ |
79 |
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks" |
80 |
+HOMEPAGE="https://kde.org/applications/development/org.kde.kdiff3 |
81 |
+https://userbase.kde.org/KDiff3" |
82 |
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" |
83 |
+ |
84 |
+LICENSE="GPL-2" |
85 |
+SLOT="5" |
86 |
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" |
87 |
+IUSE="" |
88 |
+ |
89 |
+DEPEND=" |
90 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
91 |
+ >=dev-qt/qtprintsupport-${QTMIN}:5 |
92 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
93 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
94 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
95 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
96 |
+ >=kde-frameworks/kcrash-${KFMIN}:5 |
97 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
98 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
99 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
100 |
+ >=kde-frameworks/kparts-${KFMIN}:5 |
101 |
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5 |
102 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
103 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
104 |
+" |
105 |
+RDEPEND="${DEPEND} |
106 |
+ sys-apps/diffutils |
107 |
+" |
108 |
+ |
109 |
+PATCHES=( "${FILESDIR}/${P}-crash-w-o-clipboard.patch" ) |