[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/

[Andreas Sturmlechner]

commit:     c23324df98b0e94a198c2fad530c3a470dcb39f7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  6 20:14:07 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb  6 21:16:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c23324df

kde-plasma/plasma-workspace: Fix kcmfontinst/wallpaperplugin ProvidersUrl

See also:
https://mail.kde.org/pipermail/distributions/2022-February/001124.html
https://mail.kde.org/pipermail/distributions/2022-February/001129.html
https://mail.kde.org/pipermail/distributions/2022-February/001133.html

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...space-5.23.5-fix-kcmfontinst-ProvidersUrl.patch | 28 +++++++++++++++++++++
 ...e-5.23.5-fix-wallpaperplugin-ProvidersUrl.patch | 29 ++++++++++++++++++++++
 ....5.ebuild => plasma-workspace-5.23.5-r1.ebuild} |  4 +++
 ...0.ebuild => plasma-workspace-5.23.90-r1.ebuild} |  4 +++
 4 files changed, 65 insertions(+)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-kcmfontinst-ProvidersUrl.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-kcmfontinst-ProvidersUrl.patch
new file mode 100644
index 000000000000..e546f46d6b7f
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-kcmfontinst-ProvidersUrl.patch
@@ -0,0 +1,28 @@
+From 8c11f207e2bbf0f98488de7066bd3698705f20e1 Mon Sep 17 00:00:00 2001
+From: Ben Cooksley <bcooksley@×××.org>
+Date: Mon, 7 Feb 2022 06:44:47 +1300
+Subject: [PATCH] Use the correct endpoint for this - hosted by a CDN and
+ therefore capable of handling much greater volumes of traffic.
+
+CCMAIL: plasma-devel@×××.org
+CCMAIL: distributions@×××.org
+---
+ kcms/kfontinst/kcmfontinst/kfontinst.knsrc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kcms/kfontinst/kcmfontinst/kfontinst.knsrc b/kcms/kfontinst/kcmfontinst/kfontinst.knsrc
+index deaf1e08f..932bc8802 100644
+--- a/kcms/kfontinst/kcmfontinst/kfontinst.knsrc
++++ b/kcms/kfontinst/kcmfontinst/kfontinst.knsrc
+@@ -41,7 +41,7 @@ Name[vi]=Phông chữ
+ Name[x-test]=xxFontsxx
+ Name[zh_CN]=字体
+ 
+-ProvidersUrl=https://distribute.kde.org/khotnewstuff/fonts-providers.xml
++ProvidersUrl=https://cdn.kde.org/khotnewstuff/v1/fonts-providers.xml
+ Categories=KDE-Look.org Fonts
+ TargetDir=kfontinst
+ Uncompress=archive
+-- 
+GitLab
+

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-wallpaperplugin-ProvidersUrl.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-wallpaperplugin-ProvidersUrl.patch
new file mode 100644
index 000000000000..3bf9315facfc
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-wallpaperplugin-ProvidersUrl.patch
@@ -0,0 +1,29 @@
+From b49a102074087e6680f330fcf61cebdeeac306b7 Mon Sep 17 00:00:00 2001
+From: Ben Cooksley <bcooksley@×××.org>
+Date: Mon, 7 Feb 2022 06:25:33 +1300
+Subject: [PATCH] Purge all references to download.kde.org, replacing them with
+ the correct endpoint of autoconfig.kde.org.
+
+CCMAIL: plasma-devel@×××.org
+CCMAIL: distributions@×××.org
+(cherry picked from commit 1ab87dbf43bb51f21e2cd9e0188cb482a541734b)
+---
+ components/shellprivate/wallpaperplugin.knsrc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/components/shellprivate/wallpaperplugin.knsrc b/components/shellprivate/wallpaperplugin.knsrc
+index 1495b6e27..3ed59f75d 100644
+--- a/components/shellprivate/wallpaperplugin.knsrc
++++ b/components/shellprivate/wallpaperplugin.knsrc
+@@ -42,7 +42,7 @@ Name[x-test]=xxWallpaper Pluginsxx
+ Name[zh_CN]=壁纸插件
+ Name[zh_TW]=桌布外掛程式
+ 
+-ProvidersUrl=https://download.kde.org/ocs/providers.xml
++ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
+ Categories=Plasma Wallpaper Plugin
+ StandardResource=tmp
+ Uncompress=kpackage
+-- 
+GitLab
+

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r1.ebuild
similarity index 96%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.23.5.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r1.ebuild
index 204a23153bd8..ad412dd4223b 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r1.ebuild
@@ -150,6 +150,10 @@ PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 PATCHES=(
 	"${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
 	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+	# https://mail.kde.org/pipermail/distributions/2022-February/001129.html
+	"${FILESDIR}/${P}-fix-wallpaperplugin-ProvidersUrl.patch"
+	# https://mail.kde.org/pipermail/distributions/2022-February/001133.html
+	"${FILESDIR}/${P}-fix-kcmfontinst-ProvidersUrl.patch"
 )
 
 src_prepare() {

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.90.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.90-r1.ebuild
similarity index 95%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.23.90.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.23.90-r1.ebuild
index dbfb0482e579..668bab11a619 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.90.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.23.90-r1.ebuild
@@ -151,6 +151,10 @@ PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 PATCHES=(
 	"${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
 	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+	# https://mail.kde.org/pipermail/distributions/2022-February/001129.html
+	"${FILESDIR}/${PN}-5.23.5-fix-wallpaperplugin-ProvidersUrl.patch"
+	# https://mail.kde.org/pipermail/distributions/2022-February/001133.html
+	"${FILESDIR}/${PN}-5.23.5-fix-kcmfontinst-ProvidersUrl.patch"
 )
 
 src_prepare() {