summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-05-10 12:43:34 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-05-10 12:43:34 +0000
commit5bdf47ea89996881597e92f06198b2757cb18fc3 (patch)
tree4f7224c6091d10668fba059e18ef5faf4c447287 /x11-misc
parentx86 stable wrt bug #317253 (diff)
downloadgentoo-2-5bdf47ea89996881597e92f06198b2757cb18fc3.tar.gz
gentoo-2-5bdf47ea89996881597e92f06198b2757cb18fc3.tar.bz2
gentoo-2-5bdf47ea89996881597e92f06198b2757cb18fc3.zip
Link to -lpng instead of -lpng12 for libpng14 to work wrt #319065 by Philip Taffner.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/slim/ChangeLog7
-rw-r--r--x11-misc/slim/slim-1.3.1_p20091114.ebuild3
2 files changed, 8 insertions, 2 deletions
diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 75e8ce272d05..c8ab603a85f8 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,11 @@
# 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.47 2010/05/04 18:53:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.48 2010/05/10 12:43:34 ssuominen Exp $
+
+ 10 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+ slim-1.3.1_p20091114.ebuild:
+ Link to -lpng instead of -lpng12 for libpng14 to work wrt #319065 by
+ Philip Taffner.
04 May 2010; Raúl Porcel <armin76@gentoo.org>
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 d78b3590b82c..10471bd37904 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.6 2010/05/04 18:53:44 armin76 Exp $
+# $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 $
EAPI=2
@@ -35,6 +35,7 @@ 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:" \
-r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \
Makefile || die "sed failed in Makefile"
epatch "${FILESDIR}/${PN}-1.3.1-config.diff"