summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-07-30 22:00:28 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-08-01 09:36:49 +0200
commitd6e48538811e2aedc89fdf9ac6d04062d2ed780a (patch)
treed0039d0c57a5c03399fb0d0cd85eec1b6d4d8f5d /kde-misc/kdiff3/files
parentkde-misc/skanlite: Drop 2.1.0.1-r1 (diff)
downloadgentoo-d6e48538811e2aedc89fdf9ac6d04062d2ed780a.tar.gz
gentoo-d6e48538811e2aedc89fdf9ac6d04062d2ed780a.tar.bz2
gentoo-d6e48538811e2aedc89fdf9ac6d04062d2ed780a.zip
kde-misc/kdiff3: Drop 1.8.2-r1 and 1.8.3 (r0)
Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-misc/kdiff3/files')
-rw-r--r--kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch36
1 files changed, 0 insertions, 36 deletions
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
deleted file mode 100644
index b1d00a12f47d..000000000000
--- a/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 643edc26bcc8f8e083a97e87c2686f62ffd01f31 Mon Sep 17 00:00:00 2001
-From: Christoph Feck <cfeck@kde.org>
-Date: Thu, 30 Apr 2020 18:27:58 -0400
-Subject: Fix crash when clipboard is not available
-
-Summary:
-QClipboard::mimeData() can be nullptr according to documentation.
-
-BUG: 419722
-FIXED-IN: 1.8.3
-
-Reviewers: mreeves
-
-Reviewed By: mreeves
-
-Differential Revision: https://phabricator.kde.org/D29248
----
- src/pdiff.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pdiff.cpp b/src/pdiff.cpp
-index f3f2284..3588e3e 100644
---- a/src/pdiff.cpp
-+++ b/src/pdiff.cpp
-@@ -1577,7 +1577,7 @@ void KDiff3App::slotClipboardChanged()
- {
- const QClipboard* clipboard = QApplication::clipboard();
- const QMimeData* mimeData = clipboard->mimeData();
-- if(mimeData->hasText())
-+ if(mimeData && mimeData->hasText())
- {
- QString s = clipboard->text();
- editPaste->setEnabled(!s.isEmpty());
---
-cgit v1.1
-