Fix (detection and) building with libpng14.

Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

4 files changed, 52 insertions, 35 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/Manifest b/x11-terms/mrxvt/Manifest
index 6afc43204143..991cd6581bba 100644
--- a/x11-terms/mrxvt/Manifest
+++ b/x11-terms/mrxvt/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mrxvt-0.5.3-display-security.patch 1955 RMD160 00a026429da646cc0c594a96d261f29a276fbf3b SHA1 af49d324e36b9a719fd6065a5bbf9279aa8fa272 SHA256 4d12ee8672170ee55fdc5fb1ccb624c976d3fcd3a0601e61dae4a38431a54559
 AUX mrxvt-0.5.3-no-scroll-with-buffer.patch 2182 RMD160 0b05e382fe8736617961d8790786ba0341945caf SHA1 303de6d33aa76892f24c6fac7b93ac21a945fda5 SHA256 5c7b6e0e4f07b35d8ed14ef2c87e8c57bfc4806dcd01f6ee14ef0b233c5b6932
 AUX mrxvt-0.5.3-stop-polling-when-obscured.patch 338 RMD160 02b0dcfe85850fb0f48146c7236d7a8d4d46f4ec SHA1 ee7025382b6ef5e9f70788a1f0e52cf205f9bac8 SHA256 51770f3b37406b80bcfa72eec757bbcea633bda6663c3332c7c6cb7defa812ce
 AUX mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch 380 RMD160 039929a83065055abfe29e239d7760390bb54a6b SHA1 62b1d128f71e463dd38239efa4d5bc0daa77e9cf SHA256 1b4e5c18d5c2ed6c9e1f198a97e058016b8e6589e1690d494c01bc899c010f30
+AUX mrxvt-0.5.4-libpng14.patch 841 RMD160 2971eba724ab373e4fcfa5cb6b075017cb0e1849 SHA1 82605e0c4f5cddcdf681157f264f835feda97229 SHA256 3d37317e91085a8e0ae080590f41bbfbc8159a6b932fc6bc0b9fb6351ef28ba7
 DIST mrxvt-0.5.3.tar.gz 592897 RMD160 76fbbd5ba20215dd7785eafa07dae909029194ec SHA1 442006f1d797ea5464c5c49d26d0cdecf79160f4 SHA256 e2327b7fdf1db3f2152d7cbda564f638ec11a4bed17f69e6de985c888ab5d411
 DIST mrxvt-0.5.4.tar.gz 603978 RMD160 175ce5c554c267ada4efde18e22704ff1b688dac SHA1 f50e9ad2f652d4212b0ac5241b919372d9e43744 SHA256 f403ad5a908fcd38a55ed0a7e1b85584cb77be8781199653a39b8af1a9ad10d7
 EBUILD mrxvt-0.5.3-r2.ebuild 3323 RMD160 bedb467696622e8390d5b780e74dcefcd845af53 SHA1 3cb4ba65c6af5f36f3b7409bfa276e2deeee9102 SHA256 f07a7ed85c564729e2611b1f0d394fe73f71af6c28a929e487e999e672231170
 EBUILD mrxvt-0.5.3-r3.ebuild 3387 RMD160 f85df97982a70abe95f9f47a08e6cb795a0ca304 SHA1 bfed71d8c722f65ccb4c0c146e796fe17cce5ca2 SHA256 3e39dd1bbb2f30b750471ddbf9daf9ebc7f7664a58a56af75151faa0bc42b6f5
-EBUILD mrxvt-0.5.4.ebuild 3283 RMD160 45b0328de37782f0153bf53903a7850eaad046cd SHA1 b04d570bc685afcc91d3a14136c7dd27b1b04b54 SHA256 1fae12c1ebe7bed49a1053a0cf39eab7b4843d41f35271acbfeb25aa9be0bb57
-MISC ChangeLog 10289 RMD160 f9d92c2261c48fa6446d35797da4a6b29ee4899a SHA1 8f8a6dbcb95e1c172acb8c87eb1f937c6272f09b SHA256 96b113ef8420134fe6582e8043aaae5aae3333696822268b7129afce237c45b4
+EBUILD mrxvt-0.5.4.ebuild 3307 RMD160 70e96667bb574d6527dfe47665fcb79d827ba459 SHA1 a17fce1bea7cff923a2af69c29cc6aa0b4f09f66 SHA256 ae94cb6ca54b52444f4045e238988fdaeec2af9de37549d7acd707130ad13131
+MISC ChangeLog 10358 RMD160 7b09206a0c1fe61e5e1c4a3c3f37c61d1c4285b0 SHA1 36e3b9dc4e461387d58b81e6e280f6a875a5dfcb SHA256 c0f467e9a1fbdcfcdf307150fb318c8f07511504e55c91bb61dfd4602874b02a
 MISC metadata.xml 377 RMD160 14a402344881411ed8e1c56aaa09d848f8bf2977 SHA1 257afd07e8658d8f1b5915f0a5d1d133dfaae2aa SHA256 939896f4cf8d980b433cd9b636cdb36b1069f19b0d210def362bd18aff60f889
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmHhzYACgkQgo/w9rxVVVE3rACgpIeHeEMw4uIaIVTvR7SPxuC6
-d9kAn03i5HT/49yYX4qy/N2KDUfO+lMp
-=iCA+
------END PGP SIGNATURE-----
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
-
 }