summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2013-10-01 16:54:32 +0000
committerMatthew Thode <prometheanfire@gentoo.org>2013-10-01 16:54:32 +0000
commit56e26273f0b4504da6f56969ebb22b166f6efc82 (patch)
tree8329ce33f273a3ba162d30b16c5bf617a026a7c2 /media-sound
parentVersion bump (diff)
downloadgentoo-2-56e26273f0b4504da6f56969ebb22b166f6efc82.tar.gz
gentoo-2-56e26273f0b4504da6f56969ebb22b166f6efc82.tar.bz2
gentoo-2-56e26273f0b4504da6f56969ebb22b166f6efc82.zip
fix for bug 486094
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/spotify/ChangeLog6
-rw-r--r--media-sound/spotify/spotify-0.9.1.55.ebuild10
2 files changed, 9 insertions, 7 deletions
diff --git a/media-sound/spotify/ChangeLog b/media-sound/spotify/ChangeLog
index f37784ed76a0..c81fafccebaa 100644
--- a/media-sound/spotify/ChangeLog
+++ b/media-sound/spotify/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/spotify
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/ChangeLog,v 1.19 2013/07/21 04:24:01 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/ChangeLog,v 1.20 2013/10/01 16:54:32 prometheanfire Exp $
+
+ 01 Oct 2013; Matthew Thode <prometheanfire@gentoo.org>
+ spotify-0.9.1.55.ebuild:
+ fix for bug 486094
*spotify-0.9.1.55 (21 Jul 2013)
diff --git a/media-sound/spotify/spotify-0.9.1.55.ebuild b/media-sound/spotify/spotify-0.9.1.55.ebuild
index 9dc84bc4bd75..6fda0c2f4774 100644
--- a/media-sound/spotify/spotify-0.9.1.55.ebuild
+++ b/media-sound/spotify/spotify-0.9.1.55.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/spotify-0.9.1.55.ebuild,v 1.1 2013/07/21 04:24:01 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/spotify-0.9.1.55.ebuild,v 1.2 2013/10/01 16:54:32 prometheanfire Exp $
EAPI=4
inherit eutils fdo-mime gnome2-utils pax-utils unpacker
@@ -72,8 +72,8 @@ src_prepare() {
opt/spotify/spotify-client/spotify || die "sed failed"
# different NSPR / NSS library names for some reason
sed -i \
- -e 's/\(lib\(nss3\|nssutil3\|smime3\).so\).1d/\1.12/g' \
- -e 's/\(lib\(plc4\|nspr4\).so\).0d\(.\)/\1.9\3\3/g' \
+ -e 's/\(lib\(nss3\|nssutil3\|smime3\).so\).1d/\1\x00\x00\x00/g' \
+ -e 's/\(lib\(plc4\|nspr4\).so\).0d\(.\)/\1\x00\x00\3\3/g' \
opt/spotify/spotify-client/libcef.so || die "sed failed"
# Fix desktop entry to launch spotify-dbus.py for GNOME integration
if use gnome ; then
@@ -138,9 +138,7 @@ src_install() {
#hack to fix the nspr linking in spotify
dosym /usr/lib/libnspr4.so /opt/spotify/spotify-client/libnspr4.so.9
dosym /usr/lib/libplc4.so /opt/spotify/spotify-client/libplc4.so.9
- sed -i \
- 's/libcef\.so/libcef\.so\ \/opt\/spotify\/spotify\-client\/libnspr4\.so\.9\ \/opt\/spotify\/spotify\-client\/libplc4\.so\.9/g' \
- ${ED}/usr/bin/spotify
+ sed -i 's/libcef\.so/libcef\.so\ \/opt\/spotify\/spotify\-client\/libnspr4\.so\.9\ \/opt\/spotify\/spotify\-client\/libplc4\.so\.9/g' "${ED}/usr/bin/spotify"
}
pkg_preinst() {