summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-06-01 19:45:45 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-06-01 19:45:45 +0000
commit9499dc09e17894d32f9931c4e3fc84bee3ea6614 (patch)
tree883b1012dce5c14beb0d9fc5938ae0766d56089a /media-sound/glurp
parentRemoved vulnerable version, bug #271761, thank Robert Buchholz for report. (diff)
downloadgentoo-2-9499dc09e17894d32f9931c4e3fc84bee3ea6614.tar.gz
gentoo-2-9499dc09e17894d32f9931c4e3fc84bee3ea6614.tar.bz2
gentoo-2-9499dc09e17894d32f9931c4e3fc84bee3ea6614.zip
Fix previous commit, it was still using the bundled include. Now playlist actually works.. nice.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/glurp')
-rw-r--r--media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch14
-rw-r--r--media-sound/glurp/glurp-0.11.6-r2.ebuild6
2 files changed, 17 insertions, 3 deletions
diff --git a/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch b/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch
index 080710c876fa..22b88b6e2759 100644
--- a/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch
+++ b/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch
@@ -6,7 +6,7 @@ diff -ur glurp-0.11.6.orig/configure.in glurp-0.11.6/configure.in
#pkg_modules="gtk+-2.0 libglade-2.0 libxml-2.0 glib-2.0"
-pkg_modules="gtk+-2.0 >= 2.4 glib-2.0 >= 2.4 libglade-2.0 >= 2.3 gmodule-2.0 >= 2.6"
-+pkg_modules="gtk+-2.0 >= 2.4 glib-2.0 >= 2.4 libglade-2.0 >= 2.3 gmodule-2.0 >= 2.6 libmpd >= 0.17.0"
++pkg_modules="gtk+-2.0 >= 2.4 glib-2.0 >= 2.4 libglade-2.0 >= 2.3 gmodule-2.0 >= 2.6 libmpd >= 0.18.0"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
@@ -23,3 +23,15 @@ diff -ur glurp-0.11.6.orig/src/Makefile.am glurp-0.11.6/src/Makefile.am
main.c \
player.h player.c \
structs.h \
+diff -ur glurp-0.11.6.orig/src/structs.h glurp-0.11.6/src/structs.h
+--- glurp-0.11.6.orig/src/structs.h 2005-04-05 04:35:39.000000000 +0300
++++ glurp-0.11.6/src/structs.h 2009-06-01 22:45:09.000000000 +0300
+@@ -20,7 +20,7 @@
+
+ */
+
+-#include "libmpdclient.h"
++#include <libmpdclient.h>
+
+ enum {
+ PL_FILENAME,
diff --git a/media-sound/glurp/glurp-0.11.6-r2.ebuild b/media-sound/glurp/glurp-0.11.6-r2.ebuild
index 6cd9307f4139..52d7548ca2b8 100644
--- a/media-sound/glurp/glurp-0.11.6-r2.ebuild
+++ b/media-sound/glurp/glurp-0.11.6-r2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glurp/glurp-0.11.6-r2.ebuild,v 1.1 2009/06/01 19:22:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glurp/glurp-0.11.6-r2.ebuild,v 1.2 2009/06/01 19:45:44 ssuominen Exp $
EAPI=2
-inherit autotools eutils
+inherit autotools eutils flag-o-matic
DESCRIPTION="Glurp is a GTK2 based graphical client for the Music Player Daemon"
HOMEPAGE="http://sourceforge.net/projects/glurp/"
@@ -22,10 +22,12 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${P}-system_libmpd.patch
+ rm -f src/libmpdclient.*
eautoreconf
}
src_configure() {
+ append-flags -I/usr/include/libmpd-1.0/libmpd
econf \
$(use_enable debug)
}