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 | 885387a8e33f5506613614fc5fba6b9dc8a2f8e6 (patch) | |
| tree | 96c22e0e9e59d586c1364f2719b0144f0a52c1e5 /media-sound/gmpc | |
| parent | EAPI4 and use of systemd eclass, fix #366179. (diff) | |
| download | historical-885387a8e33f5506613614fc5fba6b9dc8a2f8e6.tar.gz historical-885387a8e33f5506613614fc5fba6b9dc8a2f8e6.tar.bz2 historical-885387a8e33f5506613614fc5fba6b9dc8a2f8e6.zip | |
Fix underlinking (bug #367449)
Package-Manager: portage-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/Manifest | 11 | ||||
| -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 |
4 files changed, 64 insertions, 8 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/Manifest b/media-sound/gmpc/Manifest index ab55a123fa26..39a594f978c1 100644 --- a/media-sound/gmpc/Manifest +++ b/media-sound/gmpc/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX gmpc-0.20.0-underlinking.patch 1113 RMD160 a8342d3393258e8eac73ef11fe8b7b5a6bf77479 SHA1 44b8a390352234d96df44ab2aad56de2a4fff969 SHA256 47eb11e678c130a955e942a296f0ca18ebb0883693130c0962ca29617bf4d404 DIST gmpc-0.20.0.tar.gz 3093720 RMD160 fd1278dbec1eb7ca2efd1e0545b0e37ff1fad34f SHA1 3b160bb1e196760b0148faa6493c66083e1fe53d SHA256 d9b8bd23e86acc74049d2ceb5e06db8c62b43e7e5bd166ac8348eae133b9de81 -EBUILD gmpc-0.20.0.ebuild 1251 RMD160 b3e847d7f2e632d637875e771f0a0fc00ffaff1e SHA1 b21dbe594a5cc56af9d952ae217f99ffddd7f809 SHA256 d3c346d8dc962dabdfd7198c0158d78fde5b5b872b363a3b4df43eef01be38eb -MISC ChangeLog 9751 RMD160 58ed4b4ea43379b74e2ae40953e0d2d2be910091 SHA1 3c899093a72d5534f3b3dee6b3e2399e00e66c1b SHA256 9d5b1256e78b4bfe143bef2e646fe47ace364d0edc8004a4eeea92f268a425c4 +EBUILD gmpc-0.20.0.ebuild 1346 RMD160 2d7eb30ce5c58e0ebc5329a764a3b7bb798d4c5e SHA1 a0ffcc70e10eaf76330adf5e78f0ba30a88545cd SHA256 4b9ad23e33b89a17f491805839b4150a237a1bec6e1c64140042e71d0b495b1d +MISC ChangeLog 9898 RMD160 e611102c5bd813cf97491299afef657c4667c7a5 SHA1 cb446af4b37654e0fe267453156d0dddeb385e6c SHA256 bb0c5facb39d48393d4827455b76ba9bf44b88b26786547abf24dd65d5603733 MISC metadata.xml 342 RMD160 b79e0d8f63f387d420131a9d8196ac331f568b40 SHA1 4b8aebf988b206e50585b953bc457fc8133d3038 SHA256 fce3f240732cac6a55582a57289563d327e6b26922f9c6f33763498574303905 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk252cIACgkQmWq1bYTyC0MJdgD/euIh5jQCKfShEbo2fM90tezl -ci9XBMYjV5Z+TVKrGG8BALPvAHntn+QS0elN24BLeRH1NgRjCQq1iMqV1CmRrz3v -=kBiY +iF4EAREIAAYFAk3RBUIACgkQmWq1bYTyC0P5kwEAuKV4HtJQ1Y0LtcWCWs4hKhUH +6pa7vFguiitmKj97KAMBAK7DwWaz6FgStMcN59uF/MsD8+5oEOwcijIzFee/1AJu +=xbXY -----END PGP SIGNATURE----- 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 \ |