summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-04-25 15:20:39 +0000
committerJustin Lecher <jlec@gentoo.org>2012-04-25 15:20:39 +0000
commitf8ed60353df87d7c4126e0edc5caf15de7a7a140 (patch)
tree0aa506c0b356ecabd0ff54924c0c11a96e9ba919 /media-sound/lastfmplayer
parentdeprecate old fbsd profiles (diff)
downloadgentoo-2-f8ed60353df87d7c4126e0edc5caf15de7a7a140.tar.gz
gentoo-2-f8ed60353df87d7c4126e0edc5caf15de7a7a140.tar.bz2
gentoo-2-f8ed60353df87d7c4126e0edc5caf15de7a7a140.zip
Add fix for >glib-2.32
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/lastfmplayer')
-rw-r--r--media-sound/lastfmplayer/ChangeLog9
-rw-r--r--media-sound/lastfmplayer/files/lastfmplayer-1.5.4.27091-glib.h.patch16
-rw-r--r--media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild7
3 files changed, 28 insertions, 4 deletions
diff --git a/media-sound/lastfmplayer/ChangeLog b/media-sound/lastfmplayer/ChangeLog
index 1aaf42154fca..f83f02eed14f 100644
--- a/media-sound/lastfmplayer/ChangeLog
+++ b/media-sound/lastfmplayer/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-sound/lastfmplayer
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.66 2011/12/30 09:49:31 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.67 2012/04/25 15:20:39 jlec Exp $
+
+ 25 Apr 2012; Justin Lecher <jlec@gentoo.org>
+ lastfmplayer-1.5.4.27091-r2.ebuild,
+ +files/lastfmplayer-1.5.4.27091-glib.h.patch:
+ Add fix for >glib-2.32
*lastfmplayer-1.5.4.27091-r2 (30 Dec 2011)
diff --git a/media-sound/lastfmplayer/files/lastfmplayer-1.5.4.27091-glib.h.patch b/media-sound/lastfmplayer/files/lastfmplayer-1.5.4.27091-glib.h.patch
new file mode 100644
index 000000000000..146fd1b361b1
--- /dev/null
+++ b/media-sound/lastfmplayer/files/lastfmplayer-1.5.4.27091-glib.h.patch
@@ -0,0 +1,16 @@
+ src/mediadevices/ipod/IpodDevice.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/mediadevices/ipod/IpodDevice.cpp b/src/mediadevices/ipod/IpodDevice.cpp
+index 3e40672..f3bad0e 100644
+--- a/src/mediadevices/ipod/IpodDevice.cpp
++++ b/src/mediadevices/ipod/IpodDevice.cpp
+@@ -35,7 +35,7 @@
+ extern "C"
+ {
+ #include <gpod/itdb.h>
+- #include <glib/glist.h>
++ #include <glib.h>
+ }
+
+ #define TABLE_NAME "IpodDeviceTracks"
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild
index 999cbd4deade..49ae384b6635 100644
--- a/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild
+++ b/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild,v 1.1 2011/12/30 09:49:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild,v 1.2 2012/04/25 15:20:39 jlec Exp $
EAPI=2
inherit eutils multilib toolchain-funcs qt4-r2
@@ -53,6 +53,9 @@ src_prepare() {
-e "/TARGET/s:dbusextension:LastFmDbusExtension:" \
"${S}"/src/dbus/dbusextension.pro
fi
+
+ # only glib.h can be included directly in >glib-2.32
+ epatch "${FILESDIR}"/${P}-glib.h.patch
}
src_configure() {