Include zlib.h for Z_BEST_COMPRESSION (required by libpng15 porting) wrt #355079 by Lars Wendler

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

4 files changed, 30 insertions, 8 deletions

diff --git a/sci-astronomy/celestia/ChangeLog b/sci-astronomy/celestia/ChangeLog
index 52ca901974b8..7472fdf1b658 100644
--- a/sci-astronomy/celestia/ChangeLog
+++ b/sci-astronomy/celestia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-astronomy/celestia
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.72 2011/08/04 18:27:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.73 2011/08/07 08:02:49 ssuominen Exp $
+
+  07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> celestia-1.6.1.ebuild,
+  +files/celestia-1.6.1-libpng15.patch:
+  Include zlib.h for Z_BEST_COMPRESSION (required by libpng15 porting) wrt
+  #355079 by Lars Wendler
 
   04 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
   Switched herd to sci-astronomy
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 11651d84d525..a0698a593128 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX celestia-1.4.1-as-needed.patch 406 RMD160 3d466263828351e668858ab0d3d66219fa6d2e91 SHA1 5263f2815101e2f417e6c94402365fa1f705cd90 SHA256 369e0a679fba546d85bc8ab41abe72180568f210c55f333dc5c67b38a1e5e705
 AUX celestia-1.5.0-desktop.patch 1594 RMD160 04ef01761f3aee6448ee60e06bb6ea508c0920e6 SHA1 5b739ac3b53bf5d8d3d74188b8ad650c6fdc165c SHA256 2f989391f775e3435f0e0e570f747e0d8f38b310ea8ad92ba75099c59203171d
@@ -12,16 +12,17 @@ AUX celestia-1.6.0-parallel_install.patch 347 RMD160 41ce2490d823914c5faad035b02
 AUX celestia-1.6.1-as-needed.patch 525 RMD160 6c1b943b79b2e6287a9d1e029564272902741b61 SHA1 1298f5215cea4b1bb6d73b1b6f59972c21f95883 SHA256 7a7f35d8633e25db53d3a3def512ae4a018466fa6b4197aedd92e27dc1564466
 AUX celestia-1.6.1-gcc46.patch 278 RMD160 0de86a5a96c9c392fa5b7b352a9f7e77d75b8b1d SHA1 7c08ca391603806d788cb8f3342acedafc924eef SHA256 5fb9becc79e12e57c296d3861591cd22b2b11a591cca755c2bfff202fd6dc757
 AUX celestia-1.6.1-gold.patch 545 RMD160 eb00ce384128bb2c6f9678a8a7e610a97caa9bd7 SHA1 6b7dd092bd523776ab0c5f8c3a1d266b93846014 SHA256 32c455a5f23ca6eb61130d0fac40872de97f2d465d44f636f23a23b81d04887e
+AUX celestia-1.6.1-libpng15.patch 387 RMD160 9f51b8d11789d81c43366f32a0fedc1db0bdbc41 SHA1 46ecc4e10b24191384bc848c206652498843adf0 SHA256 ba3269842103ab68a1abd0fceb388878932d042620902796986625bd2b5f35cb
 DIST celestia-1.6.0.tar.gz 51848015 RMD160 c26a190071bd06cf2c1ea6ab901469365e00fa8e SHA1 72aa9cc2ef0ee1e4d73ed63ca2638a1ed8af9566 SHA256 9d9785b651cb42b890765f97234eaed3b03bf5e07dfb1be4f123a27260cdbbd4
 DIST celestia-1.6.1.tar.gz 52600436 RMD160 46ffae2896f95d92b0b7aaacfce8d004fb55bf1a SHA1 1f0fdf4525a8b9d6c708e1f6383babed670d18e7 SHA256 d35570ccb9440fc0bd3e73eb9b4c3e8a4c25f3ae444a13d1175053fa16dc34c4
 EBUILD celestia-1.6.0.ebuild 3232 RMD160 12b8aaa108dd141d2e8e8993732fb553967b1798 SHA1 2b67cf5a85c688b4ee05c6bd20bc7c81056d864d SHA256 979c0090467b03f472487bee9d09df2b51e1439bf76fb28e003358d977a7d611
-EBUILD celestia-1.6.1.ebuild 3059 RMD160 737439a4c2acc1494b8e1839b98256d37f02b17a SHA1 b3c6f3be7513b97fe4cfa2618f7fbb17acdd0508 SHA256 fc0f3a444e2b81ba16747dad8f501075d2036aff0a92cd41360d4cd26c6b533f
-MISC ChangeLog 17317 RMD160 48e2f57d82679af89610814f9609c16c1a3687a0 SHA1 e5b94fba45862889c3b7e07c93a2b45bf0cdd3c1 SHA256 5cbe04340eb86ac15a41feac1b406342d0f2891d16ce09b1ba65172adaa61be7
+EBUILD celestia-1.6.1.ebuild 3146 RMD160 f44756efc8f023d58da1b097211d06ee7e277375 SHA1 b66ee9a596316a0848be0388ca713fc460c890c8 SHA256 878cb3297e4a253410b2a45cf381dff76de91e3ce54f31e90fb92dd68d30bef4
+MISC ChangeLog 17537 RMD160 c0c364bf6f21b676c1c4da6a8dda03879fc26a52 SHA1 a3cafcbea0c6701417d0dc50f2265ddc2d2a68ae SHA256 ea4e3639d5f7c85eb99ad0cd6cb66d3140e39ae408110387910849e0ad4bb5a8
 MISC metadata.xml 705 RMD160 cee4824e632be1d7e4e3eac24b556e841317b018 SHA1 479d9d525d2198e03ea2a6f7da39686ff7f1a1e6 SHA256 95695c52447533d5265d496b677a78e35f0118f9e34b539dd8b8f3a90d158421
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk465IYACgkQ1ycZbhPLE2B3KQCgpwFimSlfAY6o0hL+Zb5t1dd4
-CsAAoJ6GQ1jv54nxhgOrTvGMJXXRkeaD
-=C0Jb
+iF4EAREIAAYFAk4+ReUACgkQXkR9YqOcLPFGSAD7B4sDyCbg3lGW/l/KLN3tgoLs
+HTQXHrVipOB7T1yDoUIA/1YZ/zAk83NNXaQeZMro/UFuz8/m+7PK+f9fXaHrnzb0
+=oGfq
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/celestia/celestia-1.6.1.ebuild b/sci-astronomy/celestia/celestia-1.6.1.ebuild
index 2ac03027cd31..e21212e0868f 100644
--- a/sci-astronomy/celestia/celestia-1.6.1.ebuild
+++ b/sci-astronomy/celestia/celestia-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.6.1.ebuild,v 1.2 2011/07/16 17:47:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.6.1.ebuild,v 1.3 2011/08/07 08:02:49 ssuominen Exp $
 
 EAPI=2
 
@@ -60,6 +60,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc46.patch
 	# underlinking fix with USE="-gnome -gtk"
 	epatch "${FILESDIR}"/${P}-gold.patch
+	# missing zlib.h include with libpng15
+	epatch "${FILESDIR}"/${P}-libpng15.patch
 
 	# remove flags to let the user decide
 	for cf in -O2 -ffast-math \
diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-libpng15.patch b/sci-astronomy/celestia/files/celestia-1.6.1-libpng15.patch
new file mode 100644
index 000000000000..5dffbab246ef
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.6.1-libpng15.patch
@@ -0,0 +1,14 @@
+imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope
+
+--- src/celestia/imagecapture.cpp
++++ src/celestia/imagecapture.cpp
+@@ -31,6 +31,9 @@
+ #include "png.h"
+ #endif
+ 
++// Z_BEST_COMPRESSION
++#include <zlib.h>
++
+ // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
+ #ifndef png_jmpbuf
+ #define png_jmpbuf(png_ptr) png_ptr->jmpbuf