summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-06-28 20:42:24 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-06-28 20:42:24 +0000
commit8bc1bf35b890f13b015b668b3be4333d698d0a26 (patch)
tree856b12ae36f74b15860f24971da980f3da6d3234 /media-video/gxine
parentppc/ppc64/sparc stable (bug #396869) (diff)
downloadhistorical-8bc1bf35b890f13b015b668b3be4333d698d0a26.tar.gz
historical-8bc1bf35b890f13b015b668b3be4333d698d0a26.tar.bz2
historical-8bc1bf35b890f13b015b668b3be4333d698d0a26.zip
mozjs187 compat
Package-Manager: portage-2.2.0_alpha113/cvs/Linux x86_64
Diffstat (limited to 'media-video/gxine')
-rw-r--r--media-video/gxine/ChangeLog6
-rw-r--r--media-video/gxine/Manifest18
-rw-r--r--media-video/gxine/gxine-0.5.907.ebuild6
3 files changed, 19 insertions, 11 deletions
diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog
index 047f0dc4c277..5acb2320f48e 100644
--- a/media-video/gxine/ChangeLog
+++ b/media-video/gxine/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/gxine
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.124 2012/05/17 20:33:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.125 2012/06/28 20:42:24 ssuominen Exp $
+
+ 28 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> gxine-0.5.907.ebuild:
+ Modify JavaScript library name from 'mozjs185' to 'mozj187' in m4/_js.m4 for
+ dev-lang/spidemonkey >= 1.8.7 compability wrt #422983 by Ian Stakenvicius
17 May 2012; Samuli Suominen <ssuominen@gentoo.org> -gxine-0.5.906-r1.ebuild,
-files/gxine-0.5.906-playlist_segfault.patch:
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index 5026c7260e9f..1dad50fbf24d 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -6,17 +6,17 @@ AUX gxine-0.5.905-fix-nspr-useage.patch 433 RMD160 65af0ddee220ca456acf20eea521f
AUX gxine-0.5.906-endif.patch 349 RMD160 0683bb409616d8ef878e4144e747bd0032fc236f SHA1 0c48cf0457f21dea9bdc70bed62421cd6bbdebfb SHA256 d3d14fdffe9f8e1872bcbf28670d48b72ed76d7a882902bb298902bb8ca4b6fa
AUX gxine-0.5.907-glib-2.31.patch 636 RMD160 07142250875de0c55b8ec74d462f0802ea6354a3 SHA1 413fd32963958b5efbdb9310f45fbdca801c8083 SHA256 c45a8fa2df4a779bbc7866a3d7fd56c4c9946e71656f06452f5f147a9ee4e15c
DIST gxine-0.5.907.tar.xz 910528 RMD160 35be9f7737c1b45787a46dd61916c81c33bea15e SHA1 1b49b5b6a800611db032e4b7fd36af97a731a167 SHA256 b5c925806a35cb23a24a80a39d494cefb529e22c957987741f269a994ab258d5
-EBUILD gxine-0.5.907.ebuild 2682 RMD160 7a8fba21a9a0e3604e2e7b1074b58fb185156a2a SHA1 ec25ca8f5f0ebe076e3cfc695a25cb87c0c05acc SHA256 96ccf62d4924ee82cce44cf2d099f78e2bda3c4b469a7b3514e8f4346609e77a
-MISC ChangeLog 17755 RMD160 6d86b12fc0a4d27514e831ba5b8679f9671b8580 SHA1 68a6d384f2d57bc191163d95981000e4bcc70a29 SHA256 02cc1cd4ddccee05a645fc8d9e42fe85125da53e86c0f701d412122c1db30d61
+EBUILD gxine-0.5.907.ebuild 2801 RMD160 9bfab12ac404b2df6c9d912a2d1b2fa6a8ce319c SHA1 f63a1b0a81ddb8d2d2e34fe8b677b77976a5e079 SHA256 72dd204af541a7184e9a3a1571bb95747f35d7eda32325e2ae320bfc77f197c9
+MISC ChangeLog 17987 RMD160 9e70ca9deaba5a8dacd9a169c4da173888c6692c SHA1 8fa9d2df13fa9ab9d6083ca0c503a41965981451 SHA256 9231405d37427175b53955b28c0d7aec3c116ac377a2549244b591e7b719b8ea
MISC metadata.xml 373 RMD160 879bbceb1af5297cc90a6191f9a40375a4732c81 SHA1 9e40c5d9bb710cc676c38c9a097af598db072e60 SHA256 202b197a4f7feb227636e8de2bc00c6af351fd80f72a7916df100aeadd056bd9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBAgAGBQJPtWCTAAoJEEdUh39IaPFNYMUH/RPj3jAGiLuE3ifce3Z4KFDm
-UEvApJN+0i0UInkoqOy3mUk6iL6XiU+U8m4xkwJ9v1fiib8Qaa1VQevZnBboyxEL
-qi5p44HknagRIy5uIqezNGhTNbHjRgBPQm09acSrr9lS25QyX6yNMHBpyguDXEEB
-SuZzdFjddtXpMAFk8pRc8VpVG3XjzgGU8Rsl/8r4QVInN77lK5b/OrxFY1cYFZka
-dMR2JyjAB6IZig26OAD1nISXpI27D4+SPxuNanh7bHlypTcY5aJ47Fs+Bjg2A4DY
-za4zmaXKhCvnjrUgiekibMBM2LWyOqNjCfGWjTKps/yzDLg4xoqoIPD5Wwp40o0=
-=V/VF
+iQEcBAEBAgAGBQJP7MByAAoJEEdUh39IaPFNlhwH/iX0l35JT/jB1XdpPoZJ4i2U
+tfcl5pkPTB9RPuLi5jVT56GBHLDl1erxQ5JyDkKI5ReuHCDF0j9Qr2krwqV4jjwc
+/Lzart2+KFeqb7D3BCz60Ft/Tey15RzGyM7ulml91Fyq9RAQ6XT2mYCiRTf/jc3v
+Ac/I/0M6y2X1mlVN5uv1WctqkKX2Iu0nDN+tbi6GRHOoYmjvjS1Q6N4E8biPWNfy
+oM1nMoUHsBV491JbA1taMmPRVdzKAuhql0Y/ZaK1zy4AoknXcGGNqaxVinerj80o
+tt7vfD9HpA5DjNqDhJMQZYDdyW09SEGQ+hwLAIfqXg/VUCcBN82S2qJSH/RO4lY=
+=l53R
-----END PGP SIGNATURE-----
diff --git a/media-video/gxine/gxine-0.5.907.ebuild b/media-video/gxine/gxine-0.5.907.ebuild
index c4bbc806fc1f..537cd60c8dba 100644
--- a/media-video/gxine/gxine-0.5.907.ebuild
+++ b/media-video/gxine/gxine-0.5.907.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.907.ebuild,v 1.6 2012/05/17 20:32:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.907.ebuild,v 1.7 2012/06/28 20:42:24 ssuominen Exp $
EAPI=4
inherit autotools eutils fdo-mime gnome2-utils multilib nsplugins
@@ -40,6 +40,10 @@ src_prepare() {
# ld: cannot find -ljs
sed -i -e '/JS_LIBS="`spidermonkey_locate_lib/s:js:mozjs:' m4/_js.m4 || die
+ if has_version '>=dev-lang/spidermonkey-1.8.7'; then
+ sed -i -e 's:mozjs185:mozjs187:' m4/_js.m4 || die #422983
+ fi
+
epatch \
"${FILESDIR}"/${PN}-0.5.905-desktop.patch \
"${FILESDIR}"/${PN}-0.5.905-fix-nspr-useage.patch \