Fix (detection and) building with libpng14.

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

diff --git a/x11-terms/multi-aterm/ChangeLog b/x11-terms/multi-aterm/ChangeLog
index 052abfd777cc9ca326eb4ef588c5253eb9c7f3d6..a1880702857e0d2607a98e36083be5a8051eee00 100644 (file)
--- a/x11-terms/multi-aterm/ChangeLog
+++ b/x11-terms/multi-aterm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/multi-aterm
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-aterm/ChangeLog,v 1.30 2008/05/06 17:45:27 dertobi123 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-aterm/ChangeLog,v 1.31 2010/03/11 00:44:53 ssuominen Exp $
+
+  11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  multi-aterm-0.2.1-r1.ebuild, +files/multi-aterm-0.2.1-libpng14.patch:
+  Fix (detection and) building with libpng14.
 
   06 May 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   multi-aterm-0.2.1-r1.ebuild:

diff --git a/x11-terms/multi-aterm/Manifest b/x11-terms/multi-aterm/Manifest
index 654c3e51c73ef571804ab0b0adef65feace25a63..26754fcbd6e9aa3a8b7eed4b8d43ac7e12dbcbad 100644 (file)
--- a/x11-terms/multi-aterm/Manifest
+++ b/x11-terms/multi-aterm/Manifest
@@ -1,6 +1,7 @@
-AUX 0.2.1-initialize-vars.patch 511 RMD160 333921370987df00024d920a62994271bd367cc4 SHA1 2fc5ad18d0fb6f4c18bca070431d4d5dc979043b SHA256 b68e556065a35091485d4da8bb0111e528920d488d3e8569f1031c7fa0cc0ad5
-AUX multi-aterm-0.2.1-display-security-issue.patch 631 RMD160 9d0a575b353ba4339d73441f799ad214a05f5773 SHA1 8a5bebdb4d834ff8c54770470f17037e597bca84 SHA256 e04b57a34df1c245a8538269d0a71921ebc484d0ba92ccdc81ead65c1483283a
+AUX 0.2.1-initialize-vars.patch 317 RMD160 13ab3bc798a3adefb6f6d3f1c451ffe5d904d7ea SHA1 567165416557ef8bbc21489e6f88bf10f1ffe37f SHA256 81d6d19a0a364781f26081b867e8b3d45d061b6bee3ed810f0fcff17e06135b3
+AUX multi-aterm-0.2.1-display-security-issue.patch 550 RMD160 c7420ba9f66c6ab62cf19a5e49165807b416fe43 SHA1 dee52e70067962c5576bb37a209de667f107328f SHA256 1f1f9c52ec352302fb4269205c8ff08342ad8f000eaa4e14ecff84f626772503
+AUX multi-aterm-0.2.1-libpng14.patch 539 RMD160 bdd6b0ff5edcd444b5609811004d5386426d8831 SHA1 604019f76abdd6181caad14b1ce0d7b7554a5888 SHA256 25a75cae7cf473872982f5ca0cd2fea827e7a5110d5a495fbe641b7de4b8bd75
 DIST multi-aterm-0.2.1.tar.gz 237428 RMD160 4e18a9034ae1c9f37b848c3d7a0f9f8aced184a5 SHA1 a315bd392228804b832b18ea285ccfe87b9d9faf SHA256 de12604e29dabd0157ce061c785b482ad8c9721027ec31f60609dc9f647bd5fb
-EBUILD multi-aterm-0.2.1-r1.ebuild 1326 RMD160 b57d4fee7b52f9455310c77e27ea198aaebabcf4 SHA1 6f669485ed779e816f225c57b8b37984f2ce0fbd SHA256 0af16ebf46bbaa3d63a0431145f55e107a3771078342486e616ae12f8e57f70d
-MISC ChangeLog 3924 RMD160 0814ed2e6f7faf9360a73804606767fbabaec9a1 SHA1 389b97242b441aa9b0ec5f33dcdf5b3da9591fb1 SHA256 9fed1b4f8112bc6d8a4b98ce6236003c77685b306a2cf6d0b72d4ceb78783fb7
+EBUILD multi-aterm-0.2.1-r1.ebuild 1339 RMD160 4716da55f8889294e40cbdf9a52cbb7e143c10e3 SHA1 79efdc1a1a183448a7b32408314beee660b05850 SHA256 0e5b95140268ddcb05190717a20aa7fb6243d71cfa4ddd96b61118338bf3c710
+MISC ChangeLog 4096 RMD160 cd7f3fe4fd00c8e63e39a967635d39bd13ba8e3a SHA1 ff899c44e5f1561a508126778cab8cbeacae1680 SHA256 9fb8910ce10aae345f0d4ff883e65b92163284c1b0160088c79ba21b90d41c6b
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b

diff --git a/x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch b/x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch
index b7f31b5393e04960e5f4eae7e953bb354acd36d1..58be689bb961954f1c50d70b071b8f2e5fc828a0 100644 (file)
--- a/x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch
+++ b/x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch
@@ -1,6 +1,5 @@
-diff -Nur multi-aterm-0.2.1/src/command.c multi-aterm-0.2.1-fixed/src/command.c
---- multi-aterm-0.2.1/src/command.c    2004-08-17 12:09:11.000000000 +0200
-+++ multi-aterm-0.2.1-fixed/src/command.c      2004-09-04 05:27:51.740333672 +0200
+--- src/command.c
++++ src/command.c
 @@ -1487,7 +1487,7 @@
        static XComposeStatus compose = { NULL, 0 };
        static unsigned char kbuf[KBUFSZ];

diff --git a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch
index 27f56255acdb403e855805b5515c807ade0eda30..9397854840305eed01331ec8a0f3a7265e14a393 100644 (file)
--- a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch
+++ b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch
@@ -1,5 +1,7 @@
---- multi-aterm-0.2.1/src/main.c       2004-09-03 20:49:36.000000000 +0200
-+++ multi-aterm-0.2.1.new/src/main.c   2008-05-03 13:33:04.000000000 +0200
+http://bugs.gentoo.org/219754
+
+--- src/main.c
++++ src/main.c
 @@ -1853,15 +1853,13 @@
    //get_options(argc, argv);
    //display_options();

diff --git a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch
new file mode 100644 (file)
index 0000000..6aeadc4
--- /dev/null
+++ b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch
@@ -0,0 +1,20 @@
+--- src/png.c
++++ src/png.c
+@@ -86,7 +86,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;
+     }
+@@ -116,7 +116,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/multi-aterm/multi-aterm-0.2.1-r1.ebuild b/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild
index d77a7b48ae6bb8b70899a0337fdd36ad7c7610eb..a9b2013c26a0f448216a7bef35f7f56f65478099 100644 (file)
--- a/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild
+++ b/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2008 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/multi-aterm/multi-aterm-0.2.1-r1.ebuild,v 1.8 2008/05/06 17:45:27 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild,v 1.9 2010/03/11 00:44:53 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="Terminal emulator with transparency support as well as rxvt backwards compatibility with tab support"
 HOMEPAGE="http://www.nongnu.org/materm/materm.html"
 SRC_URI="http://www.nongnu.org/materm/${P}.tar.gz"
 
-IUSE="cjk debug jpeg png"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
+IUSE="cjk debug jpeg png"
 
 RDEPEND="x11-libs/libXpm
        jpeg? ( media-libs/jpeg )
@@ -19,17 +20,17 @@ RDEPEND="x11-libs/libXpm
 DEPEND="${RDEPEND}
        >=sys-apps/sed-4"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       epatch "${FILESDIR}/${PV}-initialize-vars.patch"
+src_prepare() {
+       epatch "${FILESDIR}"/${PV}-initialize-vars.patch \
+               "${FILESDIR}"/${P}-display-security-issue.patch \
+               "${FILESDIR}"/${P}-libpng14.patch
 
-       # Security bug #219754
-       epatch "${FILESDIR}/${P}-display-security-issue.patch"
+       sed -i \
+               -e 's:png_check_sig:png_sig_cmp:' \
+               configure || die
 }
 
-src_compile() {
+src_configure() {
        econf \
                --enable-transparency \
                --enable-fading \
@@ -42,12 +43,11 @@ src_compile() {
                $(use_enable cjk kanji) \
                $(use_enable debug) \
                $(use_enable jpeg) \
-               $(use_enable png) \
-               || die "econf failed"
-       emake || die "emake failed"
+               $(use_enable png)
 }
 
-src_install () {
-       einstall || die "einstall failed"
-       dodoc NEWS ChangeLog doc/TODO || die "dodoc failed"
+src_install() {
+       emake DESTDIR="${D}" install || die
+       dodoc AUTHORS ChangeLog NEWS TODO
+       newdoc doc/TODO TODO.2
 }