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-plasma/kwin/files/, kde-plasma/kwin/
Date: Sun, 06 Feb 2022 21:17:17
Message-Id: 1644182196.90eb423988d9b3f94bef702e3b988e2e2c0f4cc8.asturm@gentoo
1 commit: 90eb423988d9b3f94bef702e3b988e2e2c0f4cc8
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 6 20:31:34 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 6 21:16:36 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90eb4239
7
8 kde-plasma/kwin: Fix 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/001127.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 .../kwin/files/kwin-5.23.5-fix-ProvidersUrl.patch | 71 ++++++++++++++++++++++
18 .../{kwin-5.23.5.ebuild => kwin-5.23.5-r1.ebuild} | 3 +
19 ...{kwin-5.23.90.ebuild => kwin-5.23.90-r1.ebuild} | 3 +
20 3 files changed, 77 insertions(+)
21
22 diff --git a/kde-plasma/kwin/files/kwin-5.23.5-fix-ProvidersUrl.patch b/kde-plasma/kwin/files/kwin-5.23.5-fix-ProvidersUrl.patch
23 new file mode 100644
24 index 000000000000..8829ec286f70
25 --- /dev/null
26 +++ b/kde-plasma/kwin/files/kwin-5.23.5-fix-ProvidersUrl.patch
27 @@ -0,0 +1,71 @@
28 +From c5c5f67f5d5ef2b4f7145f6586a8b3d8dba7fab5 Mon Sep 17 00:00:00 2001
29 +From: Ben Cooksley <bcooksley@×××.org>
30 +Date: Mon, 7 Feb 2022 06:12:40 +1300
31 +Subject: [PATCH] Purge all references to download.kde.org, replacing them with
32 + the correct endpoint of autoconfig.kde.org.
33 +
34 +CCMAIL: plasma-devel@×××.org
35 +CCMAIL: distributions@×××.org
36 +(cherry picked from commit a428630ea4a46e967de71711c8da5cbaeb9b690b)
37 +---
38 + src/kcmkwin/kwineffects/kwineffect.knsrc | 2 +-
39 + src/kcmkwin/kwinscripts/kwinscripts.knsrc | 2 +-
40 + src/kcmkwin/kwintabbox/kwinswitcher.knsrc | 2 +-
41 + src/plugins/kdecorations/aurorae/src/aurorae.knsrc.cmake | 2 +-
42 + 4 files changed, 4 insertions(+), 4 deletions(-)
43 +
44 +diff --git a/src/kcmkwin/kwineffects/kwineffect.knsrc b/src/kcmkwin/kwineffects/kwineffect.knsrc
45 +index 6abcfb34f8..22bd1c98ec 100644
46 +--- a/src/kcmkwin/kwineffects/kwineffect.knsrc
47 ++++ b/src/kcmkwin/kwineffects/kwineffect.knsrc
48 +@@ -45,7 +45,7 @@ Name[x-test]=xxWindow Manager Effectsxx
49 + Name[zh_CN]=窗口管理器特效
50 + Name[zh_TW]=視窗管理員效果
51 +
52 +-ProvidersUrl=https://download.kde.org/ocs/providers.xml
53 ++ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
54 + Categories=KWin Effects
55 + StandardResource=tmp
56 + Uncompress=kpackage
57 +diff --git a/src/kcmkwin/kwinscripts/kwinscripts.knsrc b/src/kcmkwin/kwinscripts/kwinscripts.knsrc
58 +index 44faa872ba..c002f0eec5 100644
59 +--- a/src/kcmkwin/kwinscripts/kwinscripts.knsrc
60 ++++ b/src/kcmkwin/kwinscripts/kwinscripts.knsrc
61 +@@ -44,7 +44,7 @@ Name[x-test]=xxWindow Manager Scriptsxx
62 + Name[zh_CN]=窗口管理器脚本
63 + Name[zh_TW]=視窗管理員指令稿
64 +
65 +-ProvidersUrl=https://download.kde.org/ocs/providers.xml
66 ++ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
67 + Categories=KWin Scripts
68 + StandardResource=tmp
69 + Uncompress=kpackage
70 +diff --git a/src/kcmkwin/kwintabbox/kwinswitcher.knsrc b/src/kcmkwin/kwintabbox/kwinswitcher.knsrc
71 +index bef9bc07ea..d0f5c3b520 100644
72 +--- a/src/kcmkwin/kwintabbox/kwinswitcher.knsrc
73 ++++ b/src/kcmkwin/kwintabbox/kwinswitcher.knsrc
74 +@@ -45,7 +45,7 @@ Name[x-test]=xxWindow Manager Switching Layoutsxx
75 + Name[zh_CN]=窗口管理器切换布局
76 + Name[zh_TW]=視窗切換器佈局
77 +
78 +-ProvidersUrl=https://download.kde.org/ocs/providers.xml
79 ++ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
80 + Categories=KWin Switching Layouts
81 + StandardResource=tmp
82 + Uncompress=kpackage
83 +diff --git a/src/plugins/kdecorations/aurorae/src/aurorae.knsrc.cmake b/src/plugins/kdecorations/aurorae/src/aurorae.knsrc.cmake
84 +index a773c28c52..d0c7748852 100644
85 +--- a/src/plugins/kdecorations/aurorae/src/aurorae.knsrc.cmake
86 ++++ b/src/plugins/kdecorations/aurorae/src/aurorae.knsrc.cmake
87 +@@ -40,7 +40,7 @@ Name[x-test]=xxAurorae Window Decorationsxx
88 + Name[zh_CN]=Aurorae 极光窗口装饰
89 + Name[zh_TW]=Aurorae 視窗裝飾
90 +
91 +-ProvidersUrl=https://download.kde.org/ocs/providers.xml
92 ++ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
93 + Categories=Window Decoration Aurorae
94 + Uncompress=archive
95 + TargetDir=aurorae/themes
96 +--
97 +GitLab
98 +
99
100 diff --git a/kde-plasma/kwin/kwin-5.23.5.ebuild b/kde-plasma/kwin/kwin-5.23.5-r1.ebuild
101 similarity index 96%
102 rename from kde-plasma/kwin/kwin-5.23.5.ebuild
103 rename to kde-plasma/kwin/kwin-5.23.5-r1.ebuild
104 index 6a8b24a358d7..daceebb79c40 100644
105 --- a/kde-plasma/kwin/kwin-5.23.5.ebuild
106 +++ b/kde-plasma/kwin/kwin-5.23.5-r1.ebuild
107 @@ -97,6 +97,9 @@ DEPEND="${COMMON_DEPEND}
108 "
109 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
110
111 +# https://mail.kde.org/pipermail/distributions/2022-February/001127.html
112 +PATCHES=( "${FILESDIR}/${P}-fix-ProvidersUrl.patch" )
113 +
114 src_prepare() {
115 ecm_src_prepare
116 use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
117
118 diff --git a/kde-plasma/kwin/kwin-5.23.90.ebuild b/kde-plasma/kwin/kwin-5.23.90-r1.ebuild
119 similarity index 96%
120 rename from kde-plasma/kwin/kwin-5.23.90.ebuild
121 rename to kde-plasma/kwin/kwin-5.23.90-r1.ebuild
122 index 92235562b5a5..6f373b80731f 100644
123 --- a/kde-plasma/kwin/kwin-5.23.90.ebuild
124 +++ b/kde-plasma/kwin/kwin-5.23.90-r1.ebuild
125 @@ -98,6 +98,9 @@ DEPEND="${COMMON_DEPEND}
126 "
127 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
128
129 +# https://mail.kde.org/pipermail/distributions/2022-February/001127.html
130 +PATCHES=( "${FILESDIR}/${PN}-5.23.5-fix-ProvidersUrl.patch" )
131 +
132 src_prepare() {
133 ecm_src_prepare
134 use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"