From 7e17b5aabc330abb894f2b90bef0e3fcbcd180d2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 6 Aug 2022 14:10:02 +0100 Subject: gentoo auto-resync : 06:08:2022 - 14:10:01 --- kde-frameworks/knewstuff/Manifest | 4 -- .../files/knewstuff-5.92.0-KDEBUG-451165.patch | 53 --------------------- ...newstuff-5.92.0-fix-valid-tar-recognition.patch | 27 ----------- .../knewstuff/knewstuff-5.92.0-r2.ebuild | 54 ---------------------- 4 files changed, 138 deletions(-) delete mode 100644 kde-frameworks/knewstuff/files/knewstuff-5.92.0-KDEBUG-451165.patch delete mode 100644 kde-frameworks/knewstuff/files/knewstuff-5.92.0-fix-valid-tar-recognition.patch delete mode 100644 kde-frameworks/knewstuff/knewstuff-5.92.0-r2.ebuild (limited to 'kde-frameworks/knewstuff') diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest index 2827003902e4..63e49e78b709 100644 --- a/kde-frameworks/knewstuff/Manifest +++ b/kde-frameworks/knewstuff/Manifest @@ -1,7 +1,3 @@ -AUX knewstuff-5.92.0-KDEBUG-451165.patch 2700 BLAKE2B 0478eb83efc569151a0ecc043ce28f26e14a3803019e71039634fbac095204882c45a43d4f0520d8199c037a4cb291e543ec61c5667e84f52044a50877996f3d SHA512 170f6155f78b1386b4a807bcec1765c9bc8c7aec589a7ed364159597e324eacca390cef63152ddcb9f6d81b175089ece8628c6f861a4e3089cad2978188729b6 -AUX knewstuff-5.92.0-fix-valid-tar-recognition.patch 1123 BLAKE2B 6febe01e614eafc88b1c29c327d0c5906347d8d3db518126c0950134e8764b31d5145501c2068489fa0435b6263bdfc6899a567bfa6f82317b50b56e312cfa13 SHA512 4a216fc24709fb602ed2a7d7ed6d9e9bce66dedd9eb64f41f2d5e3a6363f916602c8adb4588cd3781c0383cb3f4732c332fd82adce8abac76ad2507b8c7be0f0 -DIST knewstuff-5.92.0.tar.xz 1155052 BLAKE2B ee3485c1e3371c139019bb1889aedb112f40c0bb0ee1c92c159b3a6b8a84208d53de10fb1d368852927b7a65e6e1cee3afcf99aa821e8468c67f8b0ac49db79d SHA512 689089724f53ecd59bc79e046bb0b3f64e7a3bd7c8d9a5cd8be15d13bdc045e0484e05a2e0a87ab0134744da829becf8fc669a9e17b7668dafec3fff8e62a2a8 DIST knewstuff-5.96.0.tar.xz 1159824 BLAKE2B 391226a61f8b7c23eb7b942a3181a1887d42d83bdfbc8d8fd45f593d8eb15e9fe4f98b8067d81430d84b1a0bc178a0d549a3f73b926bfe5358254100fa4502f6 SHA512 5fffe90a25adbe5d0f9d69694beba5f9fe0418656d190bdb99c1495b7338cec5c0374e8f38d4fe3801cbea18a7596494d0e651fdb628c9d4e13932627fe60a26 -EBUILD knewstuff-5.92.0-r2.ebuild 1391 BLAKE2B 013cb64dc992bfe6ffe2f2746acfe5e393a545f84ea4cd7996c1deb68924e1546029102141bb23893e8fd50d139643bd1c81d96337eb140e787a27d1046bc4bb SHA512 4c0a9a07e57946f26aebc7f2125cf28ba18b55ab63a0f326115082df3d223635b292d870c5da1c14c6f9b91f36ee0e20bf0e779ef87f8e0a9192752c12272834 EBUILD knewstuff-5.96.0.ebuild 1287 BLAKE2B 1727f536d43ac547c8edb1d73c63b2f5a7a67e577fd1286774ff7d5b20d499f29c3a93297699a17a995ca5554c637ac68390abadcf1cc96e2f9391babb00c740 SHA512 8e1fcb4b09b7c1d8e7dd9b70824f4113f2eee5e450275465d0cf1425283a88dddb016338d66c90b2d367300d22876aa87b2325219a1dadf5cdc2aedf2ef3efb6 MISC metadata.xml 600 BLAKE2B b9dafdddae4fb5f9969ca845f02690b096f81f6b3c1f76fe877f2886697c0636b8a3b4498aa5cbf903f1b6ee14f3de51c10ce88b37a9780f91ce23bd841f5fbe SHA512 5f3710e9d14cb62c66fa6b21f70691f276fb1fe030b3b2eb92f206a55bbc10dd998dd522e478c883c36d7f811d7f163602e3a2af7ff92e6dd79fa28a1fa32b85 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 deleted file mode 100644 index 07f4170ae0ce..000000000000 --- a/kde-frameworks/knewstuff/files/knewstuff-5.92.0-KDEBUG-451165.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 693a2ea3926400b1482888a2df2c532852b8f971 Mon Sep 17 00:00:00 2001 -From: Alexander Lohnau -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 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); --- -GitLab - 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 deleted file mode 100644 index 7926b3cee8fa..000000000000 --- a/kde-frameworks/knewstuff/files/knewstuff-5.92.0-fix-valid-tar-recognition.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 82f04bff174a4bb307aa9b39aedf271c200b0545 Mon Sep 17 00:00:00 2001 -From: Alexander Lohnau -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 deleted file mode 100644 index 67c758ccd9d6..000000000000 --- a/kde-frameworks/knewstuff/knewstuff-5.92.0-r2.ebuild +++ /dev/null @@ -1,54 +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 -" - -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 -} -- cgit v1.2.3