Fix building with libpng15 (missing zlib.h include) wrt #380139 by Diego Elio Pettenò

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

4 files changed, 32 insertions, 12 deletions

diff --git a/app-cdr/dvdisaster/ChangeLog b/app-cdr/dvdisaster/ChangeLog
index 0d3adae20207..d12b9d4565f5 100644
--- a/app-cdr/dvdisaster/ChangeLog
+++ b/app-cdr/dvdisaster/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/dvdisaster
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdisaster/ChangeLog,v 1.15 2011/08/21 19:03:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdisaster/ChangeLog,v 1.16 2011/09/15 02:24:21 ssuominen Exp $
+
+  15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> dvdisaster-0.72.1.ebuild,
+  +files/dvdisaster-0.72.1-libpng15.patch:
+  Fix building with libpng15 (missing zlib.h include) wrt #380139 by Diego Elio
+  Pettenò
 
   21 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   dvdisaster-0.72.1.ebuild:
diff --git a/app-cdr/dvdisaster/Manifest b/app-cdr/dvdisaster/Manifest
index 603f80c1203a..8f5c779e3d1b 100644
--- a/app-cdr/dvdisaster/Manifest
+++ b/app-cdr/dvdisaster/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX dvdisaster-0.72.1-libpng15.patch 194 RMD160 06305caa49c4db476c0b7a671fb14d6988dd205a SHA1 76b3d7b7039c5a3d900dd333c0aaca99bed41361 SHA256 8ddbd4288c1ddb1d6cec404e25795c334fd0405f02e215cdaacf9fe1460688d3
 DIST dvdisaster-0.70.4.tar.bz2 1148733 RMD160 917457581309db33aef5ceddc7dddbd2ef084497 SHA1 0ab5fe59d4c91e77c2f73b389485d0f5443d8873 SHA256 3ad9a17876223e802497d6b60a6a810aabb2fc08db579245ecebec6158496ddf
 DIST dvdisaster-0.72.1.tar.bz2 4132345 RMD160 0315b7a8d8529383361b7cd344e79e9f8138ee43 SHA1 54499a6c22d121f8b7ceb070b8517b3038bb68b4 SHA256 f3f5983d35517ce30f9ae47d5406ab1f1631ce3499dc982dd3da7132430d5a80
 DIST dvdisaster-0.72.rc1.tar.bz2 2872245 RMD160 b8a1bea433e6d1c6477315c2c4bdd6a436c3b686 SHA1 243f2059614695a8af29c95afd7e5f51accba7b5 SHA256 1e7c11db76f19de437a81d2f4e8841aa0d0ed1ce5edf5adae179c97f5ad53cd5
 EBUILD dvdisaster-0.70.4.ebuild 2133 RMD160 83092dede87dc8c686cd279335f2abd761e7a134 SHA1 db59f40380f1e8ffb99e67435c327e9f2b632d5f SHA256 5b5fee6ebd91d9cb07134e687902ac6c1505e26df113d8d042424607bd47efce
-EBUILD dvdisaster-0.72.1.ebuild 1974 RMD160 5bbb90ec0428b1af0ad57cad4244a05a6e39fca2 SHA1 f5e2cff2e80adb668a0eb12c3df07693f1031ca2 SHA256 3e4ca1174bfe01293b32728f940833c8f56499b17ae3540bcd262cab026cca44
+EBUILD dvdisaster-0.72.1.ebuild 1980 RMD160 b3141e3f022ea8155581d50f3bea0b9629df5baa SHA1 f8ad893531899fa3dccf72a520c8b4ac235fb39e SHA256 61f1b42527c2fd7af99b146b27d82fbb063a7f9cbb7c99035d3e270a4bc52f77
 EBUILD dvdisaster-0.72_rc1.ebuild 1942 RMD160 5ef62a302601b53485574e45e392af797b9264de SHA1 5fd905dabde3692a9e3af7e087b895e7ddf36220 SHA256 a85503622c210b5fa27a73834a528b39e00b04c56c38ddb434dcd0795f2e1b2c
-MISC ChangeLog 2249 RMD160 aaa95598ec7f7750a17d813d410c886566449c96 SHA1 646dda1c3e1cf0f090a7f6f40c9a97351b988cad SHA256 8065f20ba6d2cc1a229475a40e0d990877c84d89d184786a5418addd2cf4f745
+MISC ChangeLog 2464 RMD160 31dffc79ed1252550be1dd926ab82e304507354c SHA1 62e25c3872d635df7ed46d3cef049be2af143048 SHA256 a5c32a3de5b9daa95e379623907169fb1c69ec048e2aad8364e51dfed9386f18
 MISC metadata.xml 167 RMD160 ab34a00275c75c4522a5fb146a9c6e7d9ca18d7f SHA1 02a137b11f7f59a2f650c1e85a830acd896d64a8 SHA256 e63e128685e2c6da2eacfda6e91e700c1eb6f62cc2172ab64eada2ae71431ef2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5RVmUACgkQAiZjviIA2XhldgCg8bp1o1XLaOlI/FaVX+hrj70w
-7KwAoMOYzEONc2qQ9FuNrMV/+cWwH59P
-=4ALL
+iF4EAREIAAYFAk5xYg0ACgkQXkR9YqOcLPEEBQD/SjNXxG7xSLhLupNBgtBuXxvI
+2O6Dmjd0a3wuipeGUoUA+wU/AZEcT+RsDYaPy7ipXji+cywPXrbPyky7ZWpSOz/f
+=tKZH
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/dvdisaster/dvdisaster-0.72.1.ebuild b/app-cdr/dvdisaster/dvdisaster-0.72.1.ebuild
index afabbcd0f327..5ab9daabbc61 100644
--- a/app-cdr/dvdisaster/dvdisaster-0.72.1.ebuild
+++ b/app-cdr/dvdisaster/dvdisaster-0.72.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdisaster/dvdisaster-0.72.1.ebuild,v 1.2 2011/08/21 19:03:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdisaster/dvdisaster-0.72.1.ebuild,v 1.3 2011/09/15 02:24:21 ssuominen Exp $
 
-EAPI=2
+EAPI=4
 inherit eutils gnome2-utils versionator
 
 MY_P=${PN}-$(replace_version_separator 2 '.')
@@ -24,6 +24,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+}
+
 # - There is no autotools, use_ functions won't work
 # - NLS disabled because sys-devel/gettext fails, if you enable it
 # you need also virtual/libintl because it links to it for FreeBSD
@@ -47,12 +51,11 @@ src_configure() {
 		--localedir=/usr/share/locale \
 		--buildroot="${D}" \
 		--with-nls=no \
-		${myconf} \
-		|| die "./configure failed"
+		${myconf} || die
 }
 
 src_install() {
-	emake install || die "emake install failed"
+	emake install
 
 	newicon contrib/${PN}48.png ${PN}.png
 	make_desktop_entry ${PN} ${PN} ${PN} "System;Utility"
diff --git a/app-cdr/dvdisaster/files/dvdisaster-0.72.1-libpng15.patch b/app-cdr/dvdisaster/files/dvdisaster-0.72.1-libpng15.patch
new file mode 100644
index 000000000000..3dc25f9b22ac
--- /dev/null
+++ b/app-cdr/dvdisaster/files/dvdisaster-0.72.1-libpng15.patch
@@ -0,0 +1,11 @@
+--- tools/pngio.c
++++ tools/pngio.c
+@@ -17,6 +17,8 @@
+  *  or direct your browser at http://www.gnu.org.
+  */
+ 
++#include <zlib.h>
++
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>