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 6F402158086 for ; Wed, 29 Dec 2021 16:35:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7BC02BC004; Wed, 29 Dec 2021 16:35:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 345562BC004 for ; Wed, 29 Dec 2021 16:35:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 36960342E3A for ; Wed, 29 Dec 2021 16:35:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 39C2426A for ; Wed, 29 Dec 2021 16:34:58 +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: <1640795626.9b4dbc2b6eab22ae41faf217a6b261898de346ba.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch media-gfx/krita/krita-5.0.0-r1.ebuild X-VCS-Directories: media-gfx/krita/files/ media-gfx/krita/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9b4dbc2b6eab22ae41faf217a6b261898de346ba X-VCS-Branch: master Date: Wed, 29 Dec 2021 16:34:58 +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: 692ee934-1e91-4c12-9342-79f7a9c4faf2 X-Archives-Hash: e802a702e88b980044cf938735f7ba2e commit: 9b4dbc2b6eab22ae41faf217a6b261898de346ba Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Dec 29 11:52:52 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Dec 29 16:33:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b4dbc2b media-gfx/krita: Fix desktop file QA warning Reported-by: Marco Scardovi scardovi.com> Closes: https://bugs.gentoo.org/829987 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/krita-5.0.0-krita_jp2.desktop.patch | 24 ++++++++++++++++++++++ media-gfx/krita/krita-5.0.0-r1.ebuild | 1 + 2 files changed, 25 insertions(+) diff --git a/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch b/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch new file mode 100644 index 000000000000..c678a9f05492 --- /dev/null +++ b/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch @@ -0,0 +1,24 @@ +From e1b2760966b738f1d467013272035433f1666406 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Mon, 27 Dec 2021 15:25:25 +0100 +Subject: [PATCH] Fix duplicate "Type" key + +Introduced by 542dcd306e236ec776a81e389d0a601387739e48 + +Signed-off-by: Andreas Sturmlechner +--- + plugins/impex/jp2/krita_jp2.desktop | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/plugins/impex/jp2/krita_jp2.desktop b/plugins/impex/jp2/krita_jp2.desktop +index 26c448f48b..7de190b247 100644 +--- a/plugins/impex/jp2/krita_jp2.desktop ++++ b/plugins/impex/jp2/krita_jp2.desktop +@@ -120,4 +120,3 @@ Icon=krita + StartupNotify=true + NoDisplay=true + Terminal=false +-Type=Application +-- +GitLab + diff --git a/media-gfx/krita/krita-5.0.0-r1.ebuild b/media-gfx/krita/krita-5.0.0-r1.ebuild index 757396adc400..d2782068ebcc 100644 --- a/media-gfx/krita/krita-5.0.0-r1.ebuild +++ b/media-gfx/krita/krita-5.0.0-r1.ebuild @@ -89,6 +89,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch "${FILESDIR}"/${P}-clang.patch # bug 830225 + "${FILESDIR}"/${P}-krita_jp2.desktop.patch # bug 829987 ) pkg_setup() {