From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1052205-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id AB2EF138334
for <garchives@archives.gentoo.org>; Mon, 15 Oct 2018 16:46:55 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8875DE069C;
Mon, 15 Oct 2018 16:46:54 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 48D93E069C
for <gentoo-commits@lists.gentoo.org>; Mon, 15 Oct 2018 16:46:53 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 22D70335C39
for <gentoo-commits@lists.gentoo.org>; Mon, 15 Oct 2018 16:46:52 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 88756450
for <gentoo-commits@lists.gentoo.org>; Mon, 15 Oct 2018 16:46:49 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
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" <asturm@gentoo.org>
Message-ID: <1539621996.9b0400d507d3a77c3da411981f827c2e421c645e.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/krita/files/krita-4.1.5-desktopfile.patch media-gfx/krita/krita-4.1.5.ebuild
X-VCS-Directories: media-gfx/krita/files/ media-gfx/krita/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 9b0400d507d3a77c3da411981f827c2e421c645e
X-VCS-Branch: master
Date: Mon, 15 Oct 2018 16:46:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 8986da52-4f70-4069-9f2e-ec1afcffae4a
X-Archives-Hash: 873e59aa05edd393ff74c36f206b41bd
commit: 9b0400d507d3a77c3da411981f827c2e421c645e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 16:45:41 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 15 16:46:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b0400d5
media-gfx/krita: QA: Fix .desktop file to pass validation
Closes: https://bugs.gentoo.org/668702
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
.../krita/files/krita-4.1.5-desktopfile.patch | 39 ++++++++++++++++++++++
media-gfx/krita/krita-4.1.5.ebuild | 5 ++-
2 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/files/krita-4.1.5-desktopfile.patch b/media-gfx/krita/files/krita-4.1.5-desktopfile.patch
new file mode 100644
index 00000000000..8721ab8a8a9
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.1.5-desktopfile.patch
@@ -0,0 +1,39 @@
+From d267979af9524372f00a0759f02e75c60f604da5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon, 15 Oct 2018 13:08:09 +0200
+Subject: [PATCH] krita_qimageio.desktop: Fix MimeType separators
+
+Summary:
+desktop file did not pass validation.
+
+/usr/share/applications/krita_qimageio.desktop: error: (will be fatal in the future): value "image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon" for key
+"MimeType" in group "Desktop Entry" contains value "image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon" which is an invalid MIME type:
+"image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon" contains an invalid character in the subtype
+
+Reviewers: #krita, rempt
+
+Reviewed By: #krita, rempt
+
+Tags: #krita
+
+Differential Revision: https://phabricator.kde.org/D16222
+---
+ plugins/impex/qimageio/krita_qimageio.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/impex/qimageio/krita_qimageio.desktop b/plugins/impex/qimageio/krita_qimageio.desktop
+index 4d7dabe235..af366fef07 100644
+--- a/plugins/impex/qimageio/krita_qimageio.desktop
++++ b/plugins/impex/qimageio/krita_qimageio.desktop
+@@ -63,7 +63,7 @@ Name[x-test]=xxKritaxx
+ Name[zh_CN]=Krita
+ Name[zh_TW]=Krita
+ Exec=krita %f
+-MimeType=image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon
++MimeType=image/bmp;image/x-xpixmap;image/x-xbitmap;image/webp;image/vnd.microsoft.icon;
+ Type=Application
+ Icon=calligrakrita
+ Categories=Qt;KDE;Office;Graphics;
+--
+2.18.0
+
diff --git a/media-gfx/krita/krita-4.1.5.ebuild b/media-gfx/krita/krita-4.1.5.ebuild
index 1e3252cbd58..24e0eeb67a3 100644
--- a/media-gfx/krita/krita-4.1.5.ebuild
+++ b/media-gfx/krita/krita-4.1.5.ebuild
@@ -84,7 +84,10 @@ RDEPEND="${COMMON_DEPEND}
# bug 630508
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${PN}-4.0.3-tests-optional.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
+ "${FILESDIR}/${P}-desktopfile.patch"
+)
pkg_setup() {
python-single-r1_pkg_setup