[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/

[Andreas Sturmlechner]

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