Added patch from Darrent Salt to completely fix the pixmap troubles after my recent changes that got merged in 0.5.1. Take over maintainership.

Package-Manager: portage-2.0.53

6 files changed, 62 insertions, 9 deletions

diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog
index cc33afda88fb..f359531b75a6 100644
--- a/media-video/gxine/ChangeLog
+++ b/media-video/gxine/ChangeLog
@@ -1,6 +1,14 @@
 # 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.53 2005/11/29 23:59:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.54 2005/12/02 02:57:53 flameeyes Exp $
+
+*gxine-0.5.1-r1 (02 Dec 2005)
+
+  02 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/gxine-0.5.1-pixmap-fixup.patch, metadata.xml, -gxine-0.5.1.ebuild,
+  +gxine-0.5.1-r1.ebuild:
+  Added patch from Darrent Salt to completely fix the pixmap troubles after my
+  recent changes that got merged in 0.5.1. Take over maintainership.
 
   29 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
   -files/gxine-0.5.0-pixmap.patch, -gxine-0.4.8.ebuild, -gxine-0.4.9.ebuild,
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index dd49a43c96bc..c41480b3b619 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 21b91fcd412627477fe9944f3d137370 ChangeLog 8066
+MD5 843d006aefb9c5e91df6f3f2916b342a ChangeLog 8401
 MD5 fb579db8b42db43fb5c027ca8c78e951 files/digest-gxine-0.4.5 64
-MD5 b81fee13e52e93af9f5571f8babacf2e files/digest-gxine-0.5.1 64
+MD5 b81fee13e52e93af9f5571f8babacf2e files/digest-gxine-0.5.1-r1 64
 MD5 0b50a3889d71fe54fb9249c53257d9d6 files/gxine-0.4.1-menu-fix.patch 873
+MD5 b15c6d10dbe3551c6692caf851c718b3 files/gxine-0.5.1-pixmap-fixup.patch 1013
 MD5 79d0920e2fdab22f9ef6792340afbdd8 gxine-0.4.5.ebuild 1512
-MD5 13dc10f069a28699de26f444086d3d19 gxine-0.5.1.ebuild 1256
-MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 77e232043d76156f0072115f7de30bed gxine-0.5.1-r1.ebuild 1346
+MD5 3f1662be15aab3fab1e7d11145f8f043 metadata.xml 249
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDjOuVAiZjviIA2XgRAtUTAKDrZaxXLyX/aX7LcwORo0ANK+svFgCgzCPT
-evwpSOyj/0O0r+HAGQainWI=
-=vEaw
+iD8DBQFDj7hFAiZjviIA2XgRAnvDAKD09D9dgplGvU5wmvxjNNFs1fqlGQCgyCWd
+vMvYhTy/e3w+m807MRzj1y4=
+=1N/X
 -----END PGP SIGNATURE-----
diff --git a/media-video/gxine/files/digest-gxine-0.5.1 b/media-video/gxine/files/digest-gxine-0.5.1-r1
index a23e5433cd7b..a23e5433cd7b 100644
--- a/media-video/gxine/files/digest-gxine-0.5.1
+++ b/media-video/gxine/files/digest-gxine-0.5.1-r1
diff --git a/media-video/gxine/files/gxine-0.5.1-pixmap-fixup.patch b/media-video/gxine/files/gxine-0.5.1-pixmap-fixup.patch
new file mode 100644
index 000000000000..27687092596e
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.5.1-pixmap-fixup.patch
@@ -0,0 +1,33 @@
+--- gxine-0.5.1.orig/src/desktop_integration.c
++++ gxine-0.5.1/src/desktop_integration.c
+@@ -355,7 +355,6 @@
+ 	   "StartupNotify=true\n"
+ 	   "Categories=GTK;Application;AudioVideo;\n"
+ 	   "MimeType=",
+-	   icondir,
+ 	   bindir);
+ 
+   /*
+--- gxine-0.5.1.orig/src/ui.c
++++ gxine-0.5.1/src/ui.c
+@@ -781,6 +781,9 @@
+   ui_std_icon (ifactory, GXINE_MEDIA_SPEAKER_MUTE, "nospeaker.png");
+   ui_std_icon (ifactory, GXINE_MEDIA_MARK, "/gxine.png");
+   ui_std_icon (ifactory, GXINE_LOGO, "/gxine.png");
++#ifdef WITH_DEPRECATED
++  ui_std_icon (ifactory, "gxine-logo", "/gxine.png");
++#endif
+ 
+   gtk_icon_factory_add_default (ifactory);
+ }
+--- gxine-0.5.1.orig/src/ui.h
++++ gxine-0.5.1/src/ui.h
+@@ -29,7 +29,7 @@
+ #define GXINE_MEDIA_PLAYLIST	 "gxine-media-playlist"
+ #define GXINE_MEDIA_SPEAKER	 "gxine-media-speaker"
+ #define GXINE_MEDIA_SPEAKER_MUTE "gxine-media-speaker-mute"
+-#define GXINE_LOGO		 "gxine-logo"
++#define GXINE_LOGO		 "gxine"
+ #define GXINE_MEDIA_MARK	 "gxine-media-mark"
+ 
+ /* UI status attributes */
diff --git a/media-video/gxine/gxine-0.5.1.ebuild b/media-video/gxine/gxine-0.5.1-r1.ebuild
index 663867a78ee5..aa6681b3ce6f 100644
--- a/media-video/gxine/gxine-0.5.1.ebuild
+++ b/media-video/gxine/gxine-0.5.1-r1.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.1.ebuild,v 1.1 2005/11/29 23:11:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.1-r1.ebuild,v 1.1 2005/12/02 02:57:53 flameeyes Exp $
 
 inherit eutils nsplugins fdo-mime
 
@@ -26,6 +26,13 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 SRC_URI="mirror://sourceforge/xine/${P}.tar.bz2"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-pixmap-fixup.patch"
+}
+
 src_compile() {
 	econf \
 		$(use_enable nls) \
diff --git a/media-video/gxine/metadata.xml b/media-video/gxine/metadata.xml
index d9df1878d8e2..01b4162e66ce 100644
--- a/media-video/gxine/metadata.xml
+++ b/media-video/gxine/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>video</herd>
+<maintainer>
+<email>flameeyes@gentoo.org</email>
+<name>Diego Pettenò</name>
+</maintainer>
 </pkgmetadata>