Fix building with libpng14 wrt #307429 by Lars Wendler.

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

4 files changed, 24 insertions, 14 deletions

diff --git a/sci-astronomy/celestia/ChangeLog b/sci-astronomy/celestia/ChangeLog
index 4c31d947c154..62248df510e2 100644
--- a/sci-astronomy/celestia/ChangeLog
+++ b/sci-astronomy/celestia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-astronomy/celestia
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.61 2010/01/12 02:18:48 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.62 2010/03/08 18:24:08 ssuominen Exp $
+
+  08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> celestia-1.6.0.ebuild,
+  +files/celestia-1.6.0-libpng14.patch:
+  Fix building with libpng14 wrt #307429 by Lars Wendler.
 
   12 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org>
   -files/celestia-1.4.1-cfg.patch, -celestia-1.5.1.ebuild,
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 8a82e05c8747..f3996e3afa47 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
 AUX celestia-1.5.1-gcc44.patch 1003 RMD160 3a7444ee0750ee32113fb54f0dc74042cdd8d836 SHA1 0444f9bd8a49c4ec905417aff2a2fb4c4aae73bc SHA256 1dab8e91cc720d826f06b4fe53de4b42e9d635818050a791f0cdefc7110daf5c
 AUX celestia-1.6.0-cfg.patch 461 RMD160 220506c67e763c9ec579f305f4636af28579d445 SHA1 aff0b44001849448da62dc83615b7235132af1e8 SHA256 868bbbcd761ec9b2ce3e45e3688b0a6d8d2c0d4ea39b520e13271b0063c78dac
 AUX celestia-1.6.0-kde-3.5.patch 962 RMD160 5bfc9f56f00f0a74fc5e8bac0ea92da0515db39a SHA1 b25b2bfebaa1c2cd23c8d350b5849327acc978e3 SHA256 ecbae1130ee36871fe815e298326d628a436e4c2204cac8228b1a1b1cf77c166
+AUX celestia-1.6.0-libpng14.patch 424 RMD160 e3d599cf1a52e4e4cfe5a24055bea7367ac0e02f SHA1 d6376d9a9f1765238ec959d1dba37c4a81b4bb24 SHA256 5df8125dd0080678c87806e21c41789afe5563f05a648c6b3a75edb129fe981a
 DIST celestia-1.6.0.tar.gz 51848015 RMD160 c26a190071bd06cf2c1ea6ab901469365e00fa8e SHA1 72aa9cc2ef0ee1e4d73ed63ca2638a1ed8af9566 SHA256 9d9785b651cb42b890765f97234eaed3b03bf5e07dfb1be4f123a27260cdbbd4
-EBUILD celestia-1.6.0.ebuild 2906 RMD160 0c0d8e83ce64869a347c49d32290552466f1d78e SHA1 1ce09f3a855082c468908b5e02ed5126974aa1da SHA256 4eebf7f678da970f2680c5b449b8d1682446f12b68237c3cbe7a1cc867c13fa9
-MISC ChangeLog 15568 RMD160 301b0ab08c4c0894f4a9991d0cf82d429e2c1003 SHA1 67a66de164b83b3d552007d55177df58250da96b SHA256 a7534bc6bd8655ac3236589f4882fedd0a66aa3c21899f95ae5d5a9e9fd82e74
+EBUILD celestia-1.6.0.ebuild 2951 RMD160 e4a30b1bf179e6a5baeff36528bb74f9c15b1fab SHA1 28a020f249a0ffd315af6994945e79321238207c SHA256 40de1ca0ec394ba87e000ad2700350cc2dfbafc6bc109c859810b6ac8d7eda3c
+MISC ChangeLog 15745 RMD160 cde88ffb14c9d785bca1f831390679b1f97673f5 SHA1 4e3585e96f895ae2a10079cdb3d044175cccac21 SHA256 3eaafdd5785bb6145e5ac8ba52e8eb791e12e6fec1de1f8489b5e2253e58472b
 MISC metadata.xml 693 RMD160 902eac97368b5aa5d76c277826e42c3d741e9f99 SHA1 d5e786e1754e130bf4c0ff6d6978fb99ccb5f516 SHA256 3081606dbc2705ae14a2e9a9be830925eefc64bf2426bfee13399cc938e588da
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktL5KQACgkQ1ycZbhPLE2BWlQCgkFVJPa909nIBk9ekILUgpLQx
-+7sAn3wAQ4KVlFiqVG8WNQ6zLbBc2BQe
-=PEMJ
------END PGP SIGNATURE-----
diff --git a/sci-astronomy/celestia/celestia-1.6.0.ebuild b/sci-astronomy/celestia/celestia-1.6.0.ebuild
index dd6e3faf3b6d..6d328679280e 100644
--- a/sci-astronomy/celestia/celestia-1.6.0.ebuild
+++ b/sci-astronomy/celestia/celestia-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.6.0.ebuild,v 1.10 2010/01/11 22:13:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.6.0.ebuild,v 1.11 2010/03/08 18:24:08 ssuominen Exp $
 
 EAPI=2
 inherit eutils flag-o-matic gnome2 autotools
@@ -59,6 +59,7 @@ src_prepare() {
 	# needed for proper detection of kde-3.5 in the presence
 	# of kde4
 	epatch "${FILESDIR}"/${P}-kde-3.5.patch
+	epatch "${FILESDIR}"/${P}-libpng14.patch
 	# remove flags to let the user decide
 	for cf in -O2 -ffast-math \
 		-fexpensive-optimizations \
diff --git a/sci-astronomy/celestia/files/celestia-1.6.0-libpng14.patch b/sci-astronomy/celestia/files/celestia-1.6.0-libpng14.patch
new file mode 100644
index 000000000000..ac6f07aeac0d
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.6.0-libpng14.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/show_bug.cgi?id=307429
+http://repos.archlinux.org/wsvn/packages/celestia/trunk/libpng14.patch
+
+--- src/celengine/image.cpp
++++ src/celengine/image.cpp
+@@ -737,7 +737,7 @@
+ 
+     if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+     {
+-        png_set_gray_1_2_4_to_8(png_ptr);
++        png_set_expand_gray_1_2_4_to_8(png_ptr);
+     }
+ 
+     if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))