Fix (detection and) building with libpng14.

(Portage version: 2.2_rc66/cvs/Linux x86_64)

3 files changed, 49 insertions, 23 deletions

diff --git a/x11-terms/mrxvt/ChangeLog b/x11-terms/mrxvt/ChangeLog
index c14d9314559a..46f7f8b8ebb5 100644
--- a/x11-terms/mrxvt/ChangeLog
+++ b/x11-terms/mrxvt/ChangeLog
@@ -1,9 +1,10 @@
 # ChangeLog for x11-terms/mrxvt
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/ChangeLog,v 1.71 2009/02/02 23:52:17 nelchael Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/ChangeLog,v 1.72 2010/03/11 01:00:56 ssuominen Exp $
 
-  02 Feb 2009; Krzysiek Pawlik <nelchael@gentoo.org> ChangeLog:
-  Fix ChangeLog entries.
+  11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> mrxvt-0.5.4.ebuild,
+  +files/mrxvt-0.5.4-libpng14.patch:
+  Fix (detection and) building with libpng14.
 
   09 Jan 2009; Rémi Cardona <remi@gentoo.org> mrxvt-0.5.3-r2.ebuild,
   mrxvt-0.5.3-r3.ebuild, mrxvt-0.5.4.ebuild:
diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch b/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch
new file mode 100644
index 000000000000..a475b70685dc
--- /dev/null
+++ b/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch
@@ -0,0 +1,33 @@
+http://repos.archlinux.org/wsvn/packages/mrxvt/trunk/libpng14.patch
+
+--- configure.ac
++++ configure.ac
+@@ -952,7 +952,7 @@
+ if test "x$support_png" = "xyes"; then
+     AC_CHECK_LIB(
+         png,
+-        png_check_sig,
++        png_sig_cmp,
+         [],
+         [support_png=no],
+         [-lz -lm]
+--- src/mpng.c
++++ src/mpng.c
+@@ -83,7 +83,7 @@
+     display_depth = XDefaultDepth(display,XDefaultScreen(display));
+ 
+     fread(sig, 1, 8, ifile);
+-    if (!png_check_sig(sig, 8)){
++    if (png_sig_cmp(sig, 0, 8)){
+       fclose(ifile);
+       return -1;
+     }
+@@ -113,7 +113,7 @@
+ 
+     if (png_depth < 8){
+       if (png_color_type == PNG_COLOR_TYPE_GRAY ){
+-        png_set_gray_1_2_4_to_8(png_ptr);
++        png_set_expand_gray_1_2_4_to_8(png_ptr);
+         png_row_bytes = png_width;
+       }else{
+         png_set_expand(png_ptr);
diff --git a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
index db70688e2252..aba593b377d9 100644
--- a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
+++ b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.5.4.ebuild,v 1.2 2009/01/09 14:41:53 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.5.4.ebuild,v 1.3 2010/03/11 01:00:56 ssuominen Exp $
 
-inherit eutils
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK support"
 HOMEPAGE="http://materm.sourceforge.net/"
@@ -29,16 +30,14 @@ RDEPEND="png? ( media-libs/libpng )
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-001-fix-segfault-when-wd-empty.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch \
+		"${FILESDIR}"/${P}-libpng14.patch
 
+	eautoreconf
 }
 
-src_compile() {
-
+src_configure() {
 	local myconf
 
 	# if you want to pass any other flags, use EXTRA_ECONF.
@@ -85,24 +84,18 @@ src_compile() {
 		$(use_enable truetype xft) \
 		$(use_enable utempter) \
 		$(use_enable menubar) \
-		${myconf} || die
-
-	emake || die
-
+		${myconf}
 }
 
 src_install() {
-
-	make DESTDIR="${D}" docdir=/usr/share/doc/${PF} install || die
+	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install || die
 	# Give mrxvt perms to update utmp
 	fowners root:utmp /usr/bin/mrxvt
 	fperms g+s /usr/bin/mrxvt
 	dodoc AUTHORS CREDITS ChangeLog FAQ NEWS README* TODO
-
 }
 
 pkg_postinst() {
-
 	if [[ -z $RXVT_TERM ]]; then
 		einfo
 		einfo "If you experience problems with curses programs, then this is"
@@ -117,5 +110,4 @@ pkg_postinst() {
 		einfo "in your ~/.mrxvtrc, or /etc/mrxvt/mrxvtrc."
 		einfo
 	fi
-
 }