commit: df833d89c3dfab0333492ab869e70d4b8316a48f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Dec 12 20:25:23 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Dec 12 21:44:41 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df833d89
kde-misc/kdiff3: add 1.12.0 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-misc/kdiff3/Manifest | 1 + .../kdiff3/files/kdiff3-1.12.0-bogus-dep.patch | 27 ++++++++++++++ kde-misc/kdiff3/kdiff3-1.12.0.ebuild | 43 ++++++++++++++++++++++ 3 files changed, 71 insertions(+) diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest index 16f0070da299..99079d2316a0 100644 --- a/kde-misc/kdiff3/Manifest +++ b/kde-misc/kdiff3/Manifest @@ -1,2 +1,3 @@ DIST kdiff3-1.11.4.tar.xz 1142276 BLAKE2B c3c15b454a403613f84b24fff9c6ba06be54c7225232d6ea430641a492625b500b8dd735c06d2dd9ff30d64e3268fd74e98953731804079169dcc5ee609ac483 SHA512 3e3d7d93bb86ce5cd644f1e22209679ed3f83037a6f465d6a4f7b652e229da28b8f738a7239f60168c2d95c7f2c465bfdf9d716532d6048b4c0721ac458fddc5 DIST kdiff3-1.11.5.tar.xz 1142840 BLAKE2B 9504049ecf82ddf020d40e2945c2d132149c4a082834523c8e6b44dbd787c37b0addf7ab920dcec80acbfffcfced3c6ebff0bd2476145b1b36622590814ec166 SHA512 1779209a8094d313fd57df08c873c690df9e17034dc6de09c4cde0921df3ec205ef483554843ed0235b6f2c5264db66049fdf9a422b627c949c4fc1f65fb19d3 +DIST kdiff3-1.12.0.tar.xz 1204256 BLAKE2B c320acc411fa6dd470657cec63d1c04611a78bcab3bd1501339cde11798098b0d5369eb10e8357677547ce27ded5fe4171b741c7413c4f53b6c5e9cd9301bd46 SHA512 d409f3be076ee2a4a736c201fe7b509304b29a843490b6e60b5f2e221dc34c5d78ba717e08c4ce053f9af28c6750c600658a84853e0ed5591161320e3bcef631 diff --git a/kde-misc/kdiff3/files/kdiff3-1.12.0-bogus-dep.patch b/kde-misc/kdiff3/files/kdiff3-1.12.0-bogus-dep.patch new file mode 100644 index 000000000000..982a0677a48a --- /dev/null +++ b/kde-misc/kdiff3/files/kdiff3-1.12.0-bogus-dep.patch @@ -0,0 +1,27 @@ +From b187d9235e466d5fc876dc513da2ed16c8bd7611 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Thu, 12 Dec 2024 01:46:44 +0100 +Subject: [PATCH] Drop unused Qt6Core5Compat + +Amends https://invent.kde.org/sdk/kdiff3/-/commit/342924de5000a2821736f2c4cd58f92c6ad9c159 + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 56f68e1a..4e61a6cb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -77,7 +77,6 @@ find_package( + Gui + Widgets + PrintSupport +- Core5Compat + ) + + find_package( +-- +GitLab + diff --git a/kde-misc/kdiff3/kdiff3-1.12.0.ebuild b/kde-misc/kdiff3/kdiff3-1.12.0.ebuild new file mode 100644 index 000000000000..2974e51dbd71 --- /dev/null +++ b/kde-misc/kdiff3/kdiff3-1.12.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +KFMIN=6.6.0 +QTMIN=6.7.2 +inherit ecm kde.org + +DESCRIPTION="Frontend to diff3 based on KDE Frameworks" +HOMEPAGE="https://apps.kde.org/kdiff3/ https://userbase.kde.org/KDiff3"; +SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="" + +COMMON_DEPEND=" + >=dev-libs/icu-70.0:= + >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/boost-1.82 +" +RDEPEND="${COMMON_DEPEND} + !${CATEGORY}/${PN}:5 + sys-apps/diffutils +" + +PATCHES=( "${FILESDIR}/${P}-bogus-dep.patch" ) + +# TODO: -DENABLE_GDBINDEX?
