diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2011-05-16 11:06:37 +0000 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2011-05-16 11:06:37 +0000 |
| commit | bc6a70c06d926e0b981fc28635121ea546cf7142 (patch) | |
| tree | 4ce84d95600be207276481c8c76b9eb0ec54bc90 /media-sound/gmpc | |
| parent | EAPI4 and use of systemd eclass, fix #366179. (diff) | |
| download | gentoo-2-bc6a70c06d926e0b981fc28635121ea546cf7142.tar.gz gentoo-2-bc6a70c06d926e0b981fc28635121ea546cf7142.tar.bz2 gentoo-2-bc6a70c06d926e0b981fc28635121ea546cf7142.zip | |
Fix underlinking (bug #367449)
(Portage version: 2.2.0_alpha33/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/gmpc')
| -rw-r--r-- | media-sound/gmpc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/gmpc/files/gmpc-0.20.0-underlinking.patch | 46 | ||||
| -rw-r--r-- | media-sound/gmpc/gmpc-0.20.0.ebuild | 9 |
3 files changed, 58 insertions, 3 deletions
diff --git a/media-sound/gmpc/ChangeLog b/media-sound/gmpc/ChangeLog index f41a382dce94..9ae8bb72357b 100644 --- a/media-sound/gmpc/ChangeLog +++ b/media-sound/gmpc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/gmpc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/ChangeLog,v 1.77 2011/04/28 21:19:05 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/ChangeLog,v 1.78 2011/05/16 11:06:37 angelos Exp $ + + 16 May 2011; Christoph Mende <angelos@gentoo.org> gmpc-0.20.0.ebuild, + +files/gmpc-0.20.0-underlinking.patch: + Fix underlinking (bug #367449) 28 Apr 2011; Christoph Mende <angelos@gentoo.org> -files/gmpc-0.18.0-libxspf.patch, -files/gmpc-0.18.0-password_dialog.patch: diff --git a/media-sound/gmpc/files/gmpc-0.20.0-underlinking.patch b/media-sound/gmpc/files/gmpc-0.20.0-underlinking.patch new file mode 100644 index 000000000000..d6b027eb6580 --- /dev/null +++ b/media-sound/gmpc/files/gmpc-0.20.0-underlinking.patch @@ -0,0 +1,46 @@ +diff --git a/configure.ac b/configure.ac +index ebec29f..0311cc1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -227,6 +227,11 @@ PKG_CHECK_MODULES([sqlite3], sqlite3) + AC_SUBST(sqlite3_LIBS) + AC_SUBST(sqlite3_CFLAGS) + ++#libx11 ++PKG_CHECK_MODULES([x11], x11) ++AC_SUBST(x11_LIBS) ++AC_SUBST(x11_CFLAGS) ++ + # libsexy + AC_ARG_ENABLE([system-libsexy], + [--enable-system-libsexy Use system libsexy instead of bundles.], +diff --git a/src/Makefile.am b/src/Makefile.am +index 6ef60fd..d63cca7 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -118,7 +118,8 @@ LIBS= \ + @libgio_LIBS@\ + @SPIFF_LIBS@\ + @libxspf_LIBS@\ +- @sqlite3_LIBS@ ++ @sqlite3_LIBS@\ ++ @x11_LIBS@ + + if USE_SYSTEM_LIBSEXY + LIBS += @libsexy_LIBS@ +@@ -142,12 +143,13 @@ AM_CFLAGS = @CFLAGS@\ + @gobject_CFLAGS@\ + @gtk_CFLAGS@\ + @gmodule_CFLAGS@\ +- @libxspf_CFLAGS@\ ++ @libxspf_CFLAGS@\ + @libglade_CFLAGS@\ + @gthread_CFLAGS@\ + @libsoup_CFLAGS@\ + @libgio_CFLAGS@\ +- @sqlite3_CFLAGS@\ ++ @sqlite3_CFLAGS@\ ++ @x11_CFLAGS@\ + @EXTRA_CFLAGS@\ + -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\"\ + -DPACKAGE_DATA_DIR=\""$(datarootdir)"\" diff --git a/media-sound/gmpc/gmpc-0.20.0.ebuild b/media-sound/gmpc/gmpc-0.20.0.ebuild index 1da9ba24e485..34a600eade2f 100644 --- a/media-sound/gmpc/gmpc-0.20.0.ebuild +++ b/media-sound/gmpc/gmpc-0.20.0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/gmpc-0.20.0.ebuild,v 1.10 2011/03/22 18:57:38 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/gmpc-0.20.0.ebuild,v 1.11 2011/05/16 11:06:37 angelos Exp $ EAPI=2 -inherit gnome2-utils +inherit autotools eutils gnome2-utils DESCRIPTION="A GTK+2 client for the Music Player Daemon" HOMEPAGE="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client" @@ -29,6 +29,11 @@ DEPEND="${RDEPEND} nls? ( dev-util/intltool sys-devel/gettext )" +src_prepare() { + epatch "${FILESDIR}"/${P}-underlinking.patch + eautoreconf +} + src_configure() { VALAC=$(type -p valac-0.10) \ econf \ |