summaryrefslogtreecommitdiff
path: root/kde-frameworks
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2021-10-08 23:06:07 +0100
committerV3n3RiX <venerix@koprulu.sector>2021-10-08 23:06:07 +0100
commite23a08d0c97a0cc415aaa165da840b056f93c997 (patch)
tree4c5f7db60483518201fef36f8cc0712789a08db2 /kde-frameworks
parent391b5b359a346aff490103da7dddc85047f83830 (diff)
gentoo resync : 08.10.2021
Diffstat (limited to 'kde-frameworks')
-rw-r--r--kde-frameworks/Manifest.gzbin13547 -> 13553 bytes
-rw-r--r--kde-frameworks/attica/Manifest3
-rw-r--r--kde-frameworks/attica/attica-5.86.0-r1.ebuild (renamed from kde-frameworks/attica/attica-5.86.0.ebuild)2
-rw-r--r--kde-frameworks/attica/files/attica-5.86.0-fetch-categories.xml-only-once.patch68
-rw-r--r--kde-frameworks/breeze-icons/Manifest2
-rw-r--r--kde-frameworks/breeze-icons/breeze-icons-5.86.0.ebuild7
-rw-r--r--kde-frameworks/kguiaddons/Manifest4
-rw-r--r--kde-frameworks/kguiaddons/kguiaddons-5.85.0-r1.ebuild (renamed from kde-frameworks/kguiaddons/kguiaddons-5.85.0.ebuild)4
-rw-r--r--kde-frameworks/kguiaddons/kguiaddons-5.86.0-r1.ebuild (renamed from kde-frameworks/kguiaddons/kguiaddons-5.86.0.ebuild)4
-rw-r--r--kde-frameworks/knewstuff/Manifest3
-rw-r--r--kde-frameworks/knewstuff/files/knewstuff-5.86.0-include-user-agent-on-KNS-requests.patch58
-rw-r--r--kde-frameworks/knewstuff/knewstuff-5.86.0-r2.ebuild (renamed from kde-frameworks/knewstuff/knewstuff-5.86.0-r1.ebuild)5
12 files changed, 152 insertions, 8 deletions
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 5f7314bc0180..d62d84d148da 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
Binary files differ
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index 16dc26784f5f..141fa343dfea 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,5 +1,6 @@
+AUX attica-5.86.0-fetch-categories.xml-only-once.patch 2156 BLAKE2B da3a18472e18e2ac1866242ff89bbdb65a1f207e5630306e45953c9dbe7df9ec8e380bb38fa3ebcb13b6bdf2f36344d54b5576a5431776db54c13191ad795df9 SHA512 40b51d7e1c5f42c2b97bea1c20704c3e740357f094745669a33773b696e309a15c7f21abf4a7a5e61fa87c64e23e70bf4c98fc381ce38ae8045f7d2cead3f506
DIST attica-5.85.0.tar.xz 66672 BLAKE2B 61e3ca48058f615af27fd7ad226c2a3ad6a05ae6edb1e1e59ed4dded937ec24a5115780fe128011bb983d83d3d7e3603a1780a5b15dadbceb95165f05e2fd1e6 SHA512 a6f64c51bd0b6a8eb739db198b6db7f5c91f3276912a0bba8b20bbca526738b6e8baea24e6f4502cd0f96b1fc704f4a61445dde0acd645776052527d376215bc
DIST attica-5.86.0.tar.xz 66608 BLAKE2B 631c6c779a931ad8bd12cc48db707463ffba69b1f7f003c85dd0e619362dcc53e2ee7a31467f60b87380ef8ae5441138b16a88df630789925f3859a2e4881219 SHA512 aff74d1bbde5ad10f007f3f51f7bf0346746fd6fd5ca37745001257a72b04bb02a08bd61f03891edc13fbb11975833d1fa1ced6dcc116f9435a544dc9e6d5d47
EBUILD attica-5.85.0.ebuild 474 BLAKE2B 69014551eac7b2fc88654885770f6a8f8da75610d8cbbee26f3636da90298c89fd90a3b94d53306a3ecc96420db7e1f973c9f374a540bc2badc83e83df11640c SHA512 6fe63eb1f450893872ace7783150df0f63f4dfe16b28154408a3c7eaaed48f2173aa9fd33fb1eb783cc0844acad28362457d7f9c8fb5eb308aacc59d07986d6e
-EBUILD attica-5.86.0.ebuild 477 BLAKE2B a317b99cf0e08a4bd81bbae69d2829f73bd23fcda698c01e96ffc5733eb3d4fef461dc29b05e88503e5fcafe42ad539424d416b0ccce2a1a1f36224c0f582e97 SHA512 ebe9f550ff6bd301ba3ceac3be6bb1ce2394a58b8370d46f68e6a80f3596df309e1ac49c7b5275a5e4ddc62682e285f91215f4635e708abfa61b91920f52c8b1
+EBUILD attica-5.86.0-r1.ebuild 546 BLAKE2B d954004c2a9bb828591c81eaee4e80a035e56937e0b03b1de9423de2ed10f7f238b3289c217febf9af32564da42a1bb5336f94915e553c1f467c2e8050ebb973 SHA512 7364a3b7002eb0bfcf9132165ead7dcafcb55af8827643f693c34f91c18ec67b149a217d42ff8e90692c0759f9e85cb75112661f4488a13c778a49e2fc12da5f
MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/attica/attica-5.86.0.ebuild b/kde-frameworks/attica/attica-5.86.0-r1.ebuild
index b126db32d6af..d920df50fa1f 100644
--- a/kde-frameworks/attica/attica-5.86.0.ebuild
+++ b/kde-frameworks/attica/attica-5.86.0-r1.ebuild
@@ -16,6 +16,8 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/${P}-fetch-categories.xml-only-once.patch" )
+
src_test() {
# requires network access, bug #661230
local myctestargs=(
diff --git a/kde-frameworks/attica/files/attica-5.86.0-fetch-categories.xml-only-once.patch b/kde-frameworks/attica/files/attica-5.86.0-fetch-categories.xml-only-once.patch
new file mode 100644
index 000000000000..75f7f75b6e91
--- /dev/null
+++ b/kde-frameworks/attica/files/attica-5.86.0-fetch-categories.xml-only-once.patch
@@ -0,0 +1,68 @@
+commit 7c38c8cf28a4d0d667e23ddfaaf38a955d65bf3e
+Author: Aleix Pol <aleixpol@kde.org>
+Date: Wed Sep 22 16:19:39 2021 +0200
+
+ Ensure categories.xml is only fetched once in parallel
+
+ Otherwise we overload the server that is returning them fairly slowly
+ anyway (2 to 3 seconds?). It seems like it serves these sequentially as
+ well, which makes Discover startup stuttery.
+
+diff --git a/src/atticabasejob.cpp b/src/atticabasejob.cpp
+index 99acf4f..e65d556 100644
+--- a/src/atticabasejob.cpp
++++ b/src/atticabasejob.cpp
+@@ -26,6 +26,7 @@ public:
+ PlatformDependent *m_internals;
+ QNetworkReply *m_reply;
+ bool aborted{false};
++ bool started = false;
+
+ Private(PlatformDependent *internals)
+ : m_internals(internals)
+@@ -120,7 +121,10 @@ void BaseJob::dataFinished()
+
+ void BaseJob::start()
+ {
+- QTimer::singleShot(0, this, &BaseJob::doWork);
++ if (!d->started) {
++ d->started = true;
++ QTimer::singleShot(0, this, &BaseJob::doWork);
++ }
+ }
+
+ void BaseJob::doWork()
+diff --git a/src/provider.cpp b/src/provider.cpp
+index 9e4da64..b994ce9 100644
+--- a/src/provider.cpp
++++ b/src/provider.cpp
+@@ -64,6 +64,7 @@
+ #include <QFile>
+ #include <QNetworkAccessManager>
+ #include <QNetworkReply>
++#include <QThreadStorage>
+ #include <QUrlQuery>
+
+ using namespace Attica;
+@@ -1134,8 +1135,18 @@ ListJob<Category> *Provider::requestCategories()
+ return nullptr;
+ }
+
+- QUrl url = createUrl(QLatin1String("content/categories"));
+- ListJob<Category> *job = new ListJob<Category>(d->m_internals, createRequest(url));
++ const QUrl url = createUrl(QLatin1String("content/categories"));
++
++ // Thread-local cache of categories requests. They are fairly slow and block startup
++ static QThreadStorage<QHash<QUrl, ListJob<Category> *>> reqs;
++ ListJob<Category> *job = reqs.localData().value(url);
++ if (!job) {
++ job = new ListJob<Category>(d->m_internals, createRequest(url));
++ QObject::connect(job, &BaseJob::finished, [url] {
++ reqs.localData().remove(url);
++ });
++ reqs.localData().insert(url, job);
++ }
+ return job;
+ }
+
+
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index da2332f501ab..6cc7aa17ba6a 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,5 +1,5 @@
DIST breeze-icons-5.85.0.tar.xz 2051056 BLAKE2B 443edc464db1248ffef50e64fe8d680e9e854ad6f389861cff242c1a174cd05ac7c77cf172ac96510fa55869d8d9657eb6a99db730b86cf7de1892dabae2f23d SHA512 78be4cdf9701d92a5e8f405bceb64334c84008cb63c08af861e7d7424e08970d07f9f8320df2e66ae3468860424792c55b26299c14cb4cf347cfd65f513ab363
DIST breeze-icons-5.86.0.tar.xz 2065564 BLAKE2B 5f88fc9842a58f03a945c9a4aa1ee200549e32fd60184f0d8672e119cdab00c2546a74394ad6c384a57454ebd3dbb862583dbd9b769b773fe053a8fa628fdb35 SHA512 683e8a2b7ea5a2e79875de09516b3133e8cb4ddf03d97c8dc09dca59175b333bdb2edabf807dbef53c42e2626e46894185ee471c8c0bde7ce182dc88a2096fe7
EBUILD breeze-icons-5.85.0.ebuild 949 BLAKE2B bab86c354c440ed3e2d42beed870b026492e31dee862301b58456833910a05c9b9163d755bab23a88883fdba0e9f76a32da7fbe72b9974c4c00be9afcfe5fcf4 SHA512 3ebae5cc471e72aab4fe2fe65785aa3937c1b471c687484350dbd3dc4e38595b00a9dda72bc85c43be4bef8f82144225c048709590cedb8bf1b3aea6ead9f3b5
-EBUILD breeze-icons-5.86.0.ebuild 952 BLAKE2B f6ae242001a8e5892419ecef6e4dc8b66bc34467250dcdae5924f15fd1da313abea70369e4d8ba4c84f21e8f61351bea6b330a74f00b4ee0492b02af99f3aa34 SHA512 172509ef731cb5c7b152f902f4d48a75c88074f8d1c94c0c201703f2f053d00aa984e17261ad042edd0dc18400f06699076896ffd23d5c77abcfa7ffe585ee68
+EBUILD breeze-icons-5.86.0.ebuild 1120 BLAKE2B 1bcc55ea1ba4b0e0bb9d510f729db83185cafb2f928167ae9156827b2e7a9d8c1516d63ddb547e829905f3ff6a5fb6c98cff7e080eac9ea2e890c5532401b520 SHA512 adc8f74699401da887613fe5bf3c448bf9aac3c340068fca608248dee67b3ece39b060e88c6cced7907e20d39879e4ddb88ed901e7974b480fa4b23891111d4e
MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.86.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.86.0.ebuild
index 6d4a5b957a40..ef153169884c 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.86.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.86.0.ebuild
@@ -40,6 +40,13 @@ src_configure() {
cmake_src_configure
}
+src_install() {
+ cmake_src_install
+ # bug 770988
+ find "${ED}"/usr/share/icons/ -type d -empty -delete || die
+ find "${ED}"/usr/share/icons/ -xtype l -delete || die
+}
+
pkg_postinst() {
xdg_icon_cache_update
}
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index 31ab220842e6..bd9813b064c9 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,5 +1,5 @@
DIST kguiaddons-5.85.0.tar.xz 60620 BLAKE2B 11910055959a4d257969c665be64f6e1933ae7afcbfa16f3fd5e31503935ffe5b62188f0da7e0b9621cb158e01512c88eb07d7e2c4e6ec1600fa932157a08b53 SHA512 0f2b1f0201028da520ac0b04fd66c753a953a675cd29249bab79807b08739979601499530be119b5bda124bda4dd09e10c8e11b68d0bcaf8a1a2283e853cadc5
DIST kguiaddons-5.86.0.tar.xz 60736 BLAKE2B b0d64662023600c7d3dc7baadb4cae84a690f9c6caffdf791fb4dc950cb87d0e491a2d48d1a2a2bc0f7c372bcc18dfd80b44b92c02ab7b0378b6cacdea958b93 SHA512 24ecf0ee7c646bd5ac4f1072269e353a821d2af6e741f2a652765c5e098c6c2f5d2c62861600d587214cc5d864f1648998ef7ea95caa899d98e06c87c4ebc8b4
-EBUILD kguiaddons-5.85.0.ebuild 723 BLAKE2B 1f8c4463ccd09ca1ef0d94c1a6023537b42a72494968b5b12d57268384a58b78b74b7e8a9030bbb0ce9bbee28f488611b62dc08741640ebf462c4703af317327 SHA512 3003759d8dcdeeb72a19e80c9ef2cc71dfb46bdb14efd24690965bd90c382c39248c9a3bed6f8b4d9c21bb7326697c600c715434aea28b668d6d13b034423762
-EBUILD kguiaddons-5.86.0.ebuild 726 BLAKE2B 01bdd037323919aeaed97500ce787298251c73ecaf67c35284d0485c6faf5b809778a11c1341f7339966eab4bc3612c155a43f2f10b0a60dee011f7f2cac5537 SHA512 c6939afc245f804eadb0627025bf8eae5774f2cca535ff0367650ecd664a2a922763e2d3aa80f5b46d2192e0c20b3b27a97f9610aa8e7ff7f1260f8d1d00d219
+EBUILD kguiaddons-5.85.0-r1.ebuild 802 BLAKE2B 973821e44115bdd2f58ed0adf340386ab6e7a15746cb66fe2d23cda68f90bf414bf2309d5fa2bf926c98bd2e62b6243b0c8e37ae34e9f00c886ef2dbfc0d05ac SHA512 2cb679d383dafd75528dc0d72ccf7ee0977b3feb253977d1164aa1657e12feb98318e5524418cf62aa04b11fd31de47e87768a1d92e165d52379bd905d7dcb02
+EBUILD kguiaddons-5.86.0-r1.ebuild 805 BLAKE2B 0ed764942455cda6be19d4e3372a3a86b44cff3b043d12bc3b554538af02447b263261f3ad61e73016a3494927ac604e2b401a62e91fcaf24d75e8e4a4baadff SHA512 5adfb6aff2c7072ea85b29ab95166889b14d53a1f95c275f301debd3a0573fa40c2b3566120fccc44d2db7ab9e512d9dd9bd4c0fbe21b0d3fc94819417fb9630
MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.85.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.85.0-r1.ebuild
index 7cc5624ec1f7..97ad069422d8 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-5.85.0.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.85.0-r1.ebuild
@@ -12,12 +12,14 @@ LICENSE="LGPL-2+"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="wayland"
+# slot op: includes qpa/qplatformnativeinterface.h
RDEPEND="
- >=dev-qt/qtgui-${QTMIN}:5[wayland?]
+ >=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtx11extras-${QTMIN}:5
x11-libs/libX11
wayland? (
dev-libs/wayland
+ >=dev-qt/qtgui-${QTMIN}:5=[wayland]
>=dev-qt/qtwayland-${QTMIN}:5
)
"
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.86.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.86.0-r1.ebuild
index cb7795440e88..47bd6c9639ca 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-5.86.0.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.86.0-r1.ebuild
@@ -12,12 +12,14 @@ LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="wayland"
+# slot op: includes qpa/qplatformnativeinterface.h
RDEPEND="
- >=dev-qt/qtgui-${QTMIN}:5[wayland?]
+ >=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtx11extras-${QTMIN}:5
x11-libs/libX11
wayland? (
dev-libs/wayland
+ >=dev-qt/qtgui-${QTMIN}:5=[wayland]
>=dev-qt/qtwayland-${QTMIN}:5
)
"
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 68fc3bcdd515..b2b33577f3fa 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,6 +1,7 @@
AUX knewstuff-5.86.0-fix-crash-in-DownloadWidget.patch 725 BLAKE2B 2395108343b6ead975779ae06c63beab4bf3f88eea3f16f7c50c9baebd639e933550553e7f664ab9a33f01bd4503eabb9ffe663aa436b063120063ea1fc46b08 SHA512 89d18085897197f2a3d1fa7164c2ca2957c75b519bc588c8c4981b934199a6e919ef1e293b80bff18c1e7f188898362d3f41517e5f1a14eaaa78a806f373c3a5
+AUX knewstuff-5.86.0-include-user-agent-on-KNS-requests.patch 2150 BLAKE2B 3da29159a51597d2986568b465a0f04d3c96e32af5a66a7adf8b2a3bf2af027ff0aa1ce0e1537d90232075da00f19beb5bb3a1b6db356917df2345f8eff4b811 SHA512 dd765c485761ec25a18feba10c80762cee76b660e4108d737deb17e96e3b0d9597bdf43fbabc1035ed65c30470ed7bb1afe095b04fd931b2059bfdf3a2afb12f
DIST knewstuff-5.85.0.tar.xz 1138788 BLAKE2B 6f037ddd3dd7d9499d19b8d10b2486ced1ab169180d69a004369158665eb098015c60fd657e9d84af7b15634a28abd13e761b2728861f3f88c02ac0510121c5c SHA512 2da81b520ecab1d43b79e75ec56cbba410bd0944b13ea53eeee5ca94c77f9c04ad91a35b0c1942516edc5101a365f2a91b774405183bc8bf82c6cd5fb53a0570
DIST knewstuff-5.86.0.tar.xz 1142536 BLAKE2B 8b1aa8ee9e8dc54f0431f77516d3e39bb4f9ff33f72573fee27b749df692b32c850230a2bc566ee580a56b587af05822a0348cd61d58501c49b507fdf0d164bb SHA512 984291bb68e6bde5d90b35245c101c0feb64338ee4c0656802f4812c3a0619a5291307e8e5e2de99b7a34e29554e2283de6513156e7aac32f0d2198433bb45cc
EBUILD knewstuff-5.85.0.ebuild 1269 BLAKE2B b1a564a30a07c4b50c2383fc79b216c770cf5f3e51cf979336decd4d5aecd4b6bb8e802484dc681cc49818b1995f930f826c53a33a1b430d30bf12f75689f94f SHA512 01511a2c8cd685a147bce2f43c7887de2f14d500f900f0d11fe3bfcde06390cc9c5ff8955d79da2c0fd6e7dd2af71d484945abaac280a57ce372b54323b08a3e
-EBUILD knewstuff-5.86.0-r1.ebuild 1355 BLAKE2B b09a316b35af2db6185ee23ee517fa2748f77c0e1e269fb0295bcef4cb0e71b9a1a2a4ea3d116954620403cd40e71f0fef62d97f3276a316aba558716f8d3368 SHA512 932889d14d31b88d62e2315da78189214b05e9ac225a0048f1719ffed3b01f6c29eaecd0d83c98186e8963c8d2aa72499aa61ed7fff54c7b020845a73cd0ace1
+EBUILD knewstuff-5.86.0-r2.ebuild 1417 BLAKE2B bdb88b835f530ba6ead02e0e9661fc18985362e52067221f8c87da6b7a8e2e942a9de46c5b727967ff07be02c7f69ec5486cb79133efe7d6b61c24e7791db127 SHA512 5dbc60f5bad5eb2d470e86748b5539ff66d72abdb33946935059d008d8e5dc7c98e6b7e056b8d5560fbda0892418f598b0a92609ca5eb23fe6bfe9df8857f03a
MISC metadata.xml 600 BLAKE2B b9dafdddae4fb5f9969ca845f02690b096f81f6b3c1f76fe877f2886697c0636b8a3b4498aa5cbf903f1b6ee14f3de51c10ce88b37a9780f91ce23bd841f5fbe SHA512 5f3710e9d14cb62c66fa6b21f70691f276fb1fe030b3b2eb92f206a55bbc10dd998dd522e478c883c36d7f811d7f163602e3a2af7ff92e6dd79fa28a1fa32b85
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.86.0-include-user-agent-on-KNS-requests.patch b/kde-frameworks/knewstuff/files/knewstuff-5.86.0-include-user-agent-on-KNS-requests.patch
new file mode 100644
index 000000000000..6252d28f7b93
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-5.86.0-include-user-agent-on-KNS-requests.patch
@@ -0,0 +1,58 @@
+From f687c5abd0c5e9bd5a6688b6d9d50f2536b7d33d Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Fri, 24 Sep 2021 14:31:05 +0200
+Subject: [PATCH] Include a user agent on KNS requests
+
+---
+ src/core/jobs/httpworker.cpp | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/src/core/jobs/httpworker.cpp b/src/core/jobs/httpworker.cpp
+index 4c218b08..b81edd2d 100644
+--- a/src/core/jobs/httpworker.cpp
++++ b/src/core/jobs/httpworker.cpp
+@@ -7,7 +7,9 @@
+ #include "httpworker.h"
+
+ #include "knewstuffcore_debug.h"
++#include "knewstuffcore_version.h"
+
++#include <QCoreApplication>
+ #include <QFile>
+ #include <QMutex>
+ #include <QMutexLocker>
+@@ -93,6 +95,15 @@ void HTTPWorker::setUrl(const QUrl &url)
+ d->source = url;
+ }
+
++static void addUserAgent(QNetworkRequest &request)
++{
++ QString agentHeader = QStringLiteral("KNewStuff/%1").arg(QLatin1String(KNEWSTUFFCORE_VERSION_STRING));
++ if (QCoreApplication::instance()) {
++ agentHeader += QStringLiteral("-%1/%2").arg(QCoreApplication::instance()->applicationName(), QCoreApplication::instance()->applicationVersion());
++ }
++ request.setHeader(QNetworkRequest::UserAgentHeader, agentHeader);
++}
++
+ void HTTPWorker::startRequest()
+ {
+ if (d->reply) {
+@@ -101,6 +112,7 @@ void HTTPWorker::startRequest()
+ }
+
+ QNetworkRequest request(d->source);
++ addUserAgent(request);
+ d->reply = s_httpWorkerNAM->get(request);
+ connect(d->reply, &QNetworkReply::readyRead, this, &HTTPWorker::handleReadyRead);
+ connect(d->reply, &QNetworkReply::finished, this, &HTTPWorker::handleFinished);
+@@ -144,6 +156,7 @@ void HTTPWorker::handleFinished()
+ << d->reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+ d->reply->deleteLater();
+ QNetworkRequest request(d->redirectUrl);
++ addUserAgent(request);
+ d->reply = s_httpWorkerNAM->get(request);
+ connect(d->reply, &QNetworkReply::readyRead, this, &HTTPWorker::handleReadyRead);
+ connect(d->reply, &QNetworkReply::finished, this, &HTTPWorker::handleFinished);
+--
+GitLab
+
diff --git a/kde-frameworks/knewstuff/knewstuff-5.86.0-r1.ebuild b/kde-frameworks/knewstuff/knewstuff-5.86.0-r2.ebuild
index 293f9356d4af..06de55295853 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.86.0-r1.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.86.0-r2.ebuild
@@ -40,7 +40,10 @@ RDEPEND="${DEPEND}
>=kde-frameworks/kirigami-${PVCUT}:5
"
-PATCHES=( "${FILESDIR}/${P}-fix-crash-in-DownloadWidget.patch" ) # KDE-bug 443025
+PATCHES=(
+ "${FILESDIR}/${P}-fix-crash-in-DownloadWidget.patch" # KDE-bug 443025
+ "${FILESDIR}/${P}-include-user-agent-on-KNS-requests.patch"
+)
src_configure() {
local mycmakeargs=(