* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/, kde-frameworks/knewstuff/files/
@ 2020-12-19 23:36 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2020-12-19 23:36 UTC (permalink / raw
To: gentoo-commits
commit: e8191b8cfc11a02c4f9a65e64daf04b4bba5039b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 23:21:54 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 23:36:50 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8191b8c
kde-frameworks/knewstuff: Add upstream crashfix
Upstream commit 243ea6155b28457c8b1441fee8ab1037828d21ba
See also: https://mail.kde.org/pipermail/distributions/2020-December/000910.html
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=429442
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/knewstuff-5.77.0-add-dptr-to-cache.patch | 135 +++++++++++++++++++++
.../knewstuff/knewstuff-5.77.0-r1.ebuild | 42 +++++++
2 files changed, 177 insertions(+)
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
new file mode 100644
index 00000000000..f6547fc6e5f
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-5.77.0-add-dptr-to-cache.patch
@@ -0,0 +1,135 @@
+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
new file mode 100644
index 00000000000..59ba609ab98
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.77.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 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] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/, kde-frameworks/knewstuff/files/
@ 2021-09-29 8:08 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2021-09-29 8:08 UTC (permalink / raw
To: gentoo-commits
commit: 3f39c5021c9a3ce171b3b30718e6f4b0b5b5a72b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 29 07:59:25 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 29 08:08:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f39c502
kde-frameworks/knewstuff: Fix crash in DownloadWidget
See also:
https://mail.kde.org/pipermail/distributions/2021-September/001051.html
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=443025
Package-Manager: Portage-3.0.24, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...wstuff-5.86.0-fix-crash-in-DownloadWidget.patch | 26 +++++++++++
.../knewstuff/knewstuff-5.86.0-r1.ebuild | 51 ++++++++++++++++++++++
2 files changed, 77 insertions(+)
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
new file mode 100644
index 00000000000..dbed97665d5
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-5.86.0-fix-crash-in-DownloadWidget.patch
@@ -0,0 +1,26 @@
+From d09ba1917cb7e035a9aac6c27c86fc4df5da3194 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Mon, 27 Sep 2021 20:05:09 +0200
+Subject: [PATCH] Fix crash in DownloadWidget
+
+BUGS: 443025
+---
+ src/downloadwidget.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/downloadwidget.cpp b/src/downloadwidget.cpp
+index 40df2e8c..36cfde37 100644
+--- a/src/downloadwidget.cpp
++++ b/src/downloadwidget.cpp
+@@ -97,7 +97,7 @@ Entry::List DownloadWidget::installedEntries()
+ }
+
+ DownloadWidgetPrivate::DownloadWidgetPrivate(DownloadWidget *qq)
+- : q(q)
++ : q(qq)
+ , engine(new KNSCore::Engine)
+ , model(new KNSCore::ItemsModel(engine))
+ , messageTimer(nullptr)
+--
+GitLab
+
diff --git a/kde-frameworks/knewstuff/knewstuff-5.86.0-r1.ebuild b/kde-frameworks/knewstuff/knewstuff-5.86.0-r1.ebuild
new file mode 100644
index 00000000000..293f9356d4a
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.86.0-r1.ebuild
@@ -0,0 +1,51 @@
+# 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
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package opds KF5Syndication)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/, kde-frameworks/knewstuff/files/
@ 2021-10-11 11:01 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2021-10-11 11:01 UTC (permalink / raw
To: gentoo-commits
commit: ec00f7bc048a6a7aa9a80572c931671287865a1d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 11 06:42:47 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 11 11:00:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec00f7bc
kde-frameworks/knewstuff: drop 5.86.0*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/knewstuff/Manifest | 1 -
...wstuff-5.86.0-fix-crash-in-DownloadWidget.patch | 26 ----------
...5.86.0-include-user-agent-on-KNS-requests.patch | 58 ----------------------
.../knewstuff/knewstuff-5.86.0-r2.ebuild | 54 --------------------
4 files changed, 139 deletions(-)
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 0dcd99369cc..aca1507ba00 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,3 +1,2 @@
DIST knewstuff-5.85.0.tar.xz 1138788 BLAKE2B 6f037ddd3dd7d9499d19b8d10b2486ced1ab169180d69a004369158665eb098015c60fd657e9d84af7b15634a28abd13e761b2728861f3f88c02ac0510121c5c SHA512 2da81b520ecab1d43b79e75ec56cbba410bd0944b13ea53eeee5ca94c77f9c04ad91a35b0c1942516edc5101a365f2a91b774405183bc8bf82c6cd5fb53a0570
-DIST knewstuff-5.86.0.tar.xz 1142536 BLAKE2B 8b1aa8ee9e8dc54f0431f77516d3e39bb4f9ff33f72573fee27b749df692b32c850230a2bc566ee580a56b587af05822a0348cd61d58501c49b507fdf0d164bb SHA512 984291bb68e6bde5d90b35245c101c0feb64338ee4c0656802f4812c3a0619a5291307e8e5e2de99b7a34e29554e2283de6513156e7aac32f0d2198433bb45cc
DIST knewstuff-5.87.0.tar.xz 1146336 BLAKE2B 1f1beff60c59532e892e9b5f561b6a0848bd55d8c483f8195496fb9ec269c2cd4fc3f22216669b6486d5ae987b5d664bc20ffe8d867e401de7be6a6f228b009f SHA512 6979417e3a8b4b9a1dae0850cb8e333d31c1124f60c67ecc292b0b9372e6c7fcd8d5ae8f59afdcc543379b148f0fc310cfc7a24f8ae8fbf29358de0508ff307b
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
deleted file mode 100644
index dbed97665d5..00000000000
--- a/kde-frameworks/knewstuff/files/knewstuff-5.86.0-fix-crash-in-DownloadWidget.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d09ba1917cb7e035a9aac6c27c86fc4df5da3194 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Mon, 27 Sep 2021 20:05:09 +0200
-Subject: [PATCH] Fix crash in DownloadWidget
-
-BUGS: 443025
----
- src/downloadwidget.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/downloadwidget.cpp b/src/downloadwidget.cpp
-index 40df2e8c..36cfde37 100644
---- a/src/downloadwidget.cpp
-+++ b/src/downloadwidget.cpp
-@@ -97,7 +97,7 @@ Entry::List DownloadWidget::installedEntries()
- }
-
- DownloadWidgetPrivate::DownloadWidgetPrivate(DownloadWidget *qq)
-- : q(q)
-+ : q(qq)
- , engine(new KNSCore::Engine)
- , model(new KNSCore::ItemsModel(engine))
- , messageTimer(nullptr)
---
-GitLab
-
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
deleted file mode 100644
index 6252d28f7b9..00000000000
--- a/kde-frameworks/knewstuff/files/knewstuff-5.86.0-include-user-agent-on-KNS-requests.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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
deleted file mode 100644
index 06de5529585..00000000000
--- a/kde-frameworks/knewstuff/knewstuff-5.86.0-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/, kde-frameworks/knewstuff/files/
@ 2022-05-30 16:09 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2022-05-30 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 46ebee1ecc827efdf49097f41fd812cc36f90ec9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 15:33:33 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 30 16:09:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46ebee1e
kde-frameworks/knewstuff: Fix QtQuickDialogWrapper dialog for konsole
Upstream commit b634b65dd081746ccb8bdfa9bf2d878d13e2c0fb
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=452593
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...94.0-fix-QtQuickDialogWrapper-for-konsole.patch | 54 ++++++++++++++++++++++
.../knewstuff/knewstuff-5.94.0-r1.ebuild | 51 ++++++++++++++++++++
2 files changed, 105 insertions(+)
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.94.0-fix-QtQuickDialogWrapper-for-konsole.patch b/kde-frameworks/knewstuff/files/knewstuff-5.94.0-fix-QtQuickDialogWrapper-for-konsole.patch
new file mode 100644
index 000000000000..002d4c182b28
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-5.94.0-fix-QtQuickDialogWrapper-for-konsole.patch
@@ -0,0 +1,54 @@
+From b634b65dd081746ccb8bdfa9bf2d878d13e2c0fb Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Tue, 24 May 2022 12:58:54 +0200
+Subject: [PATCH] Fix QtQuickDialogWrapper dialog not being usable in konsole
+
+Patch provided by David Edmundson.
+
+```
+Issue is QGuiApplicationPrivate::showModalWindow
+
+it marks every other non-modal window as blocked, including new windows.
+
+when we focus the new dialog at a wayland/X level Qt gets it, but in it's own internal dispatching ignores that and sends it to the modal window
+
+Qt is smart enough to handle child windows appropriately, but only if it knows about them. Having a transient parent should take care of this. We should have this anyway as that will fix some window placement bugs.
+```
+
+BUG: 452593
+---
+ src/qtquickdialogwrapper.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/qtquickdialogwrapper.cpp b/src/qtquickdialogwrapper.cpp
+index 4f22b650..e31e8d80 100644
+--- a/src/qtquickdialogwrapper.cpp
++++ b/src/qtquickdialogwrapper.cpp
+@@ -7,10 +7,12 @@
+ #include "qtquickdialogwrapper.h"
+
+ #include <QEventLoop>
++#include <QGuiApplication>
+ #include <QQmlComponent>
+ #include <QQmlContext>
+ #include <QQmlEngine>
+ #include <QTimer>
++#include <QWindow>
+
+ #include <KLocalizedContext>
+
+@@ -70,6 +72,11 @@ QtQuickDialogWrapper::QtQuickDialogWrapper(const QString &configFile, QObject *p
+
+ // Forward relevant signals
+ connect(d->item, SIGNAL(closed()), this, SIGNAL(closed()));
++
++ // Otherwise, the dialog is not in front of other popups, BUG: 452593
++ auto window = qobject_cast<QWindow *>(d->item);
++ Q_ASSERT(window);
++ window->setTransientParent(QGuiApplication::focusWindow());
+ }
+ }
+
+--
+GitLab
+
diff --git a/kde-frameworks/knewstuff/knewstuff-5.94.0-r1.ebuild b/kde-frameworks/knewstuff/knewstuff-5.94.0-r1.ebuild
new file mode 100644
index 000000000000..73336dd92ec0
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.94.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.3
+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-QtQuickDialogWrapper-for-konsole.patch" ) # KDE-bug 452593
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package opds KF5Syndication)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/, kde-frameworks/knewstuff/files/
@ 2022-06-14 7:44 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2022-06-14 7:44 UTC (permalink / raw
To: gentoo-commits
commit: 551eeb4440a6f34a5025dc9d5b7ceeae248f7ff3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 07:39:53 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 07:43:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=551eeb44
kde-frameworks/knewstuff: drop 5.94.0*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/knewstuff/Manifest | 1 -
...94.0-fix-QtQuickDialogWrapper-for-konsole.patch | 54 ----------------------
.../knewstuff/knewstuff-5.94.0-r1.ebuild | 51 --------------------
3 files changed, 106 deletions(-)
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 655b76e34c49..4d9846422d22 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,3 +1,2 @@
DIST knewstuff-5.92.0.tar.xz 1155052 BLAKE2B ee3485c1e3371c139019bb1889aedb112f40c0bb0ee1c92c159b3a6b8a84208d53de10fb1d368852927b7a65e6e1cee3afcf99aa821e8468c67f8b0ac49db79d SHA512 689089724f53ecd59bc79e046bb0b3f64e7a3bd7c8d9a5cd8be15d13bdc045e0484e05a2e0a87ab0134744da829becf8fc669a9e17b7668dafec3fff8e62a2a8
-DIST knewstuff-5.94.0.tar.xz 1154916 BLAKE2B 668ed799cb34470e5f8132a49d47261b1e571c30106e7a4b623513f16c0ddcbeea5a7011bb637438326758b5b54019004c6a81ff66d1b7155eda4b47ad19888f SHA512 6269614a0df2616bd5bd1a8e9c3f8dc16920bbd4cf8fd18a5ccc1e818c292d90533de3dc77ce8fbbb183388ad6fed72a30b78177eddd87624499b3c75d55a226
DIST knewstuff-5.95.0.tar.xz 1155724 BLAKE2B a4b52c3ec3c3975fdceaf56b01eb8c243bc5de305cf14a081ab3a5691711aae24500fc7212282b37cc6a2ab9bd205c375307100506c1b0252e89649f0efed10e SHA512 d1ef25a32f1b534d46e3ce4141046c6d23585d851e14998fe55012f889ff390ac1b10655b2a1918f8f6c8689409e62147c0a85de7be85c93d602bf57c2a8078c
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.94.0-fix-QtQuickDialogWrapper-for-konsole.patch b/kde-frameworks/knewstuff/files/knewstuff-5.94.0-fix-QtQuickDialogWrapper-for-konsole.patch
deleted file mode 100644
index 002d4c182b28..000000000000
--- a/kde-frameworks/knewstuff/files/knewstuff-5.94.0-fix-QtQuickDialogWrapper-for-konsole.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From b634b65dd081746ccb8bdfa9bf2d878d13e2c0fb Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Tue, 24 May 2022 12:58:54 +0200
-Subject: [PATCH] Fix QtQuickDialogWrapper dialog not being usable in konsole
-
-Patch provided by David Edmundson.
-
-```
-Issue is QGuiApplicationPrivate::showModalWindow
-
-it marks every other non-modal window as blocked, including new windows.
-
-when we focus the new dialog at a wayland/X level Qt gets it, but in it's own internal dispatching ignores that and sends it to the modal window
-
-Qt is smart enough to handle child windows appropriately, but only if it knows about them. Having a transient parent should take care of this. We should have this anyway as that will fix some window placement bugs.
-```
-
-BUG: 452593
----
- src/qtquickdialogwrapper.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/qtquickdialogwrapper.cpp b/src/qtquickdialogwrapper.cpp
-index 4f22b650..e31e8d80 100644
---- a/src/qtquickdialogwrapper.cpp
-+++ b/src/qtquickdialogwrapper.cpp
-@@ -7,10 +7,12 @@
- #include "qtquickdialogwrapper.h"
-
- #include <QEventLoop>
-+#include <QGuiApplication>
- #include <QQmlComponent>
- #include <QQmlContext>
- #include <QQmlEngine>
- #include <QTimer>
-+#include <QWindow>
-
- #include <KLocalizedContext>
-
-@@ -70,6 +72,11 @@ QtQuickDialogWrapper::QtQuickDialogWrapper(const QString &configFile, QObject *p
-
- // Forward relevant signals
- connect(d->item, SIGNAL(closed()), this, SIGNAL(closed()));
-+
-+ // Otherwise, the dialog is not in front of other popups, BUG: 452593
-+ auto window = qobject_cast<QWindow *>(d->item);
-+ Q_ASSERT(window);
-+ window->setTransientParent(QGuiApplication::focusWindow());
- }
- }
-
---
-GitLab
-
diff --git a/kde-frameworks/knewstuff/knewstuff-5.94.0-r1.ebuild b/kde-frameworks/knewstuff/knewstuff-5.94.0-r1.ebuild
deleted file mode 100644
index 73336dd92ec0..000000000000
--- a/kde-frameworks/knewstuff/knewstuff-5.94.0-r1.ebuild
+++ /dev/null
@@ -1,51 +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.3
-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-QtQuickDialogWrapper-for-konsole.patch" ) # KDE-bug 452593
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package opds KF5Syndication)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/, kde-frameworks/knewstuff/files/
@ 2023-01-30 21:43 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2023-01-30 21:43 UTC (permalink / raw
To: gentoo-commits
commit: 8110f4e742ce83572f258fc81481ae2c3cef4a97
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 21:27:33 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 21:34:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8110f4e7
kde-frameworks/knewstuff: Fix crash in QQuickQuestionListener
Backport upstream commit c8e5b36e190f8b71ac14e3afd403debdbe3cf9a8
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=464624
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...102.0-fix-crash-in-QQuickQuestionListener.patch | 55 ++++++++++++++++++++++
.../knewstuff/knewstuff-5.102.0-r1.ebuild | 52 ++++++++++++++++++++
2 files changed, 107 insertions(+)
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
new file mode 100644
index 000000000000..00bafeb28b93
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-5.102.0-fix-crash-in-QQuickQuestionListener.patch
@@ -0,0 +1,55 @@
+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
new file mode 100644
index 000000000000..2eb1ae629599
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.102.0-r1.ebuild
@@ -0,0 +1,52 @@
+# 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] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/, kde-frameworks/knewstuff/files/
@ 2024-07-16 21:41 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2024-07-16 21:41 UTC (permalink / raw
To: gentoo-commits
commit: 3ee70e6a8a9a6a34c549ccf045f5f9e57e82529b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 19:32:23 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 21:40:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ee70e6a
kde-frameworks/knewstuff: EntryDetails.qml: Qualify newStuffModel
... use downloadItemId
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=483659
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../knewstuff-6.4.0-fix-reference-error.patch | 38 ++++++++++++++++++++
kde-frameworks/knewstuff/knewstuff-6.4.0-r1.ebuild | 42 ++++++++++++++++++++++
2 files changed, 80 insertions(+)
diff --git a/kde-frameworks/knewstuff/files/knewstuff-6.4.0-fix-reference-error.patch b/kde-frameworks/knewstuff/files/knewstuff-6.4.0-fix-reference-error.patch
new file mode 100644
index 000000000000..536b8d7533ea
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-6.4.0-fix-reference-error.patch
@@ -0,0 +1,38 @@
+From f8fb221d6f355c4f0873592fbf7dce358f4f0b40 Mon Sep 17 00:00:00 2001
+From: Akseli Lahtinen <akselmo@akselmo.dev>
+Date: Fri, 12 Jul 2024 12:58:53 +0000
+Subject: [PATCH] EntryDetails.qml: Qualify newStuffModel, use downloadItemId
+
+There is no such thing as entryId, change it to downloadItemId
+Otherwise the item wont download anything.
+
+This fixes a bug where in detailed item view, if the list with multiple downloads
+appears and user clicks download, nothing would happen and knewstuff would report this
+warning in terminal: `qrc:/qt/qml/org/kde/newstuff/EntryDetails.qml:88: ReferenceError: entryId is not defined`
+
+After this fix it will download items.
+
+BUG:483659
+---
+ src/qtquick/qml/EntryDetails.qml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/qtquick/qml/EntryDetails.qml b/src/qtquick/qml/EntryDetails.qml
+index d21e18fc2..94fc88d76 100644
+--- a/src/qtquick/qml/EntryDetails.qml
++++ b/src/qtquick/qml/EntryDetails.qml
+@@ -85,9 +85,9 @@ KCMUtils.SimpleKCM {
+ parent: component.QQC2.Overlay.overlay
+
+ onItemPicked: (entry, downloadItemId, downloadName) => {
+- const entryName = newStuffModel.data(newStuffModel.index(entryId, 0), NewStuff.ItemsModel.NameRole);
++ const entryName = component.newStuffModel.data(component.newStuffModel.index(downloadItemId, 0), NewStuff.ItemsModel.NameRole);
+ applicationWindow().showPassiveNotification(i18ndc("knewstuff6", "A passive notification shown when installation of an item is initiated", "Installing %1 from %2", downloadName, entryName), 1500);
+- newStuffModel.engine.install(component.entry, downloadItemId);
++ component.newStuffModel.engine.install(component.entry, downloadItemId);
+ }
+ }
+
+--
+GitLab
+
diff --git a/kde-frameworks/knewstuff/knewstuff-6.4.0-r1.ebuild b/kde-frameworks/knewstuff/knewstuff-6.4.0-r1.ebuild
new file mode 100644
index 000000000000..266488aa0e98
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-6.4.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 ~arm64 ~riscv ~x86"
+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-reference-error.patch" ) # KDE-bug 483659
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package opds KF6Syndication)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/, kde-frameworks/knewstuff/files/
@ 2024-08-10 7:57 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2024-08-10 7:57 UTC (permalink / raw
To: gentoo-commits
commit: 167c777963a8738088b67b628b846ea64505929d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 9 20:36:36 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 07:56:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=167c7779
kde-frameworks/knewstuff: drop 6.4.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/knewstuff/Manifest | 1 -
.../knewstuff-6.4.0-fix-reference-error.patch | 38 --------------------
kde-frameworks/knewstuff/knewstuff-6.4.0-r1.ebuild | 42 ----------------------
3 files changed, 81 deletions(-)
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 9090ef1e3ca5..179a0efe1cb8 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,3 +1,2 @@
DIST knewstuff-5.116.0.tar.xz 3359252 BLAKE2B 76df212d33e2ff3a4e47024c8007dcf5e595a892d4ddc5e3579639cc2ec86589392c8a9e53ae5e39d8b71b632a84b1d615291f44635e43514ddb2468c8e4d0d5 SHA512 c66f8905c622964a81609d384ea64c0614714b4d760ee908e2efcdaab4ef146fc2af099625e81b83c2e43e4f97a0f5960dae345cbf9d8453a15b465536c06152
-DIST knewstuff-6.4.0.tar.xz 3092488 BLAKE2B c33565d331b271f1d2e0eb6054517cf38838f737be4fb9c8282f5581a7c5ee384e2c0f7672484b72a8590d02d18b90c1085770801bd0bf59ba1753b09f1a39b1 SHA512 1ed697dc896052c7096ce8711776971447c9414b9d2ea1dd5c70a4cfc316a241af7ae17db6e4daf90edb73f12e16a6da3a7f0e09a2ebf1cb099e6a9d19c95aad
DIST knewstuff-6.5.0.tar.xz 3092996 BLAKE2B f6727258b7d036109badfe54fa2e20cb309ec8befadc3ba85b578af9d115685e448d89214cc8b9da1f0d59833287fe91a1367c161cc9215006d7868e5b08ca47 SHA512 a13c62dbd66a0df11c37734a0d9ff68e5f115fc921af74f7df301729e6f7adbe8bc8ee4a58851577516b2c5cdbe560141d6991cd62c29357a5e678ae1945d8af
diff --git a/kde-frameworks/knewstuff/files/knewstuff-6.4.0-fix-reference-error.patch b/kde-frameworks/knewstuff/files/knewstuff-6.4.0-fix-reference-error.patch
deleted file mode 100644
index 536b8d7533ea..000000000000
--- a/kde-frameworks/knewstuff/files/knewstuff-6.4.0-fix-reference-error.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f8fb221d6f355c4f0873592fbf7dce358f4f0b40 Mon Sep 17 00:00:00 2001
-From: Akseli Lahtinen <akselmo@akselmo.dev>
-Date: Fri, 12 Jul 2024 12:58:53 +0000
-Subject: [PATCH] EntryDetails.qml: Qualify newStuffModel, use downloadItemId
-
-There is no such thing as entryId, change it to downloadItemId
-Otherwise the item wont download anything.
-
-This fixes a bug where in detailed item view, if the list with multiple downloads
-appears and user clicks download, nothing would happen and knewstuff would report this
-warning in terminal: `qrc:/qt/qml/org/kde/newstuff/EntryDetails.qml:88: ReferenceError: entryId is not defined`
-
-After this fix it will download items.
-
-BUG:483659
----
- src/qtquick/qml/EntryDetails.qml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/qtquick/qml/EntryDetails.qml b/src/qtquick/qml/EntryDetails.qml
-index d21e18fc2..94fc88d76 100644
---- a/src/qtquick/qml/EntryDetails.qml
-+++ b/src/qtquick/qml/EntryDetails.qml
-@@ -85,9 +85,9 @@ KCMUtils.SimpleKCM {
- parent: component.QQC2.Overlay.overlay
-
- onItemPicked: (entry, downloadItemId, downloadName) => {
-- const entryName = newStuffModel.data(newStuffModel.index(entryId, 0), NewStuff.ItemsModel.NameRole);
-+ const entryName = component.newStuffModel.data(component.newStuffModel.index(downloadItemId, 0), NewStuff.ItemsModel.NameRole);
- applicationWindow().showPassiveNotification(i18ndc("knewstuff6", "A passive notification shown when installation of an item is initiated", "Installing %1 from %2", downloadName, entryName), 1500);
-- newStuffModel.engine.install(component.entry, downloadItemId);
-+ component.newStuffModel.engine.install(component.entry, downloadItemId);
- }
- }
-
---
-GitLab
-
diff --git a/kde-frameworks/knewstuff/knewstuff-6.4.0-r1.ebuild b/kde-frameworks/knewstuff/knewstuff-6.4.0-r1.ebuild
deleted file mode 100644
index d79237ebf728..000000000000
--- a/kde-frameworks/knewstuff/knewstuff-6.4.0-r1.ebuild
+++ /dev/null
@@ -1,42 +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 ~arm64 ~ppc64 ~riscv ~x86"
-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-reference-error.patch" ) # KDE-bug 483659
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package opds KF6Syndication)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-08-10 7:57 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-30 16:09 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/, kde-frameworks/knewstuff/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-08-10 7:57 Andreas Sturmlechner
2024-07-16 21:41 Andreas Sturmlechner
2023-01-30 21:43 Andreas Sturmlechner
2022-06-14 7:44 Andreas Sturmlechner
2021-10-11 11:01 Andreas Sturmlechner
2021-09-29 8:08 Andreas Sturmlechner
2020-12-19 23:36 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox