From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- kde-misc/kdiff3/Manifest | 5 ++- .../files/kdiff3-1.8.2-crash-w-o-clipboard.patch | 36 +++++++++++++++++++ kde-misc/kdiff3/kdiff3-1.8.1.ebuild | 40 --------------------- kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild | 41 ++++++++++++++++++++++ kde-misc/kdiff3/kdiff3-1.8.2.ebuild | 40 --------------------- 5 files changed, 79 insertions(+), 83 deletions(-) create mode 100644 kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch delete mode 100644 kde-misc/kdiff3/kdiff3-1.8.1.ebuild create mode 100644 kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild delete mode 100644 kde-misc/kdiff3/kdiff3-1.8.2.ebuild (limited to 'kde-misc/kdiff3') diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest index f820446afe90..e13a5d793ed0 100644 --- a/kde-misc/kdiff3/Manifest +++ b/kde-misc/kdiff3/Manifest @@ -1,5 +1,4 @@ -DIST kdiff3-1.8.1.tar.xz 897692 BLAKE2B cdc6020afcd6527d23bfbaf79d09840f3bb43949f1a195d51d9f2d9339d659047abbdebf1740954af9bb01d872dfda4d9113e8a23361f5d891108fc1ddb92e49 SHA512 09cddac0f3adffa91f1986dfb50982deb1c6a31c232215da8a2a396d7525b4d28ef6d3febdcd4ba89cf9f6371a7b34441ef4e10aa0e3468fadf95fb7f78d7720 +AUX kdiff3-1.8.2-crash-w-o-clipboard.patch 950 BLAKE2B a075e1e8a06958e5f849b024d65f7d709be49a7facda5b4bd2a223374735a80b19a94ee983c9d1245733fed6c46f6d4c70cf631d32c2c2aa5f345b999e437674 SHA512 43d0c4898841fb822571502257a0d7acd359deaa7e906a0a80fb9d2f9cb8b61008a6b96d08acf74d5a76534b519fc6f3435e08034651aa4572c637817be4e025 DIST kdiff3-1.8.2.tar.xz 1039304 BLAKE2B de4052117bdade42fc489cf35ed9f4af4dfe8c1704dea36f2fa36ee8b14b4dd355052d0e9cdc0f32de9dde81e74862d1c10f7fcdde12db8f5e68d4e377e6f5f1 SHA512 c52dea38b8fa483344a840fb0f6eab04fdeb2dfc5f2a554f9fc095ed175c45f4c355fe7f04dceca4446ac483a1e97db2a296b947fb99315fc388a45e6298d7f0 -EBUILD kdiff3-1.8.1.ebuild 1054 BLAKE2B 1bff7351f34da73d8c82d07b4b972cac8e21f8de078c0c83e75edf0662b6a864d57ef905b96626effc4763867341682c51ca8f222ac2a0064769f7ea7709aa6a SHA512 51d24576467b95aac99a971a92822120b3c79ddb4edbd5686ead5a020585aa38f0e155766fcd4142820809a233aad3b67a8522e5fcb3aa4d455185ba6dad6010 -EBUILD kdiff3-1.8.2.ebuild 1056 BLAKE2B 2e29d6bba44e4da1a0cb42888bba11ef508870dee12232a23c7c93946df0c736dabddaa6eacaadcfa9d6000df3d0de75d7e8014d35cb69d8d98c7dd80a5f04fa SHA512 334afa2eb16cbbd48fee448a73a5246cfb4e6581bc2c0f3d16f0a7aec4adc34d1e9e3439745efbdf1fbe71a19e4c006003197a1080f03ef34ac5cb56b485c061 +EBUILD kdiff3-1.8.2-r1.ebuild 1092 BLAKE2B 9e32869ac25e4341b2604e001a6e7079ea02487d5a5349756fb7931e1554327814a22295978448a0bc164abd56cbcfa0991d4886b5cded7c19a8d8880207d06c SHA512 624c8c8d282bdcf5d0797b795decc55fbe558a590e240586967f064623281444a8f722c1a0d66db8eca3de22a058288bd14601d686afec33068c20aa29399e15 MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100 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 new file mode 100644 index 000000000000..b1d00a12f47d --- /dev/null +++ b/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch @@ -0,0 +1,36 @@ +From 643edc26bcc8f8e083a97e87c2686f62ffd01f31 Mon Sep 17 00:00:00 2001 +From: Christoph Feck +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.1.ebuild b/kde-misc/kdiff3/kdiff3-1.8.1.ebuild deleted file mode 100644 index 24aa5f576d3d..000000000000 --- a/kde-misc/kdiff3/kdiff3-1.8.1.ebuild +++ /dev/null @@ -1,40 +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 - !kde-misc/kdiff3:4 -" diff --git a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild b/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild new file mode 100644 index 000000000000..0659672ef390 --- /dev/null +++ b/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild @@ -0,0 +1,41 @@ +# 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.2.ebuild b/kde-misc/kdiff3/kdiff3-1.8.2.ebuild deleted file mode 100644 index 64b665a240e6..000000000000 --- a/kde-misc/kdiff3/kdiff3-1.8.2.ebuild +++ /dev/null @@ -1,40 +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 - !kde-misc/kdiff3:4 -" -- cgit v1.2.3