summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-02-21 21:05:20 +0000
committerMike Frysinger <vapier@gentoo.org>2009-02-21 21:05:20 +0000
commit7df4d787f24554e46cd8eb625b9085b05689ac07 (patch)
tree59d0ad496b21027d0f191dcdc9ac40158b4dd0c7
parentNow use the 'eselect way' for gentoo-bashcomp. This is desired for future dev... (diff)
downloadhistorical-7df4d787f24554e46cd8eb625b9085b05689ac07.tar.gz
historical-7df4d787f24554e46cd8eb625b9085b05689ac07.tar.bz2
historical-7df4d787f24554e46cd8eb625b9085b05689ac07.zip
The noexec patch has been merged upstream.
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
-rw-r--r--media-tv/xbmc/ChangeLog6
-rw-r--r--media-tv/xbmc/Manifest11
-rw-r--r--media-tv/xbmc/files/xbmc-noexec.patch12
-rw-r--r--media-tv/xbmc/xbmc-9999.ebuild3
4 files changed, 11 insertions, 21 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/Manifest b/media-tv/xbmc/Manifest
index 57e75a41f687..b9bb94483cfc 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -3,15 +3,14 @@ Hash: SHA1
AUX xbmc-alsa-params.patch 887 RMD160 b60f92199d2deb31d7364806316ad1dbf7cd5673 SHA1 5d1b6d84279239479ddbec394912997d5976d574 SHA256 0c03c2d120f1cc69871d51da7909181959d82e3f91cc7fac60691fce83d13731
AUX xbmc-fribidi.patch 1131 RMD160 bbadd725e5b11885201cffed2cc4f3cdeb04e4af SHA1 be4f94977dcabd02cc936199b573fad3db346930 SHA256 b6948f9fa236cd805dd2b92fa9861255598c6536de5278ce96c8005899336ea9
-AUX xbmc-noexec.patch 271 RMD160 9df89debc350137b8a93dc91b13fba6b7eeda814 SHA1 c9767cfe2a9b3467318c14433f4df902ce83996b SHA256 23a9c9d621808d37bcce3e95f2acbf21454550885a1703cdda7ad000a916b0c7
AUX xbmc-readsector.patch 2697 RMD160 8fc7b7d5711b1b3a703ecf18920dfb4f75be9819 SHA1 db7925944f0d389037611df5af6593cba2c6ff4f SHA256 352e18bc1b4413e8f6df1dea2b88e0ee17115814fb92d7e4dbfba9820f0ee00c
-EBUILD xbmc-9999.ebuild 4070 RMD160 64b009c2a8467e7df3cdfef9de47e367dc66073f SHA1 d1de775629f0db6cec43d4e037dd67d28c930e6d SHA256 17d7030faa822d8bab1a706c8211d0c12f554d8c98b558daa07a1afa1384b32c
-MISC ChangeLog 666 RMD160 9bffd438ee0df156df38c1ca8a2a7c30efb95f6c SHA1 030ffe4e261c98ee0dc1ea76d35f19d5a48eaee9 SHA256 5243efea8f317a5b97f50605649739ea29445ebb3d23f88cec10b633b5c11fb6
+EBUILD xbmc-9999.ebuild 4029 RMD160 d09463b59b1d29255191d852bed103bc521ce8b3 SHA1 c154971a47275304e44b88ba65fb54bc52722b42 SHA256 fe6f906b6264b7d0ecde338acd2ba79564e8f51fb8e196484dad003457accb50
+MISC ChangeLog 808 RMD160 e70ac0e8a2324160334f8b989ea00eb9edd147e1 SHA1 c33cd092141ae912e248048321373f8ed82e88b8 SHA256 064bcdf616bd54d97a845c0d2ae80bfbf082160092fde0b79cfec61922a37c0e
MISC metadata.xml 157 RMD160 a117cbaa8eca6ed6c13ba7d3cc7b6c27a67dd250 SHA1 4f8829c9a4a3ef73a376090fa9fd72c967097d50 SHA256 c4d85708ef3c9ffffe5ca42f32642b89f8a9475e00602e7986f7032027e292d8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkmfsD8ACgkQn/5bYzqsSmFwMwCglKbvbP1NpdKRpbVkk5ov/VJ1
-tfMAn29+XnWTAMnZHsKXFLYUD1bO3b7N
-=S0mi
+iEYEARECAAYFAkmgbJYACgkQn/5bYzqsSmHSZgCbBIDNT03ZOO5VMKQ7aF19YSwj
+Y2kAoIe+kTs09HI1qIiBih9wFsO6lt21
+=zPyW
-----END PGP SIGNATURE-----
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"