* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/files/, kde-frameworks/knewstuff/
@ 2021-04-11 14:23 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2021-04-11 14:23 UTC (permalink / raw
To: gentoo-commits
commit: 25fd1ca56880da4943d1811eb51f9e1ff9bb0235
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 6 12:14:11 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 11 14:23:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25fd1ca5
kde-frameworks/knewstuff: drop 5.77.0*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/knewstuff/Manifest | 1 -
.../files/knewstuff-5.77.0-add-dptr-to-cache.patch | 135 ---------------------
.../knewstuff/knewstuff-5.77.0-r1.ebuild | 42 -------
3 files changed, 178 deletions(-)
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 69bc4787abb..9cb17ac798f 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,3 +1,2 @@
-DIST knewstuff-5.77.0.tar.xz 1143780 BLAKE2B 72b1e040041e6aca1593700a5378ca88be8b9edc3f2682c433231ee07fed5f56cea749f34dec74835cbc2cf5455e879296d388a0deed5132a9cdedb59ece85e1 SHA512 408b3dd045f13050a41389b4864888f8d261ecade50b4d3903f0982194a0a15828e459e755a001a5593cf818894cca2203ded9cc3fcdd60e23820a1d0f7c45b7
DIST knewstuff-5.80.0.tar.xz 1162316 BLAKE2B b6ceb6106577b52c49ac34f87a8443dd899460e32bcdcd4cc56c5f786c0e7bdfd871e1157da215cc9b7b0dfca8bb29abab6fa212e6ff30b29dc930b5a4c4b4fc SHA512 bd0c601bcfda8f4674392010c863871e511abd97c1e2971ac93bb902e2bf2e5eb925d2b64119473a182944fe91fee3d1e5a7ebe23edc58aad20e2d04a190bc3c
DIST knewstuff-5.81.0.tar.xz 1167932 BLAKE2B 30e214c23455bbfd37e580c266ffbcbf9e54cd6dd36abb1521c1e50cb452252a175e6d802ad62bfa0168b7adccbbd91ff752543b5db78337e38a822df89feec7 SHA512 e00b502b3bbfca177929ec9b7b6108188cc3c3ab5201dfde5af3c5bbca59818430099dd0ff59d450de22bd029081b4f6f7ab2c9366dbb9c3f9485b03235c03a8
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.77.0-add-dptr-to-cache.patch b/kde-frameworks/knewstuff/files/knewstuff-5.77.0-add-dptr-to-cache.patch
deleted file mode 100644
index f6547fc6e5f..00000000000
--- a/kde-frameworks/knewstuff/files/knewstuff-5.77.0-add-dptr-to-cache.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 243ea6155b28457c8b1441fee8ab1037828d21ba Mon Sep 17 00:00:00 2001
-From: Dan Leinir Turthra Jensen <admin@leinir.dk>
-Date: Mon, 14 Dec 2020 21:11:51 +0000
-Subject: [PATCH] Add a dptr to Cache, and move the throttle timer there to fix
- crash
-
-Previously, the throttle timer was a raw static, but it was also a parented qobject, which means that when the cache was deleted, so was the timer, but the variable was not reset. Consequently, things would crash left and right later on. So, to alleviate this, and hopefully avoid future issues, introduce a dptr, stick the timer there, and move the logic to that private class as well.
-
-BUG:429442
-
-FIXED-IN:5.78
----
- src/core/cache.cpp | 41 ++++++++++++++++++++++++++++++-----------
- src/core/cache.h | 7 +++++--
- 2 files changed, 35 insertions(+), 13 deletions(-)
-
-diff --git a/src/core/cache.cpp b/src/core/cache.cpp
-index 0395045c..ace7be4e 100644
---- a/src/core/cache.cpp
-+++ b/src/core/cache.cpp
-@@ -11,17 +11,42 @@
- #include <QDir>
- #include <QFileInfo>
- #include <QFileSystemWatcher>
-+#include <QPointer>
- #include <QTimer>
- #include <QXmlStreamReader>
- #include <qstandardpaths.h>
- #include <knewstuffcore_debug.h>
-
-+class KNSCore::CachePrivate {
-+public:
-+ CachePrivate(Cache* qq)
-+ : q(qq)
-+ {}
-+ ~CachePrivate() {}
-+
-+ Cache* q;
-+ QHash<QString, EntryInternal::List> requestCache;
-+
-+ QPointer<QTimer> throttleTimer;
-+ void throttleWrite() {
-+ if (!throttleTimer) {
-+ throttleTimer = new QTimer(q);
-+ QObject::connect(throttleTimer, &QTimer::timeout, q, [this](){ q->writeRegistry(); });
-+ throttleTimer->setSingleShot(true);
-+ throttleTimer->setInterval(1000);
-+ }
-+ throttleTimer->start();
-+ }
-+};
-+
- using namespace KNSCore;
-
- typedef QHash<QString, QWeakPointer<Cache> > CacheHash;
- Q_GLOBAL_STATIC(CacheHash, s_caches)
-
--Cache::Cache(const QString &appName): QObject(nullptr)
-+Cache::Cache(const QString &appName)
-+ : QObject(nullptr)
-+ , d(new CachePrivate(this))
- {
- m_kns2ComponentName = appName;
-
-@@ -280,36 +305,30 @@ void Cache::registerChangedEntry(const KNSCore::EntryInternal &entry)
- if (entry.status() == KNS3::Entry::Updating || entry.status() == KNS3::Entry::Installing) {
- return;
- }
-- static QTimer* writeThrottle{nullptr};
-- if (!writeThrottle) {
-- writeThrottle = new QTimer(this);
-- connect(writeThrottle, &QTimer::timeout, this, [this](){ writeRegistry(); });
-- writeThrottle->setInterval(1000);
-- }
- if (!property("reloadingRegistry").toBool()) {
- setProperty("dirty", true);
- cache.remove(entry); // If value already exists in the set, the set is left unchanged
- cache.insert(entry);
-- writeThrottle->start();
-+ d->throttleWrite();
- }
- }
-
- void Cache::insertRequest(const KNSCore::Provider::SearchRequest &request, const KNSCore::EntryInternal::List &entries)
- {
- // append new entries
-- auto &cacheList = requestCache[request.hashForRequest()];
-+ auto &cacheList = d->requestCache[request.hashForRequest()];
- for (const auto &entry : entries) {
- if (!cacheList.contains(entry)) {
- cacheList.append(entry);
- }
- }
-- qCDebug(KNEWSTUFFCORE) << request.hashForRequest() << " add: " << entries.size() << " keys: " << requestCache.keys();
-+ qCDebug(KNEWSTUFFCORE) << request.hashForRequest() << " add: " << entries.size() << " keys: " << d->requestCache.keys();
- }
-
- EntryInternal::List Cache::requestFromCache(const KNSCore::Provider::SearchRequest &request)
- {
- qCDebug(KNEWSTUFFCORE) << request.hashForRequest();
-- return requestCache.value(request.hashForRequest());
-+ return d->requestCache.value(request.hashForRequest());
- }
-
- void KNSCore::Cache::removeDeletedEntries()
-diff --git a/src/core/cache.h b/src/core/cache.h
-index 06e95ab4..73ea7c61 100644
---- a/src/core/cache.h
-+++ b/src/core/cache.h
-@@ -16,9 +16,11 @@
-
- #include "knewstuffcore_export.h"
-
-+#include <memory.h>
-+
- namespace KNSCore
- {
--
-+class CachePrivate;
- class KNEWSTUFFCORE_EXPORT Cache : public QObject
- {
- Q_OBJECT
-@@ -99,7 +101,8 @@ private:
- QString m_kns2ComponentName;
-
- QSet<EntryInternal> cache;
-- QHash<QString, EntryInternal::List> requestCache;
-+
-+ std::unique_ptr<CachePrivate> d;
- };
-
- }
---
-GitLab
-
diff --git a/kde-frameworks/knewstuff/knewstuff-5.77.0-r1.ebuild b/kde-frameworks/knewstuff/knewstuff-5.77.0-r1.ebuild
deleted file mode 100644
index 0f453351949..00000000000
--- a/kde-frameworks/knewstuff/knewstuff-5.77.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Framework for downloading and sharing additional application data"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/attica-${PVCUT}*:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kcompletion-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kitemviews-${PVCUT}*:5
- =kde-frameworks/kpackage-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/ktextwidgets-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}
- >=kde-frameworks/kirigami-${PVCUT}:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-add-dptr-to-cache.patch" ) # KDE-bug 429442
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/files/, kde-frameworks/knewstuff/
@ 2021-10-02 13:35 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2021-10-02 13:35 UTC (permalink / raw
To: gentoo-commits
commit: 686a75446fd2e7c96d88d939ca710adb6714ce42
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 2 13:30:51 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 2 13:35:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=686a7544
kde-frameworks/knewstuff: Help upstream lower server utilization
See also:
https://mail.kde.org/pipermail/distributions/2021-October/001054.html
https://invent.kde.org/frameworks/knewstuff/-/merge_requests/142
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...5.86.0-include-user-agent-on-KNS-requests.patch | 58 ++++++++++++++++++++++
.../knewstuff/knewstuff-5.86.0-r2.ebuild | 54 ++++++++++++++++++++
2 files changed, 112 insertions(+)
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 00000000000..6252d28f7b9
--- /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-r2.ebuild b/kde-frameworks/knewstuff/knewstuff-5.86.0-r2.ebuild
new file mode 100644
index 00000000000..06de5529585
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.86.0-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="opds"
+
+DEPEND="
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ =kde-frameworks/attica-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kcompletion-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kio-${PVCUT}*:5
+ =kde-frameworks/kitemviews-${PVCUT}*:5
+ =kde-frameworks/kpackage-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/ktextwidgets-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ opds? ( =kde-frameworks/syndication-${PVCUT}*:5 )
+"
+RDEPEND="${DEPEND}
+ >=kde-frameworks/kirigami-${PVCUT}:5
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-crash-in-DownloadWidget.patch" # KDE-bug 443025
+ "${FILESDIR}/${P}-include-user-agent-on-KNS-requests.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package opds KF5Syndication)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/files/, kde-frameworks/knewstuff/
@ 2022-02-10 20:10 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2022-02-10 20:10 UTC (permalink / raw
To: gentoo-commits
commit: 11c1cee5a29bc050d7ab2126f3c97932db9ce221
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 9 20:22:34 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 20:09:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c1cee5
kde-frameworks/knewstuff: Mitigate KNS/Discover impact on KDE servers
See also:
https://mail.kde.org/pipermail/distributions/2022-February/001140.html
Upstream commits:
c8165b7a0d622e318b3353ccf257a8f229dd12c9
e1c6f2bf383876a31cd3e3f9e6edcaa19dc0a7dd
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...f-5.90.0-add-conditional-cache-preference.patch | 61 ++++++++++++++++++++++
...wstuff-5.90.0-ensure-correct-ProvidersUrl.patch | 27 ++++++++++
.../knewstuff/knewstuff-5.90.0-r1.ebuild | 55 +++++++++++++++++++
3 files changed, 143 insertions(+)
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.90.0-add-conditional-cache-preference.patch b/kde-frameworks/knewstuff/files/knewstuff-5.90.0-add-conditional-cache-preference.patch
new file mode 100644
index 000000000000..80a8451ec990
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-5.90.0-add-conditional-cache-preference.patch
@@ -0,0 +1,61 @@
+From e1c6f2bf383876a31cd3e3f9e6edcaa19dc0a7dd Mon Sep 17 00:00:00 2001
+From: Dan Leinir Turthra Jensen <admin@leinir.dk>
+Date: Wed, 9 Feb 2022 16:17:58 +0000
+Subject: [PATCH] Add conditional cache preference to http requests
+
+If we have a cache that's older than 7 days, assume that it's out of
+date and actually try again. If it's younger than that, assume that it's
+just the same, and prefer our cached version, if we have one.
+
+The logic here is an attempt at striking a balance between using our cache
+to its fullest potential (as in, reducing server-side load and network
+roundtrips in general) while also handling the situation where the
+information that we are fed about the cache is not entirely correct (such
+as the case where we're told there's no expiration date, but the data in
+fact does change). 7 days seems a sensible sort of deadline for that,
+though we could change that later if we need to.
+
+This was born out of a discussion on another kns review[1]
+
+Assume that no cache expiration time will be longer than 7 days, but otherwise prefer the cache
+This is mildly hacky, but if we don't do this, we end up with infinite cache expirations in some
+cases, which of course isn't really acceptable... See ed62ee20 for a situation where that happened.
+
+[1] https://invent.kde.org/frameworks/knewstuff/-/merge_requests/166#note_394067
+---
+ src/core/jobs/httpworker.cpp | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/jobs/httpworker.cpp b/src/core/jobs/httpworker.cpp
+index b52161f6..208e1ef0 100644
+--- a/src/core/jobs/httpworker.cpp
++++ b/src/core/jobs/httpworker.cpp
+@@ -41,7 +41,6 @@ public:
+ return nam.get(request);
+ }
+
+-private:
+ QNetworkDiskCache cache;
+ };
+
+@@ -101,6 +100,17 @@ static void addUserAgent(QNetworkRequest &request)
+ agentHeader += QStringLiteral("-%1/%2").arg(QCoreApplication::instance()->applicationName(), QCoreApplication::instance()->applicationVersion());
+ }
+ request.setHeader(QNetworkRequest::UserAgentHeader, agentHeader);
++
++ // Assume that no cache expiration time will be longer than a week, but otherwise prefer the cache
++ // This is mildly hacky, but if we don't do this, we end up with infinite cache expirations in some
++ // cases, which of course isn't really acceptable... See ed62ee20 for a situation where that happened.
++ QNetworkCacheMetaData cacheMeta{s_httpWorkerNAM->cache.metaData(request.url())};
++ if (cacheMeta.isValid()) {
++ const QDateTime nextWeek{QDateTime::currentDateTime().addDays(7)};
++ if (cacheMeta.expirationDate().isValid() && cacheMeta.expirationDate() < nextWeek) {
++ request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
++ }
++ }
+ }
+
+ void HTTPWorker::startRequest()
+--
+GitLab
+
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.90.0-ensure-correct-ProvidersUrl.patch b/kde-frameworks/knewstuff/files/knewstuff-5.90.0-ensure-correct-ProvidersUrl.patch
new file mode 100644
index 000000000000..130ca3dfbd5d
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-5.90.0-ensure-correct-ProvidersUrl.patch
@@ -0,0 +1,27 @@
+From c8165b7a0d622e318b3353ccf257a8f229dd12c9 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Tue, 8 Feb 2022 11:48:11 +0100
+Subject: [PATCH] Engine: Ensure we are not using the wrong ProvidersUrl
+
+---
+ src/core/engine.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/core/engine.cpp b/src/core/engine.cpp
+index 139dda1a..c96ba890 100644
+--- a/src/core/engine.cpp
++++ b/src/core/engine.cpp
+@@ -264,6 +264,10 @@ bool Engine::init(const QString &configfile)
+ Q_EMIT uploadEnabledChanged();
+
+ m_providerFileUrl = group.readEntry("ProvidersUrl");
++ if (m_providerFileUrl == QLatin1String("https://download.kde.org/ocs/providers.xml")) {
++ m_providerFileUrl = QStringLiteral("https://autoconfig.kde.org/ocs/providers.xml");
++ qCWarning(KNEWSTUFFCORE) << "Please make sure" << configfile << "has ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml";
++ }
+ if (group.readEntry("UseLocalProvidersFile", "false").toLower() == QLatin1String{"true"}) {
+ // The local providers file is called "appname.providers", to match "appname.knsrc"
+ m_providerFileUrl = QUrl::fromLocalFile(QLatin1String("%1.providers").arg(configFullPath.left(configFullPath.length() - 6))).toString();
+--
+GitLab
+
diff --git a/kde-frameworks/knewstuff/knewstuff-5.90.0-r1.ebuild b/kde-frameworks/knewstuff/knewstuff-5.90.0-r1.ebuild
new file mode 100644
index 000000000000..2962ea4c6b19
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.90.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="opds"
+
+DEPEND="
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ =kde-frameworks/attica-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kcompletion-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kio-${PVCUT}*:5
+ =kde-frameworks/kitemviews-${PVCUT}*:5
+ =kde-frameworks/kpackage-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/ktextwidgets-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ opds? ( =kde-frameworks/syndication-${PVCUT}*:5 )
+"
+RDEPEND="${DEPEND}
+ >=kde-frameworks/kirigami-${PVCUT}:5
+"
+
+# https://mail.kde.org/pipermail/distributions/2022-February/001140.html
+PATCHES=(
+ "${FILESDIR}/${P}-ensure-correct-ProvidersUrl.patch"
+ "${FILESDIR}/${P}-add-conditional-cache-preference.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package opds KF5Syndication)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/files/, kde-frameworks/knewstuff/
@ 2022-03-26 16:40 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2022-03-26 16:40 UTC (permalink / raw
To: gentoo-commits
commit: 1a9d2a0cc6f7f17e72357fde5e736c93211718b3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 16:29:11 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 16:39:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a9d2a0c
kde-frameworks/knewstuff: Fix "Get new icons..." on non-English lang
See also:
https://mail.kde.org/pipermail/distributions/2022-March/001211.html
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=451165
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/knewstuff-5.92.0-KDEBUG-451165.patch | 53 ++++++++++++++++++++++
.../knewstuff/knewstuff-5.92.0-r1.ebuild | 51 +++++++++++++++++++++
2 files changed, 104 insertions(+)
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.92.0-KDEBUG-451165.patch b/kde-frameworks/knewstuff/files/knewstuff-5.92.0-KDEBUG-451165.patch
new file mode 100644
index 000000000000..07f4170ae0ce
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-5.92.0-KDEBUG-451165.patch
@@ -0,0 +1,53 @@
+From 693a2ea3926400b1482888a2df2c532852b8f971 Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Sun, 20 Mar 2022 20:29:51 +0100
+Subject: [PATCH] Do not set user-visible name as additional agent information
+
+Instead we want the filename, which is more useful as an identifier anyways, because
+we would otherwise have to check which user-visible names originate from which knsrc file.
+
+BUG: 451165
+---
+ src/core/engine.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/engine.cpp b/src/core/engine.cpp
+index e7abfde8..72af9c83 100644
+--- a/src/core/engine.cpp
++++ b/src/core/engine.cpp
+@@ -145,6 +145,7 @@ public:
+ QString busyMessage;
+ QString useLabel;
+ bool uploadEnabled = false;
++ QString configFileName;
+ };
+
+ Engine::Engine(QObject *parent)
+@@ -224,6 +225,7 @@ bool Engine::init(const QString &configfile)
+ conf.reset(new KConfig(configfile));
+ qCWarning(KNEWSTUFFCORE) << "Using a deprecated location for the knsrc file" << configfile
+ << " - please contact the author of the software which provides this file to get it updated to use the new location";
++ configFileName = QFileInfo(configfile).baseName();
+ } else if (isRelativeConfig && actualConfig.isEmpty()) {
+ configFileName = QFileInfo(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("knsrcfiles/%1").arg(configfile))).baseName();
+ conf.reset(new KConfig(QStringLiteral("knsrcfiles/%1").arg(configfile), KConfig::FullConfig, QStandardPaths::GenericDataLocation));
+@@ -234,6 +236,7 @@ bool Engine::init(const QString &configfile)
+ configFileName = configFileInfo.baseName();
+ conf.reset(new KConfig(configfile));
+ }
++ d->configFileName = configFileName;
+
+ if (conf->accessMode() == KConfig::NoAccess) {
+ Q_EMIT signalErrorCode(KNSCore::ConfigFileError, i18n("Configuration file exists, but cannot be opened: \"%1\"", configfile), configfile);
+@@ -425,7 +428,7 @@ void Engine::slotProviderFileLoaded(const QDomDocument &doc)
+
+ QSharedPointer<KNSCore::Provider> provider;
+ if (isAtticaProviderFile || n.attribute(QStringLiteral("type")).toLower() == QLatin1String("rest")) {
+- provider.reset(new AtticaProvider(m_categories, d->name));
++ provider.reset(new AtticaProvider(m_categories, d->configFileName));
+ connect(provider.data(), &Provider::categoriesMetadataLoded, this, [this](const QList<Provider::CategoryMetadata> &categories) {
+ d->categoriesMetadata = categories;
+ Q_EMIT signalCategoriesMetadataLoded(categories);
+--
+GitLab
+
diff --git a/kde-frameworks/knewstuff/knewstuff-5.92.0-r1.ebuild b/kde-frameworks/knewstuff/knewstuff-5.92.0-r1.ebuild
new file mode 100644
index 000000000000..362d3beb80ef
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.92.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="opds"
+
+DEPEND="
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ =kde-frameworks/attica-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kcompletion-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kio-${PVCUT}*:5
+ =kde-frameworks/kitemviews-${PVCUT}*:5
+ =kde-frameworks/kpackage-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/ktextwidgets-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ opds? ( =kde-frameworks/syndication-${PVCUT}*:5 )
+"
+RDEPEND="${DEPEND}
+ >=kde-frameworks/kirigami-${PVCUT}:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-KDEBUG-451165.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package opds KF5Syndication)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/files/, kde-frameworks/knewstuff/
@ 2022-04-09 16:07 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2022-04-09 16:07 UTC (permalink / raw
To: gentoo-commits
commit: e07139da48c0af29a4ef56ac62168245b8b69991
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 9 15:51:44 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 9 16:03:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e07139da
kde-frameworks/knewstuff: Fix certain tars not being recognized
...as valid archives
Upstream commit 82f04bff174a4bb307aa9b39aedf271c200b0545
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=450662
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...newstuff-5.92.0-fix-valid-tar-recognition.patch | 27 +++++++++++
.../knewstuff/knewstuff-5.92.0-r2.ebuild | 54 ++++++++++++++++++++++
2 files changed, 81 insertions(+)
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.92.0-fix-valid-tar-recognition.patch b/kde-frameworks/knewstuff/files/knewstuff-5.92.0-fix-valid-tar-recognition.patch
new file mode 100644
index 000000000000..7926b3cee8fa
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-5.92.0-fix-valid-tar-recognition.patch
@@ -0,0 +1,27 @@
+From 82f04bff174a4bb307aa9b39aedf271c200b0545 Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Mon, 7 Mar 2022 21:27:09 +0100
+Subject: [PATCH] Fix certain tars not being recognized as valid archives
+
+KArchive can handle those too.
+
+BUG: 450662
+---
+ src/core/installation.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/core/installation.cpp b/src/core/installation.cpp
+index c3ba0e15..45694465 100644
+--- a/src/core/installation.cpp
++++ b/src/core/installation.cpp
+@@ -566,6 +566,7 @@ QStringList Installation::installDownloadedFileAndUncompress(const KNSCore::Entr
+ archive.reset(new KZip(payloadfile));
+ // clang-format off
+ } else if (mimeType.inherits(QStringLiteral("application/tar"))
++ || mimeType.inherits(QStringLiteral("application/x-tar")) // BUG 450662
+ || mimeType.inherits(QStringLiteral("application/x-gzip"))
+ || mimeType.inherits(QStringLiteral("application/x-bzip"))
+ || mimeType.inherits(QStringLiteral("application/x-lzma"))
+--
+GitLab
+
diff --git a/kde-frameworks/knewstuff/knewstuff-5.92.0-r2.ebuild b/kde-frameworks/knewstuff/knewstuff-5.92.0-r2.ebuild
new file mode 100644
index 000000000000..44c32f027192
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.92.0-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="opds"
+
+DEPEND="
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ =kde-frameworks/attica-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kcompletion-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kio-${PVCUT}*:5
+ =kde-frameworks/kitemviews-${PVCUT}*:5
+ =kde-frameworks/kpackage-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/ktextwidgets-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ opds? ( =kde-frameworks/syndication-${PVCUT}*:5 )
+"
+RDEPEND="${DEPEND}
+ >=kde-frameworks/kirigami-${PVCUT}:5
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-KDEBUG-451165.patch"
+ "${FILESDIR}/${P}-fix-valid-tar-recognition.patch" # KDE-bug 450662
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package opds KF5Syndication)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/files/, kde-frameworks/knewstuff/
@ 2022-05-04 20:50 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2022-05-04 20:50 UTC (permalink / raw
To: gentoo-commits
commit: 58b55e8517e023acb1f1aa44950759fc0ebd7a04
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 21:36:50 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 4 20:49:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58b55e85
kde-frameworks/knewstuff: drop 5.90.0*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/knewstuff/Manifest | 1 -
...f-5.90.0-add-conditional-cache-preference.patch | 61 ----------------------
...wstuff-5.90.0-ensure-correct-ProvidersUrl.patch | 27 ----------
.../knewstuff/knewstuff-5.90.0-r1.ebuild | 55 -------------------
4 files changed, 144 deletions(-)
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index a50642f686a5..ea7976edf076 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,3 +1,2 @@
-DIST knewstuff-5.90.0.tar.xz 1151308 BLAKE2B 3ee001569596c96b7a28696b1be22f5138f7f274ed87b7255d3809a32304b3eacf594ab78627266d8227bb7330fd1e90526b2d93bf4f82c780050bd5d1f7c548 SHA512 d80b743691eb9665e0df196a69db3cee2247bbfe6c34ea5e9511c94558d2e807c9aca867aef6cd4344eaae6f252d9fff6b3e7a31c152b8a8b69b8d54813ede28
DIST knewstuff-5.92.0.tar.xz 1155052 BLAKE2B ee3485c1e3371c139019bb1889aedb112f40c0bb0ee1c92c159b3a6b8a84208d53de10fb1d368852927b7a65e6e1cee3afcf99aa821e8468c67f8b0ac49db79d SHA512 689089724f53ecd59bc79e046bb0b3f64e7a3bd7c8d9a5cd8be15d13bdc045e0484e05a2e0a87ab0134744da829becf8fc669a9e17b7668dafec3fff8e62a2a8
DIST knewstuff-5.93.0.tar.xz 1155216 BLAKE2B 9aad129dcfa08a6a7258ef4869a9e949e5a182c4e3f5e286a096c7935a08c7c5991b517c24743cc3a0685e27e2ccb069d44431cbc6033b9e6242db547e42e59b SHA512 ed18c8d1dda39db68d2c426936ba4d2576b0b7298dd306ad92101c992fda1420ffd9bfbd54b2bd9ee9afcfda6ca72b68258b46d6f151bc8b99a1c82577fca383
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.90.0-add-conditional-cache-preference.patch b/kde-frameworks/knewstuff/files/knewstuff-5.90.0-add-conditional-cache-preference.patch
deleted file mode 100644
index 80a8451ec990..000000000000
--- a/kde-frameworks/knewstuff/files/knewstuff-5.90.0-add-conditional-cache-preference.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From e1c6f2bf383876a31cd3e3f9e6edcaa19dc0a7dd Mon Sep 17 00:00:00 2001
-From: Dan Leinir Turthra Jensen <admin@leinir.dk>
-Date: Wed, 9 Feb 2022 16:17:58 +0000
-Subject: [PATCH] Add conditional cache preference to http requests
-
-If we have a cache that's older than 7 days, assume that it's out of
-date and actually try again. If it's younger than that, assume that it's
-just the same, and prefer our cached version, if we have one.
-
-The logic here is an attempt at striking a balance between using our cache
-to its fullest potential (as in, reducing server-side load and network
-roundtrips in general) while also handling the situation where the
-information that we are fed about the cache is not entirely correct (such
-as the case where we're told there's no expiration date, but the data in
-fact does change). 7 days seems a sensible sort of deadline for that,
-though we could change that later if we need to.
-
-This was born out of a discussion on another kns review[1]
-
-Assume that no cache expiration time will be longer than 7 days, but otherwise prefer the cache
-This is mildly hacky, but if we don't do this, we end up with infinite cache expirations in some
-cases, which of course isn't really acceptable... See ed62ee20 for a situation where that happened.
-
-[1] https://invent.kde.org/frameworks/knewstuff/-/merge_requests/166#note_394067
----
- src/core/jobs/httpworker.cpp | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/jobs/httpworker.cpp b/src/core/jobs/httpworker.cpp
-index b52161f6..208e1ef0 100644
---- a/src/core/jobs/httpworker.cpp
-+++ b/src/core/jobs/httpworker.cpp
-@@ -41,7 +41,6 @@ public:
- return nam.get(request);
- }
-
--private:
- QNetworkDiskCache cache;
- };
-
-@@ -101,6 +100,17 @@ static void addUserAgent(QNetworkRequest &request)
- agentHeader += QStringLiteral("-%1/%2").arg(QCoreApplication::instance()->applicationName(), QCoreApplication::instance()->applicationVersion());
- }
- request.setHeader(QNetworkRequest::UserAgentHeader, agentHeader);
-+
-+ // Assume that no cache expiration time will be longer than a week, but otherwise prefer the cache
-+ // This is mildly hacky, but if we don't do this, we end up with infinite cache expirations in some
-+ // cases, which of course isn't really acceptable... See ed62ee20 for a situation where that happened.
-+ QNetworkCacheMetaData cacheMeta{s_httpWorkerNAM->cache.metaData(request.url())};
-+ if (cacheMeta.isValid()) {
-+ const QDateTime nextWeek{QDateTime::currentDateTime().addDays(7)};
-+ if (cacheMeta.expirationDate().isValid() && cacheMeta.expirationDate() < nextWeek) {
-+ request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
-+ }
-+ }
- }
-
- void HTTPWorker::startRequest()
---
-GitLab
-
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.90.0-ensure-correct-ProvidersUrl.patch b/kde-frameworks/knewstuff/files/knewstuff-5.90.0-ensure-correct-ProvidersUrl.patch
deleted file mode 100644
index 130ca3dfbd5d..000000000000
--- a/kde-frameworks/knewstuff/files/knewstuff-5.90.0-ensure-correct-ProvidersUrl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c8165b7a0d622e318b3353ccf257a8f229dd12c9 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Tue, 8 Feb 2022 11:48:11 +0100
-Subject: [PATCH] Engine: Ensure we are not using the wrong ProvidersUrl
-
----
- src/core/engine.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/core/engine.cpp b/src/core/engine.cpp
-index 139dda1a..c96ba890 100644
---- a/src/core/engine.cpp
-+++ b/src/core/engine.cpp
-@@ -264,6 +264,10 @@ bool Engine::init(const QString &configfile)
- Q_EMIT uploadEnabledChanged();
-
- m_providerFileUrl = group.readEntry("ProvidersUrl");
-+ if (m_providerFileUrl == QLatin1String("https://download.kde.org/ocs/providers.xml")) {
-+ m_providerFileUrl = QStringLiteral("https://autoconfig.kde.org/ocs/providers.xml");
-+ qCWarning(KNEWSTUFFCORE) << "Please make sure" << configfile << "has ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml";
-+ }
- if (group.readEntry("UseLocalProvidersFile", "false").toLower() == QLatin1String{"true"}) {
- // The local providers file is called "appname.providers", to match "appname.knsrc"
- m_providerFileUrl = QUrl::fromLocalFile(QLatin1String("%1.providers").arg(configFullPath.left(configFullPath.length() - 6))).toString();
---
-GitLab
-
diff --git a/kde-frameworks/knewstuff/knewstuff-5.90.0-r1.ebuild b/kde-frameworks/knewstuff/knewstuff-5.90.0-r1.ebuild
deleted file mode 100644
index 34fdae40c707..000000000000
--- a/kde-frameworks/knewstuff/knewstuff-5.90.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for downloading and sharing additional application data"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="opds"
-
-DEPEND="
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/attica-${PVCUT}*:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kcompletion-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kitemviews-${PVCUT}*:5
- =kde-frameworks/kpackage-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/ktextwidgets-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
- opds? ( =kde-frameworks/syndication-${PVCUT}*:5 )
-"
-RDEPEND="${DEPEND}
- >=kde-frameworks/kirigami-${PVCUT}:5
-"
-
-# https://mail.kde.org/pipermail/distributions/2022-February/001140.html
-PATCHES=(
- "${FILESDIR}/${P}-ensure-correct-ProvidersUrl.patch"
- "${FILESDIR}/${P}-add-conditional-cache-preference.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package opds KF5Syndication)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/files/, kde-frameworks/knewstuff/
@ 2023-04-22 16:21 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2023-04-22 16:21 UTC (permalink / raw
To: gentoo-commits
commit: 59302e58f1f7c849f5635e86c676443f4a01266f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 16:12:58 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 16:20:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59302e58
kde-frameworks/knewstuff: drop 5.102.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/knewstuff/Manifest | 1 -
...102.0-fix-crash-in-QQuickQuestionListener.patch | 55 ----------------------
.../knewstuff/knewstuff-5.102.0-r1.ebuild | 52 --------------------
3 files changed, 108 deletions(-)
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 494a435f796e..032a648c093c 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,3 +1,2 @@
-DIST knewstuff-5.102.0.tar.xz 3406384 BLAKE2B 3c2ba49a86b2954865db706466b07c94cc2f0b5fd10084f35285ae44ebff9e4a8dc5d968292a13699cefde229386b7dda27eea70a13fdf1c45736361e8a9dce7 SHA512 2ec0b6a8be814267a3b97fa50eb2789d5e78741e67ecd82a9ea095075338814a7d4d31623a6b9f809c129eba6b85f55e5fc6d05d43307859eb1e3420620962b0
DIST knewstuff-5.104.0.tar.xz 3411440 BLAKE2B 5c5696708fb6b2ec68cc555ad1c78d57b1f9ad39ecf1304aadf27470f5f0a94294f2fcc2c9099ab5e1de23d2c0c6ffd8bf223b96711e53cdfc0f41d370f0dafc SHA512 6d757ba602a155eb7640fc62cbdae3bfebe2b4147fec0f60dd6fcaeeecdf45d20ad1ee5cfc0c4163f878e92fd42c7a3146543f899451728b810446b26a663b16
DIST knewstuff-5.105.0.tar.xz 3385168 BLAKE2B 251b3aea1fd20ce9c848c300c7508b7c162084e7ce2e84f50971b4c47a300e293f2037cdfc534bb3f179049dc2eb83cca8707867c29321cf73ff59f71778c514 SHA512 12aa8cccb6cb30b1f05e823a6ab900aa9618ac69bdfae4125db6890187394ac9920e57f767eaa7eaf822f7e5f1e988d9090ceaeda2fc92fc36cd96a530f1f721
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.102.0-fix-crash-in-QQuickQuestionListener.patch b/kde-frameworks/knewstuff/files/knewstuff-5.102.0-fix-crash-in-QQuickQuestionListener.patch
deleted file mode 100644
index 00bafeb28b93..000000000000
--- a/kde-frameworks/knewstuff/files/knewstuff-5.102.0-fix-crash-in-QQuickQuestionListener.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From c8e5b36e190f8b71ac14e3afd403debdbe3cf9a8 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Sun, 29 Jan 2023 13:33:09 +0000
-Subject: [PATCH] Fix crash in QQuickQuestionListener
-
-The code path is:
- - we create a Question object
- - we show a prompt
- - we start a nested event loop to get this into a syncronous API
- - we return the result to the question object
-
-The lifespan of the question object is not controlled by the listener,
-during the nested event loop anything could have happened including
-deletion.
-
-BUG: 464624
-
-
-(cherry picked from commit e9e0e3faa986757ba096dbe599468f395b3461d3)
----
- src/qtquick/quickquestionlistener.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/qtquick/quickquestionlistener.cpp b/src/qtquick/quickquestionlistener.cpp
-index 81123b33..f760ef39 100644
---- a/src/qtquick/quickquestionlistener.cpp
-+++ b/src/qtquick/quickquestionlistener.cpp
-@@ -10,6 +10,7 @@
- #include "core/question.h"
-
- #include <QCoreApplication>
-+#include <QPointer>
-
- using namespace KNewStuffQuick;
-
-@@ -35,7 +36,7 @@ public:
- Private()
- {
- }
-- KNSCore::Question *question = nullptr;
-+ QPointer<KNSCore::Question> question;
- };
-
- QuickQuestionListener *QuickQuestionListener::instance()
-@@ -117,6 +118,6 @@ void KNewStuffQuick::QuickQuestionListener::passResponse(bool responseIsContinue
- break;
- }
- }
-- d->question = nullptr;
-+ d->question.clear();
- }
- }
---
-GitLab
-
diff --git a/kde-frameworks/knewstuff/knewstuff-5.102.0-r1.ebuild b/kde-frameworks/knewstuff/knewstuff-5.102.0-r1.ebuild
deleted file mode 100644
index f0932576d8b4..000000000000
--- a/kde-frameworks/knewstuff/knewstuff-5.102.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.5
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Framework for downloading and sharing additional application data"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="opds"
-
-DEPEND="
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/attica-${PVCUT}*:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kcompletion-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kitemviews-${PVCUT}*:5
- =kde-frameworks/kpackage-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/ktextwidgets-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
- opds? ( =kde-frameworks/syndication-${PVCUT}*:5 )
-"
-RDEPEND="${DEPEND}
- >=kde-frameworks/kirigami-${PVCUT}:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-crash-in-QQuickQuestionListener.patch" ) # KDE-bug 464624
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package opds KF5Syndication)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/files/, kde-frameworks/knewstuff/
@ 2024-03-11 9:05 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2024-03-11 9:05 UTC (permalink / raw
To: gentoo-commits
commit: ca961d58787562debe5f7211c074916b13864430
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 08:57:11 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 09:05:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca961d58
kde-frameworks/knewstuff: Fix link list dialog for installation button
See also:
https://mail.kde.org/pipermail/distributions/2024-March/001482.html
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=482349
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/knewstuff-6.0.0-fix-kdebug-482349.patch | 42 ++++++++++++++++++++++
kde-frameworks/knewstuff/knewstuff-6.0.0-r1.ebuild | 42 ++++++++++++++++++++++
2 files changed, 84 insertions(+)
diff --git a/kde-frameworks/knewstuff/files/knewstuff-6.0.0-fix-kdebug-482349.patch b/kde-frameworks/knewstuff/files/knewstuff-6.0.0-fix-kdebug-482349.patch
new file mode 100644
index 000000000000..6e0b2ca3c025
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-6.0.0-fix-kdebug-482349.patch
@@ -0,0 +1,42 @@
+From 49f2037ac22fcb430fadd5d7b29bd8af234573a4 Mon Sep 17 00:00:00 2001
+From: Akseli Lahtinen <akselmo@akselmo.dev>
+Date: Thu, 7 Mar 2024 16:01:44 +0000
+Subject: [PATCH] Fix link list dialog for installation button
+
+In gridview, installation buttons showed "Install..." for every item,
+even if the item had only single download link. This fixes it
+by showing correct button.
+
+The problem was using `entry` directly instead of `model`.
+
+BUG: 482349
+FIXED-IN: 6.1
+---
+ .../qml/private/entrygriddelegates/TileDelegate.qml | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml b/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml
+index 2fdee68b4..36224abe2 100644
+--- a/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml
++++ b/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml
+@@ -40,13 +40,13 @@ Private.GridTileDelegate {
+ visible: enabled
+ },
+ Kirigami.Action {
+- text: entry.downloadLinks.length === 1 ? i18ndc("knewstuff6", "Request installation of this item, available when there is exactly one downloadable item", "Install") : i18ndc("knewstuff6", "Show installation options, where there is more than one downloadable item", "Install…");
++ text: model.downloadLinks.length === 1 ? i18ndc("knewstuff6", "Request installation of this item, available when there is exactly one downloadable item", "Install") : i18ndc("knewstuff6", "Show installation options, where there is more than one downloadable item", "Install…");
+ icon.name: "install"
+ onTriggered: {
+- if (entry.downloadLinks.length === 1) {
+- newStuffEngine.install(entry.entry, NewStuff.ItemsModel.FirstLinkId);
++ if (model.downloadLinks.length === 1) {
++ newStuffEngine.install(entry, NewStuff.ItemsModel.FirstLinkId);
+ } else {
+- downloadItemsSheet.downloadLinks = entry.downloadLinks;
++ downloadItemsSheet.downloadLinks = model.downloadLinks;
+ downloadItemsSheet.entry = entry;
+ downloadItemsSheet.open();
+ }
+--
+GitLab
+
diff --git a/kde-frameworks/knewstuff/knewstuff-6.0.0-r1.ebuild b/kde-frameworks/knewstuff/knewstuff-6.0.0-r1.ebuild
new file mode 100644
index 000000000000..7b9468264281
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-6.0.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="opds"
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
+ >=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+ =kde-frameworks/attica-${PVCUT}*:6
+ =kde-frameworks/karchive-${PVCUT}*:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kpackage-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+ opds? ( =kde-frameworks/syndication-${PVCUT}*:6 )
+"
+RDEPEND="${DEPEND}
+ >=kde-frameworks/kirigami-${PVCUT}:6
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-kdebug-482349.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package opds KF6Syndication)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/files/, kde-frameworks/knewstuff/
@ 2024-04-14 20:03 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2024-04-14 20:03 UTC (permalink / raw
To: gentoo-commits
commit: 3d1c964c7d2132faef012122cc7df84d7307ab1c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 19:47:48 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 20:01:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d1c964c
kde-frameworks/knewstuff: drop 6.0.0-r2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/knewstuff/Manifest | 1 -
.../files/knewstuff-6.0.0-fix-kdebug-482349.patch | 42 ---------------------
kde-frameworks/knewstuff/knewstuff-6.0.0-r2.ebuild | 43 ----------------------
3 files changed, 86 deletions(-)
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index d1c2b92359d7..04054ca8c19e 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,3 +1,2 @@
DIST knewstuff-5.115.0.tar.xz 3389164 BLAKE2B 663e8695f6f5b2f470926737d36fd2117d19661bfcd4e46e2b7a9ea22a2da1b9ddeb7e15d323d13dd1fe2e37ca8bc81f57782d0c9f8fafe4c145752cf34e7182 SHA512 32b9d833d20932b7d6b20cc77812db1a3b01db4e581600c145dafc24becf27b7b72efb4c5f20a1b83b598346696198378095bc28efbfaa24f9944a62d5be29e4
-DIST knewstuff-6.0.0.tar.xz 3099232 BLAKE2B 2b6409c625c31895c998acc56146aa9d4ccdb348d85899d26b00795931ee5efc577b36eaf4429892ed7b06e086815877c558780e89f89d1831bb817fd9559621 SHA512 b74bf694ba919553d9e1cc47c97bdebda939c04f700b953901298967ff817a1784698aee23a9e95bd86db7e368dc4246c74ceef86a8d867bbf271d5177c5af48
DIST knewstuff-6.1.0.tar.xz 3102052 BLAKE2B c2f4936dc91bf91d5cfc48eb769e44b37745b05984ccc673369c6e3f1c078b3ee7f9afc193d522cd53c79a5a8fb6a0c890dbfebeb62828c3b8587ca7831fdd8c SHA512 1ec44c82f156da74b9db64840908b472a81a9bdaac1f47d4fb76e3749306f21668791582e6a8c9190af6f621f3e3fa2e461c0d3321e3dde10960c891d6c8709b
diff --git a/kde-frameworks/knewstuff/files/knewstuff-6.0.0-fix-kdebug-482349.patch b/kde-frameworks/knewstuff/files/knewstuff-6.0.0-fix-kdebug-482349.patch
deleted file mode 100644
index 6e0b2ca3c025..000000000000
--- a/kde-frameworks/knewstuff/files/knewstuff-6.0.0-fix-kdebug-482349.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 49f2037ac22fcb430fadd5d7b29bd8af234573a4 Mon Sep 17 00:00:00 2001
-From: Akseli Lahtinen <akselmo@akselmo.dev>
-Date: Thu, 7 Mar 2024 16:01:44 +0000
-Subject: [PATCH] Fix link list dialog for installation button
-
-In gridview, installation buttons showed "Install..." for every item,
-even if the item had only single download link. This fixes it
-by showing correct button.
-
-The problem was using `entry` directly instead of `model`.
-
-BUG: 482349
-FIXED-IN: 6.1
----
- .../qml/private/entrygriddelegates/TileDelegate.qml | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml b/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml
-index 2fdee68b4..36224abe2 100644
---- a/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml
-+++ b/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml
-@@ -40,13 +40,13 @@ Private.GridTileDelegate {
- visible: enabled
- },
- Kirigami.Action {
-- text: entry.downloadLinks.length === 1 ? i18ndc("knewstuff6", "Request installation of this item, available when there is exactly one downloadable item", "Install") : i18ndc("knewstuff6", "Show installation options, where there is more than one downloadable item", "Install…");
-+ text: model.downloadLinks.length === 1 ? i18ndc("knewstuff6", "Request installation of this item, available when there is exactly one downloadable item", "Install") : i18ndc("knewstuff6", "Show installation options, where there is more than one downloadable item", "Install…");
- icon.name: "install"
- onTriggered: {
-- if (entry.downloadLinks.length === 1) {
-- newStuffEngine.install(entry.entry, NewStuff.ItemsModel.FirstLinkId);
-+ if (model.downloadLinks.length === 1) {
-+ newStuffEngine.install(entry, NewStuff.ItemsModel.FirstLinkId);
- } else {
-- downloadItemsSheet.downloadLinks = entry.downloadLinks;
-+ downloadItemsSheet.downloadLinks = model.downloadLinks;
- downloadItemsSheet.entry = entry;
- downloadItemsSheet.open();
- }
---
-GitLab
-
diff --git a/kde-frameworks/knewstuff/knewstuff-6.0.0-r2.ebuild b/kde-frameworks/knewstuff/knewstuff-6.0.0-r2.ebuild
deleted file mode 100644
index be867b1f7104..000000000000
--- a/kde-frameworks/knewstuff/knewstuff-6.0.0-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=6.6.2
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Framework for downloading and sharing additional application data"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64"
-IUSE="opds"
-
-DEPEND="
- >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
- >=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
- =kde-frameworks/attica-${PVCUT}*:6
- =kde-frameworks/karchive-${PVCUT}*:6
- =kde-frameworks/kconfig-${PVCUT}*:6
- =kde-frameworks/kcoreaddons-${PVCUT}*:6
- =kde-frameworks/ki18n-${PVCUT}*:6
- =kde-frameworks/kpackage-${PVCUT}*:6
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
- opds? ( =kde-frameworks/syndication-${PVCUT}*:6 )
-"
-RDEPEND="${DEPEND}
- >=dev-qt/qt5compat-${QTMIN}:6[qml]
- >=kde-frameworks/kirigami-${PVCUT}:6
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-kdebug-482349.patch" )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package opds KF6Syndication)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-04-14 20:03 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-14 20:03 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/files/, kde-frameworks/knewstuff/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-03-11 9:05 Andreas Sturmlechner
2023-04-22 16:21 Andreas Sturmlechner
2022-05-04 20:50 Andreas Sturmlechner
2022-04-09 16:07 Andreas Sturmlechner
2022-03-26 16:40 Andreas Sturmlechner
2022-02-10 20:10 Andreas Sturmlechner
2021-10-02 13:35 Andreas Sturmlechner
2021-04-11 14:23 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox