diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-02-21 21:05:20 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-02-21 21:05:20 +0000 |
| commit | d7d44b028bafebeccc4944718426a2f0bab662ba (patch) | |
| tree | a7485b663206899b1100f797e9bca1eb67dcaa38 /media-tv/xbmc | |
| parent | Now use the 'eselect way' for gentoo-bashcomp. This is desired for future dev... (diff) | |
| download | gentoo-2-d7d44b028bafebeccc4944718426a2f0bab662ba.tar.gz gentoo-2-d7d44b028bafebeccc4944718426a2f0bab662ba.tar.bz2 gentoo-2-d7d44b028bafebeccc4944718426a2f0bab662ba.zip | |
The noexec patch has been merged upstream.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'media-tv/xbmc')
| -rw-r--r-- | media-tv/xbmc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-tv/xbmc/files/xbmc-noexec.patch | 12 | ||||
| -rw-r--r-- | media-tv/xbmc/xbmc-9999.ebuild | 3 |
3 files changed, 6 insertions, 15 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog index 0ee824a200e0..862b8585179b 100644 --- a/media-tv/xbmc/ChangeLog +++ b/media-tv/xbmc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-tv/xbmc # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.2 2009/02/21 07:36:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.3 2009/02/21 21:05:20 vapier Exp $ + + 21 Feb 2009; Mike Frysinger <vapier@gentoo.org> -files/xbmc-noexec.patch, + xbmc-9999.ebuild: + The noexec patch has been merged upstream. 21 Feb 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild: Generate an Xsession so people can log in with xbmc in full screen. diff --git a/media-tv/xbmc/files/xbmc-noexec.patch b/media-tv/xbmc/files/xbmc-noexec.patch deleted file mode 100644 index f93919fc26c6..000000000000 --- a/media-tv/xbmc/files/xbmc-noexec.patch +++ /dev/null @@ -1,12 +0,0 @@ -http://xbmc.org/trac/ticket/5945 - ---- xbmc/lib/libPython/XBPythonDllFuncs.S -+++ xbmc/lib/libPython/XBPythonDllFuncs.S -@@ -83,3 +83,7 @@ - FUNCTION(PyFloat_FromDouble) - - #endif -+ -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild index d8d8211d7f14..4d83d5c01c09 100644 --- a/media-tv/xbmc/xbmc-9999.ebuild +++ b/media-tv/xbmc/xbmc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.3 2009/02/21 07:41:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.4 2009/02/21 21:05:20 vapier Exp $ # XXX: be nice to split out packages that come bundled and use the # system libraries ... @@ -89,7 +89,6 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-readsector.patch epatch "${FILESDIR}"/${PN}-fribidi.patch - epatch "${FILESDIR}"/${PN}-noexec.patch epatch "${FILESDIR}"/${PN}-alsa-params.patch # Fix XBMC's final version string showing as "exported" |