[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/files/, kde-frameworks/knewstuff/

[Andreas Sturmlechner]

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@×××.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
+}