1 |
commit: ec00f7bc048a6a7aa9a80572c931671287865a1d |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 11 06:42:47 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 11 11:00:29 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec00f7bc |
7 |
|
8 |
kde-frameworks/knewstuff: drop 5.86.0* |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
|
12 |
kde-frameworks/knewstuff/Manifest | 1 - |
13 |
...wstuff-5.86.0-fix-crash-in-DownloadWidget.patch | 26 ---------- |
14 |
...5.86.0-include-user-agent-on-KNS-requests.patch | 58 ---------------------- |
15 |
.../knewstuff/knewstuff-5.86.0-r2.ebuild | 54 -------------------- |
16 |
4 files changed, 139 deletions(-) |
17 |
|
18 |
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest |
19 |
index 0dcd99369cc..aca1507ba00 100644 |
20 |
--- a/kde-frameworks/knewstuff/Manifest |
21 |
+++ b/kde-frameworks/knewstuff/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
DIST knewstuff-5.85.0.tar.xz 1138788 BLAKE2B 6f037ddd3dd7d9499d19b8d10b2486ced1ab169180d69a004369158665eb098015c60fd657e9d84af7b15634a28abd13e761b2728861f3f88c02ac0510121c5c SHA512 2da81b520ecab1d43b79e75ec56cbba410bd0944b13ea53eeee5ca94c77f9c04ad91a35b0c1942516edc5101a365f2a91b774405183bc8bf82c6cd5fb53a0570 |
24 |
-DIST knewstuff-5.86.0.tar.xz 1142536 BLAKE2B 8b1aa8ee9e8dc54f0431f77516d3e39bb4f9ff33f72573fee27b749df692b32c850230a2bc566ee580a56b587af05822a0348cd61d58501c49b507fdf0d164bb SHA512 984291bb68e6bde5d90b35245c101c0feb64338ee4c0656802f4812c3a0619a5291307e8e5e2de99b7a34e29554e2283de6513156e7aac32f0d2198433bb45cc |
25 |
DIST knewstuff-5.87.0.tar.xz 1146336 BLAKE2B 1f1beff60c59532e892e9b5f561b6a0848bd55d8c483f8195496fb9ec269c2cd4fc3f22216669b6486d5ae987b5d664bc20ffe8d867e401de7be6a6f228b009f SHA512 6979417e3a8b4b9a1dae0850cb8e333d31c1124f60c67ecc292b0b9372e6c7fcd8d5ae8f59afdcc543379b148f0fc310cfc7a24f8ae8fbf29358de0508ff307b |
26 |
|
27 |
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.86.0-fix-crash-in-DownloadWidget.patch b/kde-frameworks/knewstuff/files/knewstuff-5.86.0-fix-crash-in-DownloadWidget.patch |
28 |
deleted file mode 100644 |
29 |
index dbed97665d5..00000000000 |
30 |
--- a/kde-frameworks/knewstuff/files/knewstuff-5.86.0-fix-crash-in-DownloadWidget.patch |
31 |
+++ /dev/null |
32 |
@@ -1,26 +0,0 @@ |
33 |
-From d09ba1917cb7e035a9aac6c27c86fc4df5da3194 Mon Sep 17 00:00:00 2001 |
34 |
-From: Albert Astals Cid <aacid@×××.org> |
35 |
-Date: Mon, 27 Sep 2021 20:05:09 +0200 |
36 |
-Subject: [PATCH] Fix crash in DownloadWidget |
37 |
- |
38 |
-BUGS: 443025 |
39 |
---- |
40 |
- src/downloadwidget.cpp | 2 +- |
41 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
42 |
- |
43 |
-diff --git a/src/downloadwidget.cpp b/src/downloadwidget.cpp |
44 |
-index 40df2e8c..36cfde37 100644 |
45 |
---- a/src/downloadwidget.cpp |
46 |
-+++ b/src/downloadwidget.cpp |
47 |
-@@ -97,7 +97,7 @@ Entry::List DownloadWidget::installedEntries() |
48 |
- } |
49 |
- |
50 |
- DownloadWidgetPrivate::DownloadWidgetPrivate(DownloadWidget *qq) |
51 |
-- : q(q) |
52 |
-+ : q(qq) |
53 |
- , engine(new KNSCore::Engine) |
54 |
- , model(new KNSCore::ItemsModel(engine)) |
55 |
- , messageTimer(nullptr) |
56 |
--- |
57 |
-GitLab |
58 |
- |
59 |
|
60 |
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 |
61 |
deleted file mode 100644 |
62 |
index 6252d28f7b9..00000000000 |
63 |
--- a/kde-frameworks/knewstuff/files/knewstuff-5.86.0-include-user-agent-on-KNS-requests.patch |
64 |
+++ /dev/null |
65 |
@@ -1,58 +0,0 @@ |
66 |
-From f687c5abd0c5e9bd5a6688b6d9d50f2536b7d33d Mon Sep 17 00:00:00 2001 |
67 |
-From: Aleix Pol <aleixpol@×××.org> |
68 |
-Date: Fri, 24 Sep 2021 14:31:05 +0200 |
69 |
-Subject: [PATCH] Include a user agent on KNS requests |
70 |
- |
71 |
---- |
72 |
- src/core/jobs/httpworker.cpp | 13 +++++++++++++ |
73 |
- 1 file changed, 13 insertions(+) |
74 |
- |
75 |
-diff --git a/src/core/jobs/httpworker.cpp b/src/core/jobs/httpworker.cpp |
76 |
-index 4c218b08..b81edd2d 100644 |
77 |
---- a/src/core/jobs/httpworker.cpp |
78 |
-+++ b/src/core/jobs/httpworker.cpp |
79 |
-@@ -7,7 +7,9 @@ |
80 |
- #include "httpworker.h" |
81 |
- |
82 |
- #include "knewstuffcore_debug.h" |
83 |
-+#include "knewstuffcore_version.h" |
84 |
- |
85 |
-+#include <QCoreApplication> |
86 |
- #include <QFile> |
87 |
- #include <QMutex> |
88 |
- #include <QMutexLocker> |
89 |
-@@ -93,6 +95,15 @@ void HTTPWorker::setUrl(const QUrl &url) |
90 |
- d->source = url; |
91 |
- } |
92 |
- |
93 |
-+static void addUserAgent(QNetworkRequest &request) |
94 |
-+{ |
95 |
-+ QString agentHeader = QStringLiteral("KNewStuff/%1").arg(QLatin1String(KNEWSTUFFCORE_VERSION_STRING)); |
96 |
-+ if (QCoreApplication::instance()) { |
97 |
-+ agentHeader += QStringLiteral("-%1/%2").arg(QCoreApplication::instance()->applicationName(), QCoreApplication::instance()->applicationVersion()); |
98 |
-+ } |
99 |
-+ request.setHeader(QNetworkRequest::UserAgentHeader, agentHeader); |
100 |
-+} |
101 |
-+ |
102 |
- void HTTPWorker::startRequest() |
103 |
- { |
104 |
- if (d->reply) { |
105 |
-@@ -101,6 +112,7 @@ void HTTPWorker::startRequest() |
106 |
- } |
107 |
- |
108 |
- QNetworkRequest request(d->source); |
109 |
-+ addUserAgent(request); |
110 |
- d->reply = s_httpWorkerNAM->get(request); |
111 |
- connect(d->reply, &QNetworkReply::readyRead, this, &HTTPWorker::handleReadyRead); |
112 |
- connect(d->reply, &QNetworkReply::finished, this, &HTTPWorker::handleFinished); |
113 |
-@@ -144,6 +156,7 @@ void HTTPWorker::handleFinished() |
114 |
- << d->reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); |
115 |
- d->reply->deleteLater(); |
116 |
- QNetworkRequest request(d->redirectUrl); |
117 |
-+ addUserAgent(request); |
118 |
- d->reply = s_httpWorkerNAM->get(request); |
119 |
- connect(d->reply, &QNetworkReply::readyRead, this, &HTTPWorker::handleReadyRead); |
120 |
- connect(d->reply, &QNetworkReply::finished, this, &HTTPWorker::handleFinished); |
121 |
--- |
122 |
-GitLab |
123 |
- |
124 |
|
125 |
diff --git a/kde-frameworks/knewstuff/knewstuff-5.86.0-r2.ebuild b/kde-frameworks/knewstuff/knewstuff-5.86.0-r2.ebuild |
126 |
deleted file mode 100644 |
127 |
index 06de5529585..00000000000 |
128 |
--- a/kde-frameworks/knewstuff/knewstuff-5.86.0-r2.ebuild |
129 |
+++ /dev/null |
130 |
@@ -1,54 +0,0 @@ |
131 |
-# Copyright 1999-2021 Gentoo Authors |
132 |
-# Distributed under the terms of the GNU General Public License v2 |
133 |
- |
134 |
-EAPI=8 |
135 |
- |
136 |
-ECM_TEST="false" |
137 |
-PVCUT=$(ver_cut 1-2) |
138 |
-QTMIN=5.15.2 |
139 |
-inherit ecm kde.org |
140 |
- |
141 |
-DESCRIPTION="Framework for downloading and sharing additional application data" |
142 |
- |
143 |
-LICENSE="LGPL-2+" |
144 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
145 |
-IUSE="opds" |
146 |
- |
147 |
-DEPEND=" |
148 |
- >=dev-qt/qtdeclarative-${QTMIN}:5 |
149 |
- >=dev-qt/qtgui-${QTMIN}:5 |
150 |
- >=dev-qt/qtnetwork-${QTMIN}:5 |
151 |
- >=dev-qt/qtwidgets-${QTMIN}:5 |
152 |
- >=dev-qt/qtxml-${QTMIN}:5 |
153 |
- =kde-frameworks/attica-${PVCUT}*:5 |
154 |
- =kde-frameworks/karchive-${PVCUT}*:5 |
155 |
- =kde-frameworks/kcompletion-${PVCUT}*:5 |
156 |
- =kde-frameworks/kconfig-${PVCUT}*:5 |
157 |
- =kde-frameworks/kcoreaddons-${PVCUT}*:5 |
158 |
- =kde-frameworks/ki18n-${PVCUT}*:5 |
159 |
- =kde-frameworks/kiconthemes-${PVCUT}*:5 |
160 |
- =kde-frameworks/kio-${PVCUT}*:5 |
161 |
- =kde-frameworks/kitemviews-${PVCUT}*:5 |
162 |
- =kde-frameworks/kpackage-${PVCUT}*:5 |
163 |
- =kde-frameworks/kservice-${PVCUT}*:5 |
164 |
- =kde-frameworks/ktextwidgets-${PVCUT}*:5 |
165 |
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 |
166 |
- =kde-frameworks/kxmlgui-${PVCUT}*:5 |
167 |
- opds? ( =kde-frameworks/syndication-${PVCUT}*:5 ) |
168 |
-" |
169 |
-RDEPEND="${DEPEND} |
170 |
- >=kde-frameworks/kirigami-${PVCUT}:5 |
171 |
-" |
172 |
- |
173 |
-PATCHES=( |
174 |
- "${FILESDIR}/${P}-fix-crash-in-DownloadWidget.patch" # KDE-bug 443025 |
175 |
- "${FILESDIR}/${P}-include-user-agent-on-KNS-requests.patch" |
176 |
-) |
177 |
- |
178 |
-src_configure() { |
179 |
- local mycmakeargs=( |
180 |
- $(cmake_use_find_package opds KF5Syndication) |
181 |
- ) |
182 |
- |
183 |
- ecm_src_configure |
184 |
-} |