Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/, kde-apps/dolphin/files/
Date: Sun, 06 Feb 2022 21:17:16
Message-Id: 1644182193.ad38b38964f572f4f13aa5542ed2c49e4600ac77.asturm@gentoo
1 commit: ad38b38964f572f4f13aa5542ed2c49e4600ac77
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 6 18:31:41 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 6 21:16:33 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad38b389
7
8 kde-apps/dolphin: Fix KNewStuff3 ProvidersUrl
9
10 See also:
11 https://mail.kde.org/pipermail/distributions/2022-February/001124.html
12 https://mail.kde.org/pipermail/distributions/2022-February/001128.html
13
14 Package-Manager: Portage-3.0.30, Repoman-3.0.3
15 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
16
17 ...in-21.08.3.ebuild => dolphin-21.08.3-r1.ebuild} | 4 +++-
18 .../files/dolphin-21.08.3-fix-ProvidersUrl.patch | 27 ++++++++++++++++++++++
19 2 files changed, 30 insertions(+), 1 deletion(-)
20
21 diff --git a/kde-apps/dolphin/dolphin-21.08.3.ebuild b/kde-apps/dolphin/dolphin-21.08.3-r1.ebuild
22 similarity index 95%
23 rename from kde-apps/dolphin/dolphin-21.08.3.ebuild
24 rename to kde-apps/dolphin/dolphin-21.08.3-r1.ebuild
25 index 9160d9e3ad2d..d4a96ad6d8a2 100644
26 --- a/kde-apps/dolphin/dolphin-21.08.3.ebuild
27 +++ b/kde-apps/dolphin/dolphin-21.08.3-r1.ebuild
28 @@ -1,4 +1,4 @@
29 -# Copyright 1999-2021 Gentoo Authors
30 +# Copyright 1999-2022 Gentoo Authors
31 # Distributed under the terms of the GNU General Public License v2
32
33 EAPI=8
34 @@ -63,6 +63,8 @@ RDEPEND="${DEPEND}
35
36 PATCHES=(
37 "${FILESDIR}/${PN}-21.08.1-port-to-KTerminalLauncherJob.patch" # KDE-bug 441072
38 + # https://mail.kde.org/pipermail/distributions/2022-February/001128.html
39 + "${FILESDIR}/${PN}-21.08.3-fix-ProvidersUrl.patch"
40 )
41
42 src_configure() {
43
44 diff --git a/kde-apps/dolphin/files/dolphin-21.08.3-fix-ProvidersUrl.patch b/kde-apps/dolphin/files/dolphin-21.08.3-fix-ProvidersUrl.patch
45 new file mode 100644
46 index 000000000000..74472fd0943d
47 --- /dev/null
48 +++ b/kde-apps/dolphin/files/dolphin-21.08.3-fix-ProvidersUrl.patch
49 @@ -0,0 +1,27 @@
50 +From d0898592a17d14fc8d48fc5cba71f3d57f0a1856 Mon Sep 17 00:00:00 2001
51 +From: Ben Cooksley <bcooksley@×××.org>
52 +Date: Thu, 30 Dec 2021 07:31:41 +1300
53 +Subject: [PATCH] Use the CDN based endpoint rather than the legacy endpoint
54 + which hits our download redirector.
55 +
56 +CCMAIL: distributions@×××.org
57 +
58 +(cherry picked from commit 694e4e24526c5f55e162ad9288782e7c82cac38f)
59 +---
60 + src/settings/contextmenu/servicemenu.knsrc | 2 +-
61 + 1 file changed, 1 insertion(+), 1 deletion(-)
62 +
63 +diff --git a/src/settings/contextmenu/servicemenu.knsrc b/src/settings/contextmenu/servicemenu.knsrc
64 +index 59d459895..4374082c7 100644
65 +--- a/src/settings/contextmenu/servicemenu.knsrc
66 ++++ b/src/settings/contextmenu/servicemenu.knsrc
67 +@@ -1,5 +1,5 @@
68 + [KNewStuff3]
69 +-ProvidersUrl=https://download.kde.org/ocs/providers.xml
70 ++ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
71 + Categories=Dolphin Service Menus
72 + TargetDir=servicemenu-download
73 + Uncompress=never
74 +--
75 +GitLab
76 +