diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-07-30 22:00:28 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-08-01 09:36:49 +0200 |
commit | d6e48538811e2aedc89fdf9ac6d04062d2ed780a (patch) | |
tree | d0039d0c57a5c03399fb0d0cd85eec1b6d4d8f5d /kde-misc/kdiff3 | |
parent | kde-misc/skanlite: Drop 2.1.0.1-r1 (diff) | |
download | gentoo-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')
-rw-r--r-- | kde-misc/kdiff3/Manifest | 1 | ||||
-rw-r--r-- | kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch | 36 | ||||
-rw-r--r-- | kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild | 41 | ||||
-rw-r--r-- | kde-misc/kdiff3/kdiff3-1.8.3.ebuild | 39 |
4 files changed, 0 insertions, 117 deletions
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest index 5158282ef9fb..7b68da8ed01b 100644 --- a/kde-misc/kdiff3/Manifest +++ b/kde-misc/kdiff3/Manifest @@ -1,2 +1 @@ -DIST kdiff3-1.8.2.tar.xz 1039304 BLAKE2B de4052117bdade42fc489cf35ed9f4af4dfe8c1704dea36f2fa36ee8b14b4dd355052d0e9cdc0f32de9dde81e74862d1c10f7fcdde12db8f5e68d4e377e6f5f1 SHA512 c52dea38b8fa483344a840fb0f6eab04fdeb2dfc5f2a554f9fc095ed175c45f4c355fe7f04dceca4446ac483a1e97db2a296b947fb99315fc388a45e6298d7f0 DIST kdiff3-1.8.3.tar.xz 1038904 BLAKE2B 43fccb146a2220661d5f7e1e836de06b00afe54b9bccbd37b76eaf1dc660eb81dae781b08071f581c5a3bd123b7b829c4339b72348c65829c4f977a61771e69e SHA512 5cadd1cfe7e85a1dfb81c4f1cb685f988b0155b581ffa38653d4df30172b6a1ee4ed4269869285b5add3ca163eae88645d702e6fc84380229ac09ea14dd20a4d 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 - diff --git a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild b/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild deleted file mode 100644 index 0659672ef390..000000000000 --- a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="Frontend to diff3 based on KDE Frameworks" -HOMEPAGE="https://kde.org/applications/development/org.kde.kdiff3 -https://userbase.kde.org/KDiff3" -SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 -" -RDEPEND="${DEPEND} - sys-apps/diffutils -" - -PATCHES=( "${FILESDIR}/${P}-crash-w-o-clipboard.patch" ) diff --git a/kde-misc/kdiff3/kdiff3-1.8.3.ebuild b/kde-misc/kdiff3/kdiff3-1.8.3.ebuild deleted file mode 100644 index 50728ca4d608..000000000000 --- a/kde-misc/kdiff3/kdiff3-1.8.3.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="Frontend to diff3 based on KDE Frameworks" -HOMEPAGE="https://kde.org/applications/development/org.kde.kdiff3 -https://userbase.kde.org/KDiff3" -SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 -" -RDEPEND="${DEPEND} - sys-apps/diffutils -" |