Add patch to fix crashing when not using lirc.

(Portage version: 2.1_pre1)

5 files changed, 43 insertions, 14 deletions

diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog
index de84ccbd4951..0f359d8ef5a2 100644
--- a/media-video/gxine/ChangeLog
+++ b/media-video/gxine/ChangeLog
@@ -1,6 +1,13 @@
 # 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.58 2005/12/21 00:12:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.59 2005/12/21 14:40:04 flameeyes Exp $
+
+*gxine-0.5.2-r1 (21 Dec 2005)
+
+  21 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/gxine-0.5.2-nolirc.patch, -gxine-0.5.2.ebuild,
+  +gxine-0.5.2-r1.ebuild:
+  Add patch to fix crashing when not using lirc.
 
   21 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Recreate manifest as I got disconnected.
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index fcd991e06f39..d5061426a35e 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 79ac676753b5eaf9292025dcec0cce41 ChangeLog 8870
 MD5 fb579db8b42db43fb5c027ca8c78e951 files/digest-gxine-0.4.5 64
 MD5 b81fee13e52e93af9f5571f8babacf2e files/digest-gxine-0.5.1-r1 64
-MD5 c46aa3000139ed5d885183c1bda05075 files/digest-gxine-0.5.2 64
+MD5 c46aa3000139ed5d885183c1bda05075 files/digest-gxine-0.5.2-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 1c7eb906eb1d70dbb36ec8d8f3bd5c07 files/gxine-0.5.2-nolirc.patch 840
 MD5 79d0920e2fdab22f9ef6792340afbdd8 gxine-0.4.5.ebuild 1512
 MD5 493c7bd41110af3329229754b8226087 gxine-0.5.1-r1.ebuild 1613
-MD5 dcec70b3b408e2dc48e7e7824adbcbce gxine-0.5.2.ebuild 1553
+MD5 885f006c67c6dbd6ad8a361525d54f91 gxine-0.5.2-r1.ebuild 1634
 MD5 3f1662be15aab3fab1e7d11145f8f043 metadata.xml 249
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDqJ4DAiZjviIA2XgRAsKSAKCgvudzVynE5pT7BtbuEZ5Up0EB3wCgwHbK
-dkQqwCUQxZcxGR47dg24xtA=
-=Dbpw
------END PGP SIGNATURE-----
diff --git a/media-video/gxine/files/digest-gxine-0.5.2 b/media-video/gxine/files/digest-gxine-0.5.2-r1
index b4fcb9e89cfc..b4fcb9e89cfc 100644
--- a/media-video/gxine/files/digest-gxine-0.5.2
+++ b/media-video/gxine/files/digest-gxine-0.5.2-r1
diff --git a/media-video/gxine/files/gxine-0.5.2-nolirc.patch b/media-video/gxine/files/gxine-0.5.2-nolirc.patch
new file mode 100644
index 000000000000..e0f61d72d8fb
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.5.2-nolirc.patch
@@ -0,0 +1,24 @@
+Index: gxine-0.5.2/src/menu.c
+===================================================================
+--- gxine-0.5.2.orig/src/menu.c
++++ gxine-0.5.2/src/menu.c
+@@ -348,7 +348,9 @@ JS_CB (EngineLog, "log_show ();")
+ JS_CB (JSConsole, "js_console_show ();")
+ JS_CB (StreamInfo, "stream_info_show ();")
+ JS_CB (SetupWizards, "run_wizards ();")
++#ifdef HAVE_LIRC
+ JS_CB (ReloadLIRC, "reload_lirc ();")
++#endif
+ 
+ #define CB(name, stock, label, key) \
+   { #name, (stock), (label), (key), NULL, G_CALLBACK(js_##name##_cb) }
+@@ -482,7 +484,9 @@ static GtkWidget *add_menu_ui (GtkUIMana
+ 	   "<menuitem action='Prefs' />\n"
+ 	   "<menuitem action='Keys' />\n"
+ 	   "<menuitem action='Startup' />\n"
++#ifdef HAVE_LIRC
+ 	   "<menuitem action='ReloadLIRC' />\n"
++#endif
+ 	   "<separator />\n"
+ 	   "<menuitem action='SetupWizards' />\n"
+ 	  "</menu>\n"
diff --git a/media-video/gxine/gxine-0.5.2.ebuild b/media-video/gxine/gxine-0.5.2-r1.ebuild
index 6160054fb1fc..d09847d38bf3 100644
--- a/media-video/gxine/gxine-0.5.2.ebuild
+++ b/media-video/gxine/gxine-0.5.2-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.2.ebuild,v 1.1 2005/12/21 00:06:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.2-r1.ebuild,v 1.1 2005/12/21 14:40:04 flameeyes Exp $
 
 inherit eutils nsplugins fdo-mime
 
@@ -38,6 +38,13 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 SRC_URI="mirror://sourceforge/xine/${P}.tar.bz2"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-nolirc.patch"
+}
+
 src_compile() {
 	econf \
 		$(use_enable nls) \