Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/akregator/, kde-apps/akregator/files/
Date: Fri, 23 Apr 2021 20:26:43
Message-Id: 1619209579.8824f7057abeb35a40c27d55333cc77ab247a268.asturm@gentoo
1 commit: 8824f7057abeb35a40c27d55333cc77ab247a268
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 23 19:51:35 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 23 20:26:19 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8824f705
7
8 kde-apps/akregator: Fix upstream dependencies
9
10 Bug: https://bugs.gentoo.org/783921
11 Package-Manager: Portage-3.0.18, Repoman-3.0.3
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 kde-apps/akregator/akregator-21.04.0.ebuild | 2 ++
15 kde-apps/akregator/akregator-21.04.49.9999.ebuild | 2 ++
16 .../files/akregator-21.04.0-fix-dependencies.patch | 26 ++++++++++++++++++++++
17 3 files changed, 30 insertions(+)
18
19 diff --git a/kde-apps/akregator/akregator-21.04.0.ebuild b/kde-apps/akregator/akregator-21.04.0.ebuild
20 index 8f7401d369..d6d4f438d4 100644
21 --- a/kde-apps/akregator/akregator-21.04.0.ebuild
22 +++ b/kde-apps/akregator/akregator-21.04.0.ebuild
23 @@ -55,6 +55,8 @@ DEPEND="${RDEPEND}
24 dev-libs/grantlee:5
25 "
26
27 +PATCHES=( "${FILESDIR}/${P}-fix-dependencies.patch" ) # bug 783921
28 +
29 src_configure() {
30 local mycmakeargs=(
31 $(cmake_use_find_package telemetry KUserFeedback)
32
33 diff --git a/kde-apps/akregator/akregator-21.04.49.9999.ebuild b/kde-apps/akregator/akregator-21.04.49.9999.ebuild
34 index b5e57b06fb..ad70698228 100644
35 --- a/kde-apps/akregator/akregator-21.04.49.9999.ebuild
36 +++ b/kde-apps/akregator/akregator-21.04.49.9999.ebuild
37 @@ -55,6 +55,8 @@ DEPEND="${RDEPEND}
38 dev-libs/grantlee:5
39 "
40
41 +PATCHES=( "${FILESDIR}/${PN}-21.04.0-fix-dependencies.patch" ) # bug 783921
42 +
43 src_configure() {
44 local mycmakeargs=(
45 $(cmake_use_find_package telemetry KUserFeedback)
46
47 diff --git a/kde-apps/akregator/files/akregator-21.04.0-fix-dependencies.patch b/kde-apps/akregator/files/akregator-21.04.0-fix-dependencies.patch
48 new file mode 100644
49 index 0000000000..4455b10fbd
50 --- /dev/null
51 +++ b/kde-apps/akregator/files/akregator-21.04.0-fix-dependencies.patch
52 @@ -0,0 +1,26 @@
53 +From 2f8cd478df76c029d20870364dae577fe1bf82e5 Mon Sep 17 00:00:00 2001
54 +From: Andreas Sturmlechner <asturm@g.o>
55 +Date: Fri, 23 Apr 2021 21:45:33 +0200
56 +Subject: [PATCH] Find KF5TextWidgets instead of KF5TextEditor
57 +
58 +Signed-off-by: Andreas Sturmlechner <asturm@g.o>
59 +---
60 + CMakeLists.txt | 2 +-
61 + 1 file changed, 1 insertion(+), 1 deletion(-)
62 +
63 +diff --git a/CMakeLists.txt b/CMakeLists.txt
64 +index ef9d3084..04f14929 100644
65 +--- a/CMakeLists.txt
66 ++++ b/CMakeLists.txt
67 +@@ -62,7 +62,7 @@ find_package(KF5DocTools ${KF5_MIN_VERSION} REQUIRED)
68 + find_package(KF5KCMUtils ${KF5_MIN_VERSION} CONFIG REQUIRED)
69 + find_package(KF5NotifyConfig ${KF5_MIN_VERSION} CONFIG REQUIRED)
70 + find_package(KF5Parts ${KF5_MIN_VERSION} CONFIG REQUIRED)
71 +-find_package(KF5TextEditor ${KF5_MIN_VERSION} CONFIG REQUIRED)
72 ++find_package(KF5TextWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED)
73 + find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED)
74 + find_package(KF5Notifications ${KF5_MIN_VERSION} CONFIG REQUIRED)
75 + find_package(KF5Syndication ${KF5_MIN_VERSION} CONFIG REQUIRED)
76 +--
77 +2.31.1
78 +