From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 04F0815808B for ; Sat, 9 Apr 2022 16:07:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4EAB5E0973; Sat, 9 Apr 2022 16:07:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1886AE0973 for ; Sat, 9 Apr 2022 16:07:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 29F9134161B for ; Sat, 9 Apr 2022 16:07:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A4333B3 for ; Sat, 9 Apr 2022 16:07:13 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1649520198.e07139da48c0af29a4ef56ac62168245b8b69991.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/files/, kde-frameworks/knewstuff/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/knewstuff/files/knewstuff-5.92.0-fix-valid-tar-recognition.patch kde-frameworks/knewstuff/knewstuff-5.92.0-r2.ebuild X-VCS-Directories: kde-frameworks/knewstuff/ kde-frameworks/knewstuff/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e07139da48c0af29a4ef56ac62168245b8b69991 X-VCS-Branch: master Date: Sat, 9 Apr 2022 16:07:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9dbd1600-9f5f-4d2b-abc3-ec45907e81bb X-Archives-Hash: 33e1505b753546944714cb261747b468 commit: e07139da48c0af29a4ef56ac62168245b8b69991 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 9 15:51:44 2022 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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 +}