1 |
commit: eed9956e8208611964ff7d3e1bc4a1f0c994f1f3 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 3 20:39:41 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 3 20:39:41 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed9956e |
7 |
|
8 |
kde-misc/kdiff3: Drop 1.9.2 |
9 |
|
10 |
Package-Manager: Portage-3.0.26, Repoman-3.0.3 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
kde-misc/kdiff3/Manifest | 1 - |
14 |
kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch | 24 -------------- |
15 |
kde-misc/kdiff3/kdiff3-1.9.2.ebuild | 43 -------------------------- |
16 |
3 files changed, 68 deletions(-) |
17 |
|
18 |
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest |
19 |
index 0aa8008f32f..a68ab0203c4 100644 |
20 |
--- a/kde-misc/kdiff3/Manifest |
21 |
+++ b/kde-misc/kdiff3/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST kdiff3-1.9.2.tar.xz 1053404 BLAKE2B 96d499a243921aed7fe51292cb8f88b9236949297a5ca9c271735ff2d80c70a8b6d864ed1bab6b55a52da34e2c8bd819cb9738694531f183ddce442c1edd1511 SHA512 3e233cd934d1e21ac1492f928c1d9517c913b1163812e80c5f6f10c4387a82ad18edf5a2153513edf7136358571169735b55fa13ea3512113b22d750156af6a8 |
24 |
DIST kdiff3-1.9.3.tar.xz 1056920 BLAKE2B d32e60cbc8d41339dff9a91fe5a2c739a38dc856a0adc575fa0e777c921d40effb1f27b34d7a127a4aff95b10436ddafd7f3db63912c2def85307e1e46ea9964 SHA512 9d806efa5d92375bc0dd2014492e924a7f26c12fde0e89bb58f076a249dba83fd316253cfd53235eaaae26f29d37c730c5728de1c7de869532fc9c38190412d5 |
25 |
|
26 |
diff --git a/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch b/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch |
27 |
deleted file mode 100644 |
28 |
index 581b487503e..00000000000 |
29 |
--- a/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch |
30 |
+++ /dev/null |
31 |
@@ -1,24 +0,0 @@ |
32 |
-From 0476b1daa73159aec411c7f10da6f313294f0e38 Mon Sep 17 00:00:00 2001 |
33 |
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@××××××××××××××××××.com> |
34 |
-Date: Tue, 4 May 2021 19:21:46 +0200 |
35 |
-Subject: [PATCH] Explicitly include <limits> for compatibility with gcc-11 |
36 |
- |
37 |
---- |
38 |
- src/TypeUtils.h | 1 + |
39 |
- 1 file changed, 1 insertion(+) |
40 |
- |
41 |
-diff --git a/src/TypeUtils.h b/src/TypeUtils.h |
42 |
-index c072681..f0ab9c2 100644 |
43 |
---- a/src/TypeUtils.h |
44 |
-+++ b/src/TypeUtils.h |
45 |
-@@ -9,6 +9,7 @@ |
46 |
- |
47 |
- #include <stdlib.h> |
48 |
- #include <type_traits> |
49 |
-+#include <limits> |
50 |
- |
51 |
- #include <QtGlobal> |
52 |
- |
53 |
--- |
54 |
-GitLab |
55 |
- |
56 |
|
57 |
diff --git a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild b/kde-misc/kdiff3/kdiff3-1.9.2.ebuild |
58 |
deleted file mode 100644 |
59 |
index 82515f73d04..00000000000 |
60 |
--- a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild |
61 |
+++ /dev/null |
62 |
@@ -1,43 +0,0 @@ |
63 |
-# Copyright 1999-2021 Gentoo Authors |
64 |
-# Distributed under the terms of the GNU General Public License v2 |
65 |
- |
66 |
-EAPI=7 |
67 |
- |
68 |
-ECM_HANDBOOK="optional" |
69 |
-KFMIN=5.74.0 |
70 |
-QTMIN=5.15.2 |
71 |
-VIRTUALX_REQUIRED="test" |
72 |
-inherit ecm kde.org |
73 |
- |
74 |
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks" |
75 |
-HOMEPAGE="https://apps.kde.org/kdiff3/ https://userbase.kde.org/KDiff3" |
76 |
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" |
77 |
- |
78 |
-LICENSE="GPL-2" |
79 |
-SLOT="5" |
80 |
-KEYWORDS="amd64 ~arm64 ~ppc64 x86" |
81 |
-IUSE="" |
82 |
- |
83 |
-COMMON_DEPEND=" |
84 |
- >=dev-qt/qtgui-${QTMIN}:5 |
85 |
- >=dev-qt/qtprintsupport-${QTMIN}:5 |
86 |
- >=dev-qt/qtwidgets-${QTMIN}:5 |
87 |
- >=kde-frameworks/kconfig-${KFMIN}:5 |
88 |
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
89 |
- >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
90 |
- >=kde-frameworks/kcrash-${KFMIN}:5 |
91 |
- >=kde-frameworks/ki18n-${KFMIN}:5 |
92 |
- >=kde-frameworks/kio-${KFMIN}:5 |
93 |
- >=kde-frameworks/kparts-${KFMIN}:5 |
94 |
- >=kde-frameworks/ktextwidgets-${KFMIN}:5 |
95 |
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
96 |
- >=kde-frameworks/kxmlgui-${KFMIN}:5 |
97 |
-" |
98 |
-DEPEND="${COMMON_DEPEND} |
99 |
- dev-libs/boost |
100 |
-" |
101 |
-RDEPEND="${COMMON_DEPEND} |
102 |
- sys-apps/diffutils |
103 |
-" |
104 |
- |
105 |
-PATCHES=( "${FILESDIR}/${PN}-1.9.0-gcc11.patch" ) # bug 788058, git master |