Rename gxine-logo.png in gxine.log in the sources, too. Fixes bug #112643.

Package-Manager: portage-2.0.53_rc7

4 files changed, 59 insertions, 9 deletions

diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog
index 4d06fb0551f7..17756618f079 100644
--- a/media-video/gxine/ChangeLog
+++ b/media-video/gxine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/gxine
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.50 2005/10/30 15:44:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.51 2005/11/29 12:35:06 flameeyes Exp $
+
+  29 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/gxine-0.5.0-pixmap.patch, gxine-0.5.0.ebuild:
+  Rename gxine-logo.png in gxine.log in the sources, too. Fixes bug #112643.
 
   30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> gxine-0.5.0.ebuild:
   Bumped requirement of spidermonkey to have a newer version that installs the
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index ad5107db3cfb..479a02e9822e 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -1,21 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 589e5001f8c0368ca01620c41c9c323d ChangeLog 7483
+MD5 742311ec3d48733a97304ac153c741d6 ChangeLog 7669
 MD5 fb579db8b42db43fb5c027ca8c78e951 files/digest-gxine-0.4.5 64
 MD5 d3f2297a49721a0558f863ba3f8ba2f0 files/digest-gxine-0.4.8 64
 MD5 541e4a5a4b8747eeee6782cb6cd5e53d files/digest-gxine-0.4.9 64
 MD5 d4d21433f6ba3db5176cc5d994c4ce19 files/digest-gxine-0.5.0 63
 MD5 0b50a3889d71fe54fb9249c53257d9d6 files/gxine-0.4.1-menu-fix.patch 873
+MD5 c7e9e51ee4865e90d1359ee1b13f4969 files/gxine-0.5.0-pixmap.patch 1836
 MD5 79d0920e2fdab22f9ef6792340afbdd8 gxine-0.4.5.ebuild 1512
 MD5 a53419425249e78a98a55debf6e5c088 gxine-0.4.8.ebuild 1538
 MD5 f354b1289fdbf406c700b5620398b6b3 gxine-0.4.9.ebuild 1538
-MD5 964d303551ff5f2e77882d55b08ffbd4 gxine-0.5.0.ebuild 1551
+MD5 53e345b7ded99ca6443961f54224e5b3 gxine-0.5.0.ebuild 1498
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDZOp8j5H05b2HAEkRAvisAKCKCOQv7qMT2E2T0U3oNMRiOMeMYQCgh3GX
-wcnKkRUWQZCj//ms05yG0Hs=
-=BR2P
+iD8DBQFDjEsGAiZjviIA2XgRAvtCAJwOfxvyxFtd1kQkhAjzX4hdgbkwsgCgwXUk
+BmoakKf3tyW28ZpYl0ZH17s=
+=pD5b
 -----END PGP SIGNATURE-----
diff --git a/media-video/gxine/files/gxine-0.5.0-pixmap.patch b/media-video/gxine/files/gxine-0.5.0-pixmap.patch
new file mode 100644
index 000000000000..c8741e698f37
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.5.0-pixmap.patch
@@ -0,0 +1,46 @@
+The FreeDesktop icon themes specifications tells to put the icons in a theme
+subdirectory in /usr/share/icons, and to use the name of the icon without
+extension in the .desktop files, to allow themes to use versions in other
+formats. For the same reason, gxine-logo.png icon is installed as gxine.png,
+and just gxine is used in the .desktop file.
+Index: gxine-0.5.0/gxine.desktop
+===================================================================
+--- gxine-0.5.0.orig/gxine.desktop
++++ gxine-0.5.0/gxine.desktop
+@@ -6,7 +6,7 @@ GenericName=Video Player
+ Comment=Play films and songs, or watch digital TV
+ Exec=gxine
+ MultipleArgs=true
+-Icon=gxine-logo.png
++Icon=gxine
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+Index: gxine-0.5.0/src/desktop_integration.c
+===================================================================
+--- gxine-0.5.0.orig/src/desktop_integration.c
++++ gxine-0.5.0/src/desktop_integration.c
+@@ -349,7 +349,7 @@ void di_register_kde (void) {
+ 	   "Comment=Play films and songs, or watch digital TV\n"
+ 	   "MultipleArgs=true\n"
+ 	   "Terminal=false\n"
+-	   "Icon=%s/gxine-logo.png\n"
++	   "Icon=gxine\n"
+ 	   "Exec=%s/gxine\n"
+ 	   "Type=Application\n"
+ 	   "StartupNotify=true\n"
+Index: gxine-0.5.0/src/ui.c
+===================================================================
+--- gxine-0.5.0.orig/src/ui.c
++++ gxine-0.5.0/src/ui.c
+@@ -779,8 +779,8 @@ static void ui_load_icons (void)
+ 
+   ui_std_icon (ifactory, GXINE_MEDIA_SPEAKER, "speaker.png");
+   ui_std_icon (ifactory, GXINE_MEDIA_SPEAKER_MUTE, "nospeaker.png");
+-  ui_std_icon (ifactory, GXINE_MEDIA_MARK, "/gxine-logo.png");
+-  ui_std_icon (ifactory, GXINE_LOGO, "/gxine-logo.png");
++  ui_std_icon (ifactory, GXINE_MEDIA_MARK, "/gxine.png");
++  ui_std_icon (ifactory, GXINE_LOGO, "/gxine.png");
+ 
+   gtk_icon_factory_add_default (ifactory);
+ }
diff --git a/media-video/gxine/gxine-0.5.0.ebuild b/media-video/gxine/gxine-0.5.0.ebuild
index fe3b2ad2bd6c..e05396dd1183 100644
--- a/media-video/gxine/gxine-0.5.0.ebuild
+++ b/media-video/gxine/gxine-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.0.ebuild,v 1.2 2005/10/30 15:44:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.0.ebuild,v 1.3 2005/11/29 12:35:06 flameeyes Exp $
 
 inherit eutils nsplugins fdo-mime
 
@@ -30,8 +30,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	# Fix icon as per icon theme specs.
-	sed -i -e 's:gxine-logo.png:gxine:' ${S}/gxine.desktop
+	epatch "${FILESDIR}/${P}-pixmap.patch"
 }
 
 src_compile() {