From 65d57e2a1b55ec67116d2700909abfb2189edbc0 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Tue, 11 May 2010 06:58:51 +0000 Subject: Use pkg-config to find libpng wrt #319065 by Rafael G. Martins. (Portage version: 2.2_rc67/cvs/Linux x86_64) --- x11-misc/slim/ChangeLog | 6 +++++- x11-misc/slim/slim-1.3.1_p20091114.ebuild | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'x11-misc') diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog index c8ab603a85f8..7fd9ab9f89a7 100644 --- a/x11-misc/slim/ChangeLog +++ b/x11-misc/slim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/slim # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.48 2010/05/10 12:43:34 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.49 2010/05/11 06:58:51 ssuominen Exp $ + + 11 May 2010; Samuli Suominen + slim-1.3.1_p20091114.ebuild: + Use pkg-config to find libpng wrt #319065 by Rafael G. Martins. 10 May 2010; Samuli Suominen slim-1.3.1_p20091114.ebuild: diff --git a/x11-misc/slim/slim-1.3.1_p20091114.ebuild b/x11-misc/slim/slim-1.3.1_p20091114.ebuild index 10471bd37904..8c776d4c6ee5 100644 --- a/x11-misc/slim/slim-1.3.1_p20091114.ebuild +++ b/x11-misc/slim/slim-1.3.1_p20091114.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.1_p20091114.ebuild,v 1.7 2010/05/10 12:43:34 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.1_p20091114.ebuild,v 1.8 2010/05/11 06:58:51 ssuominen Exp $ EAPI=2 @@ -24,6 +24,7 @@ DEPEND="x11-proto/xproto media-libs/jpeg pam? ( virtual/pam )" RDEPEND="${DEPEND} + dev-util/pkgconfig x11-apps/sessreg screenshot? ( media-gfx/imagemagick ) branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )" @@ -35,7 +36,8 @@ src_prepare() { -e "s:^CC=.*:CC=$(tc-getCC) ${CFLAGS}:" \ -e "s:^MANDIR=.*:MANDIR=/usr/share/man:" \ -e "s:^\t\(.*\)\ \$(LDFLAGS)\ \(.*\):\t\1\ \2\ \$(LDFLAGS):g" \ - -e "s:lpng12:lpng:" \ + -e "s:-I/usr/include/libpng12:$(pkg-config --cflags-only-I libpng):" \ + -e "s:-lpng12:$(pkg-config --libs-only-l libpng):" \ -r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \ Makefile || die "sed failed in Makefile" epatch "${FILESDIR}/${PN}-1.3.1-config.diff" -- cgit v1.2.3-65-gdbad