[gentoo-commits] repo/gentoo:master commit in: media-video/xine-ui/files/, media-video/xine-ui/

[Andreas Sturmlechner]

commit:     a248b92d13cc2d8ca840a3f53e17b4000ab2fca5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  3 17:58:08 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct  3 18:05:33 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a248b92d

media-video/xine-ui: QA: Fix .desktop file

Closes: https://bugs.gentoo.org/486358
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 .../xine-ui/files/xine-ui-0.99.10-desktop.patch    | 23 ++++++++++++++++++++++
 media-video/xine-ui/xine-ui-0.99.10.ebuild         |  8 ++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/media-video/xine-ui/files/xine-ui-0.99.10-desktop.patch b/media-video/xine-ui/files/xine-ui-0.99.10-desktop.patch
new file mode 100644
index 00000000000..04aecb7ccf1
--- /dev/null
+++ b/media-video/xine-ui/files/xine-ui-0.99.10-desktop.patch
@@ -0,0 +1,23 @@
+--- a/misc/desktops/xine.desktop.in	2017-12-28 17:34:15.000000000 +0100
++++ b/misc/desktops/xine.desktop.in	2018-10-03 18:53:23.909196224 +0200
+@@ -6,5 +6,5 @@
+ Icon=xine
+ Terminal=false
+ Type=Application
+-Categories=Application;AudioVideo;Player;
+-MimeType=
+\ No newline at end of file
++Categories=AudioVideo;Player;
++MimeType=
+\ No newline at end of file
+--- a/misc/desktops/Makefile.am	2017-12-28 17:34:15.000000000 +0100
++++ b/misc/desktops/Makefile.am	2018-10-03 19:52:23.262534618 +0200
+@@ -32,7 +32,7 @@
+ if XINE_LIST
+ xine.desktop: xine.desktop.in @XINE_LIST@
+ 	$(AM_V_GEN)cat $< > $@; \
+-	@XINE_LIST@ | perl -ne 'print join(";",sort(split(";")))' >> $@; \
++	@XINE_LIST@ | perl -ne 'print join("\n",split(";"))' | sort -u | xargs | perl -ne 'print join(";",sort(split(" ")))' >> $@; \
+ 	echo ';$(INPUT_MIME_TYPES)' >> $@
+ else
+ XINE_MIME = $(if $(shell test "$(XINE_CONFIG)" = '' && echo y),$(shell pkg-config --variable=plugindir libxine),$(shell $(XINE_CONFIG) --plugindir))/mime.types

diff --git a/media-video/xine-ui/xine-ui-0.99.10.ebuild b/media-video/xine-ui/xine-ui-0.99.10.ebuild
index 12355a49bf9..66fffbd153c 100644
--- a/media-video/xine-ui/xine-ui-0.99.10.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit gnome2-utils xdg-utils
+inherit autotools gnome2-utils xdg-utils
 
 DESCRIPTION="Xine movie player"
 HOMEPAGE="https://xine-project.org/home"
@@ -48,10 +48,14 @@ DEPEND="${RDEPEND}
 	)
 "
 
-PATCHES=( "${FILESDIR}"/${P}-libcaca.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-libcaca.patch
+)
 
 src_prepare() {
 	default
+	eautoreconf
 	rm misc/xine-bugreport || die
 }