From 8d3896dff94fd7a22f46dff998c4ba20cda66639 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 10 Mar 2022 15:06:02 -0600 Subject: [PATCH 1/7] 5.92.0 --- .gitignore | 1 + kf5-knewstuff.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 325369d..72293b5 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /knewstuff-5.89.0.tar.xz /knewstuff-5.90.0.tar.xz /knewstuff-5.91.0.tar.xz +/knewstuff-5.92.0.tar.xz diff --git a/kf5-knewstuff.spec b/kf5-knewstuff.spec index 6fafc64..fc86578 100644 --- a/kf5-knewstuff.spec +++ b/kf5-knewstuff.spec @@ -2,7 +2,7 @@ %global framework knewstuff Name: kf5-%{framework} -Version: 5.91.0 +Version: 5.92.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 module for downloading application assets @@ -106,6 +106,9 @@ developing applications that use %{name}. %changelog +* Thu Mar 10 2022 Rex Dieter - 5.92.0-1 +- 5.92.0 + * Fri Feb 11 2022 Rex Dieter - 5.91.0-1 - 5.91.0 diff --git a/sources b/sources index 5e8c3e0..5b336c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (knewstuff-5.91.0.tar.xz) = aab659123531897ed011bd1e1b3ad4008f668e3565fdb981013e16771cbde62a8288d32ac4422617bd8f44377dd7f9e36caed1773297f3569c8a58527a65591d +SHA512 (knewstuff-5.92.0.tar.xz) = 689089724f53ecd59bc79e046bb0b3f64e7a3bd7c8d9a5cd8be15d13bdc045e0484e05a2e0a87ab0134744da829becf8fc669a9e17b7668dafec3fff8e62a2a8 From f963e12185d9b45dcf0a6ecb6b9779f0bee7a24e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 29 Mar 2022 08:46:05 -0500 Subject: [PATCH 2/7] Do not set user-visible name as additional agent information (kde#451165) --- ...visible-name-as-additional-agent-inf.patch | 54 +++++++++++++++++++ kf5-knewstuff.spec | 7 ++- 2 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 0010-Do-not-set-user-visible-name-as-additional-agent-inf.patch diff --git a/0010-Do-not-set-user-visible-name-as-additional-agent-inf.patch b/0010-Do-not-set-user-visible-name-as-additional-agent-inf.patch new file mode 100644 index 0000000..4cd1a8b --- /dev/null +++ b/0010-Do-not-set-user-visible-name-as-additional-agent-inf.patch @@ -0,0 +1,54 @@ +From 693a2ea3926400b1482888a2df2c532852b8f971 Mon Sep 17 00:00:00 2001 +From: Alexander Lohnau +Date: Sun, 20 Mar 2022 20:29:51 +0100 +Subject: [PATCH 10/15] 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 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 &categories) { + d->categoriesMetadata = categories; + Q_EMIT signalCategoriesMetadataLoded(categories); +-- +2.35.1 + diff --git a/kf5-knewstuff.spec b/kf5-knewstuff.spec index fc86578..8040a63 100644 --- a/kf5-knewstuff.spec +++ b/kf5-knewstuff.spec @@ -1,9 +1,8 @@ -%undefine __cmake_in_source_build %global framework knewstuff Name: kf5-%{framework} Version: 5.92.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 module for downloading application assets License: LGPLv2+ @@ -19,6 +18,7 @@ URL: https://invent.kde.org/frameworks/%{framework} Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz ## upstream patches +Patch10: 0010-Do-not-set-user-visible-name-as-additional-agent-inf.patch # filter qml provides %global __provides_exclude_from ^%{_kf5_qmldir}/.*\\.so$ @@ -106,6 +106,9 @@ developing applications that use %{name}. %changelog +* Tue Mar 29 2022 Rex Dieter - 5.92.0-2 +- Do not set user-visible name as additional agent information (kde#451165) + * Thu Mar 10 2022 Rex Dieter - 5.92.0-1 - 5.92.0 From 0e899b54f093fd4b85f975f1d6eada69bfdb7606 Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Sun, 10 Apr 2022 13:28:06 +0930 Subject: [PATCH 3/7] Update to 5.93 --- .gitignore | 1 + kf5-knewstuff.spec | 5 ++++- sources | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 72293b5..870f8c0 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /knewstuff-5.90.0.tar.xz /knewstuff-5.91.0.tar.xz /knewstuff-5.92.0.tar.xz +./knewstuff-5.93.tar.xz diff --git a/kf5-knewstuff.spec b/kf5-knewstuff.spec index 8040a63..015eb31 100644 --- a/kf5-knewstuff.spec +++ b/kf5-knewstuff.spec @@ -1,7 +1,7 @@ %global framework knewstuff Name: kf5-%{framework} -Version: 5.92.0 +Version: 5.93.0 Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 module for downloading application assets @@ -106,6 +106,9 @@ developing applications that use %{name}. %changelog +* Sun Apr 10 2022 Justin Zobel - 5.93-1 +- Update to 5.93 + * Tue Mar 29 2022 Rex Dieter - 5.92.0-2 - Do not set user-visible name as additional agent information (kde#451165) diff --git a/sources b/sources index 5b336c7..86e86e1 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (knewstuff-5.92.0.tar.xz) = 689089724f53ecd59bc79e046bb0b3f64e7a3bd7c8d9a5cd8be15d13bdc045e0484e05a2e0a87ab0134744da829becf8fc669a9e17b7668dafec3fff8e62a2a8 +SHA512 (knewstuff-5.93.0.tar.xz) = ed18c8d1dda39db68d2c426936ba4d2576b0b7298dd306ad92101c992fda1420ffd9bfbd54b2bd9ee9afcfda6ca72b68258b46d6f151bc8b99a1c82577fca383 From c4441258d59ce9d9c75834e13203281decc791bc Mon Sep 17 00:00:00 2001 From: Marie Loise Nolden Date: Sun, 10 Apr 2022 15:48:47 +0000 Subject: [PATCH 4/7] Update kf5-knewstuff.spec --- kf5-knewstuff.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/kf5-knewstuff.spec b/kf5-knewstuff.spec index 015eb31..73f0a8f 100644 --- a/kf5-knewstuff.spec +++ b/kf5-knewstuff.spec @@ -18,7 +18,6 @@ URL: https://invent.kde.org/frameworks/%{framework} Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz ## upstream patches -Patch10: 0010-Do-not-set-user-visible-name-as-additional-agent-inf.patch # filter qml provides %global __provides_exclude_from ^%{_kf5_qmldir}/.*\\.so$ From 9f3ac328125f1f5289a1a337e31cb8356d765959 Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Mon, 11 Apr 2022 15:33:26 +0930 Subject: [PATCH 5/7] Remove no longer needed patch --- kf5-knewstuff.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/kf5-knewstuff.spec b/kf5-knewstuff.spec index 015eb31..73f0a8f 100644 --- a/kf5-knewstuff.spec +++ b/kf5-knewstuff.spec @@ -18,7 +18,6 @@ URL: https://invent.kde.org/frameworks/%{framework} Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz ## upstream patches -Patch10: 0010-Do-not-set-user-visible-name-as-additional-agent-inf.patch # filter qml provides %global __provides_exclude_from ^%{_kf5_qmldir}/.*\\.so$ From 7aaf74d6e5c1ce98701ce0273ecc3b45a51edc09 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 13 May 2022 11:21:20 -0500 Subject: [PATCH 6/7] 5.94.0 --- .gitignore | 1 + kf5-knewstuff.spec | 7 +++++-- sources | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 870f8c0..0eb212e 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /knewstuff-5.91.0.tar.xz /knewstuff-5.92.0.tar.xz ./knewstuff-5.93.tar.xz +/knewstuff-5.94.0.tar.xz diff --git a/kf5-knewstuff.spec b/kf5-knewstuff.spec index 73f0a8f..1c6ce5e 100644 --- a/kf5-knewstuff.spec +++ b/kf5-knewstuff.spec @@ -1,8 +1,8 @@ %global framework knewstuff Name: kf5-%{framework} -Version: 5.93.0 -Release: 2%{?dist} +Version: 5.94.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 module for downloading application assets License: LGPLv2+ @@ -105,6 +105,9 @@ developing applications that use %{name}. %changelog +* Fri May 13 2022 Rex Dieter - 5.94.0-1 +- 5.94.0 + * Sun Apr 10 2022 Justin Zobel - 5.93-1 - Update to 5.93 diff --git a/sources b/sources index 86e86e1..cff4f67 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (knewstuff-5.92.0.tar.xz) = 689089724f53ecd59bc79e046bb0b3f64e7a3bd7c8d9a5cd8be15d13bdc045e0484e05a2e0a87ab0134744da829becf8fc669a9e17b7668dafec3fff8e62a2a8 -SHA512 (knewstuff-5.93.0.tar.xz) = ed18c8d1dda39db68d2c426936ba4d2576b0b7298dd306ad92101c992fda1420ffd9bfbd54b2bd9ee9afcfda6ca72b68258b46d6f151bc8b99a1c82577fca383 +SHA512 (knewstuff-5.94.0.tar.xz) = 6269614a0df2616bd5bd1a8e9c3f8dc16920bbd4cf8fd18a5ccc1e818c292d90533de3dc77ce8fbbb183388ad6fed72a30b78177eddd87624499b3c75d55a226 From 075d8bdf2e5532bdff0e3aa200858b6e91189337 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Sun, 3 Jul 2022 23:25:45 +0200 Subject: [PATCH 7/7] 5.96.0 --- .gitignore | 1 + kf5-knewstuff.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0eb212e..9421fbc 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /knewstuff-5.92.0.tar.xz ./knewstuff-5.93.tar.xz /knewstuff-5.94.0.tar.xz +/knewstuff-5.96.0.tar.xz diff --git a/kf5-knewstuff.spec b/kf5-knewstuff.spec index 1c6ce5e..aca71e3 100644 --- a/kf5-knewstuff.spec +++ b/kf5-knewstuff.spec @@ -1,7 +1,7 @@ %global framework knewstuff Name: kf5-%{framework} -Version: 5.94.0 +Version: 5.96.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 module for downloading application assets @@ -90,10 +90,8 @@ developing applications that use %{name}. %{_kf5_qmldir}/org/kde/newstuff/ %files devel -%{_kf5_includedir}/knewstuff_version.h -%{_kf5_includedir}/knewstuffcore_version.h -%{_kf5_includedir}/knewstuffquick_version.h %{_kf5_includedir}/KNewStuff3/ +%{_kf5_includedir}/KMoreTools/ %{_kf5_libdir}/libKF5NewStuff.so %{_kf5_libdir}/libKF5NewStuffCore.so %{_kf5_libdir}/libKF5NewStuffWidgets.so @@ -105,6 +103,9 @@ developing applications that use %{name}. %changelog +* Sun Jul 03 2022 Marc Deop - 5.96.0-1 +- 5.96.0 + * Fri May 13 2022 Rex Dieter - 5.94.0-1 - 5.94.0 diff --git a/sources b/sources index cff4f67..d9a075a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (knewstuff-5.94.0.tar.xz) = 6269614a0df2616bd5bd1a8e9c3f8dc16920bbd4cf8fd18a5ccc1e818c292d90533de3dc77ce8fbbb183388ad6fed72a30b78177eddd87624499b3c75d55a226 +SHA512 (knewstuff-5.96.0.tar.xz) = 5fffe90a25adbe5d0f9d69694beba5f9fe0418656d190bdb99c1495b7338cec5c0374e8f38d4fe3801cbea18a7596494d0e651fdb628c9d4e13932627fe60a26