Version bump for mono-2.10, remove 9999 as we don't support neither maintain it. Fix libpng-1.5 building (bug #355113 by Lars Wendler).

Package-Manager: portage-2.1.9.41/cvs/Linux x86_64

4 files changed, 188 insertions, 30 deletions

diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index 843de1d3a10c..20143548e018 100644
--- a/dev-dotnet/libgdiplus/ChangeLog
+++ b/dev-dotnet/libgdiplus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-dotnet/libgdiplus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.127 2011/01/29 17:05:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.128 2011/02/27 12:46:28 pacho Exp $
+
+*libgdiplus-2.10 (27 Feb 2011)
+
+  27 Feb 2011; Pacho Ramos <pacho@gentoo.org> +libgdiplus-2.10.ebuild,
+  +files/libgdiplus-2.10.1-libpng15.patch, -libgdiplus-9999.ebuild:
+  Version bump for mono-2.10, remove 9999 as we don't support neither maintain
+  it. Fix libpng-1.5 building (bug #355113 by Lars Wendler).
 
   29 Jan 2011; Markos Chandras <hwoarang@gentoo.org> libgdiplus-2.8.1.ebuild:
   Stable on amd64 wrt bug #352808
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index d90a4f10ac15..8a790715048c 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -1,28 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX libgdiplus-2.10.1-libpng15.patch 5491 RMD160 6dccbc62607ac95bd1c062a7440199082e6038b0 SHA1 e63eba86cf1b55145de645ebbc54ba4e85d24260 SHA256 ae18bac02341af98ed17b14ee510c33cc87d0637a9cf56fedaf21603aa04198c
 AUX libgdiplus-2.6.7-fix-overflows.patch 7963 RMD160 033ee74060ac3103a4f9d5d8bd8bfc57ddab1fdb SHA1 199fa36eac75a3501befded439d38a8a97fdd5eb SHA256 5e0143cf657d9dee39e4e2226816c5acf12616e329f469a7d468f2baf1630627
+DIST libgdiplus-2.10.tar.bz2 1962898 RMD160 5b66e9c00759c24b815a82581efa271d333b058e SHA1 cc88be4db56561039325cfda10a42408d64332d9 SHA256 2d9e0397ef5583ed855eaafcdac8cabbe1d58463ed1e4b545be6dde5b63712a4
 DIST libgdiplus-2.6.7.tar.bz2 1960822 RMD160 577a2815562c1c2bd2adf50f707354fba2aaf2f3 SHA1 bc985e95b79327f224580263671173ef369dc074 SHA256 7ebe427d6486cdab56fb6715e2d14a484e8ffe5cb6f183e133abca7d4f8f7144
 DIST libgdiplus-2.8.1.tar.bz2 1959852 RMD160 b5e9e8877e3e9f3b9af8a6e8e53d511a40407f64 SHA1 00e546a0acacd9155d9347420440ffe15b19f0d1 SHA256 7e99f766a38b81c46fdcd16f2f10d6aa280b4298835fba141a74d6c39ff1e3c9
+EBUILD libgdiplus-2.10.ebuild 1165 RMD160 38ad685cf5315f16b10b0f2fa52525245ea58c91 SHA1 cd0cce91e5a6442adc4c9d3fb285542a08cf9641 SHA256 0d650f484e27074e66c121b2583387ccd1db2d54241a5866f8a68ff3bb7d3e5e
 EBUILD libgdiplus-2.6.7-r1.ebuild 1219 RMD160 ee72809144c3fa4d58441efff61a85d4dca0e08b SHA1 5e753442366d24b27326449baf978b31a2a98f07 SHA256 2c3cf13d349cdd52c87dd6ac5296919c3d9444e713927597fb3a679197831e48
 EBUILD libgdiplus-2.8.1.ebuild 1110 RMD160 619004b210ce5fb57d2a2595562cc4c42612bcf3 SHA1 c5de34265392a161149e24de2bb3c8f8d94d1c6d SHA256 d6e64fafb68810d458302364a997af226787afc8bb247abe8985403df6e7e413
-EBUILD libgdiplus-9999.ebuild 1249 RMD160 6e18f693018ee68fba5731d836e781faa0f19636 SHA1 6d39851f0e3c70df18922f29a2e2fb07c0abe60c SHA256 591f26dad58d27619b286e47d2e6cc41192a7ebeb542ee34571d8f5474ecd80b
-MISC ChangeLog 20726 RMD160 d32897f3b854cff8599ef51abc5dd2cb7cdec18f SHA1 41a638e22730cfbfefa1702cc5b775785c9f5c3b SHA256 31e65595a3306696c53bad4fd0d399a5d992e98beadf6c198871286373764724
+MISC ChangeLog 21035 RMD160 171ee14928385a8f260375816bf00ce193aa7cea SHA1 08f5c1904e62dd23ade26ea506144bb6d7c4cb4b SHA256 2125d97023d38bd79f3d576a94fd6d0613d2c8a849e301b04e0bbf40c6a3557c
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNREiiAAoJEPqDWhW0r/LCFEIP/ip7h38IsMK5E6LGmpuwZCTX
-TzVvU+vVuOEtl4BOstII04TmYaYMCnqbVbsMpWArabeZoi7xSmA0MaikgxGTcPhH
-oFQiHNbyWtPNsou0nRSbSCHLlDG6d+gWr72xmOW3jsvhzQN02OzxI1HO+k7XPQjH
-tfFBS3Xv1mooKIE7yrLltrz4JaoSKT/kC9wv0rdtMdy/OzRu9mKoG6hB7t77MwnP
-MyGzwKJwJ62eBVDdlU8+RNQXIK14B7lNKkzuLhhslvu2oczoc/XDKM9SNl/xJtMH
-+hFAGjflDlYa5C1dKsRp4VgMGnmBM5m4c4WBbXu3mBa8u4vu13zu1CI5D3XN5464
-VkEYB/gwUDH9Shbd5n6eUv4/JWLkGHt3G0/ct7fYNLytqXrGMX/Xx0gPUG/QR/Ly
-JYYaUW3jhxr6Zv4yGZRvTYaDvWl1gE/JRmZRentKbBdXyVVyIugUt6PaRYMDpKYc
-X6KSxCC0puRjT6XZICjoZ7O7OAbK4QTqQ932FYQ0A3Cxer7vKrw8JX3iX57Q2Kmv
-6/vwPDUb9dWxW7T/3IlBkLI2/XuvEGpDBjeTw/PpgjGBKawyBx2+CwI0s+GaQRGs
-6hmG52DOItr1WsEfUahsxHe82usnVdRBdnT+pod/z9Twk7WN2AONHQzSsnymjS8f
-K+C0JDM77vfe0a2Fglpr
-=9f/W
+iEYEARECAAYFAk1qR6oACgkQCaWpQKGI+9Q9zQCdG/Oy+jX8rfwBpEpS8bUtQdkU
+5qgAn2wFwThWadnbFXJWjSO2h4uDQB6T
+=zf9J
 -----END PGP SIGNATURE-----
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-2.10.1-libpng15.patch b/dev-dotnet/libgdiplus/files/libgdiplus-2.10.1-libpng15.patch
new file mode 100644
index 000000000000..31a1c01629d8
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/libgdiplus-2.10.1-libpng15.patch
@@ -0,0 +1,164 @@
+$NetBSD: patch-aa,v 1.8 2011/01/21 10:21:51 wiz Exp $
+
+Fix build with png-1.5.
+
+--- src/pngcodec.c.orig	2010-11-03 16:52:54.000000000 +0000
++++ src/pngcodec.c
+@@ -116,10 +116,15 @@ gdip_load_png_properties (png_structp pn
+ 	bitmap_data->dpi_horz = png_get_x_pixels_per_inch(png_ptr, info_ptr);
+ 	bitmap_data->dpi_vert = png_get_y_pixels_per_inch(png_ptr, info_ptr);
+ #elif defined(PNG_pHYs_SUPPORTED)
+-	if ((info_ptr->valid & PNG_INFO_pHYs) && (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)) {
+-		bitmap_data->image_flags |= ImageFlagsHasRealDPI;
+-		bitmap_data->dpi_horz = info_ptr->x_pixels_per_unit * 0.0254;
+-		bitmap_data->dpi_vert = info_ptr->y_pixels_per_unit * 0.0254;
++	if (png_get_valid (png_ptr, info_ptr, PNG_INFO_pHYs)) {
++		png_uint_32 res_x, res_y;
++		int unit_type;
++		png_get_pHYs (png_ptr, info_ptr, &res_x, &res_y, &unit_type);
++		if (unit_type == PNG_RESOLUTION_METER) {
++			bitmap_data->image_flags |= ImageFlagsHasRealDPI;
++			bitmap_data->dpi_horz = res_x * 0.0254;
++			bitmap_data->dpi_vert = res_y * 0.0254;
++		}
+ 	}
+ #endif
+ 	/* default to screen resolution (if nothing was provided or available) */
+@@ -130,7 +135,7 @@ gdip_load_png_properties (png_structp pn
+ #if defined(PNG_iCCP_SUPPORTED)
+ 	{
+ 		png_charp	name;
+-		png_charp	profile;
++		png_bytep	profile;
+ 		png_uint_32	proflen;
+ 		int		compression_type;
+ 
+@@ -292,6 +297,11 @@ gdip_load_png_image_from_file_or_stream 
+ 		ImageFlags	colourspace_flag;
+ 		int		i;
+ 		int		j;
++		png_colorp	png_palette;
++		int		png_num_palette;
++		png_bytep	trans_alpha;
++		int		num_trans;
++		png_color_16p	trans_color;
+ 
+ 		width = png_get_image_width (png_ptr, info_ptr);
+ 		height = png_get_image_height (png_ptr, info_ptr);
+@@ -309,6 +319,8 @@ gdip_load_png_image_from_file_or_stream 
+ 		}
+ 
+ 		/* Copy palette. */
++		png_get_PLTE (png_ptr, info_ptr, &png_palette, &png_num_palette);
++
+ 		num_colours = 1 << bit_depth;
+ 
+ 		if (png_get_color_type (png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY) {
+@@ -321,8 +333,8 @@ gdip_load_png_image_from_file_or_stream 
+ 			colourspace_flag = ImageFlagsColorSpaceRGB;
+ 
+ 			palette_entries = num_colours;
+-			if (palette_entries > info_ptr->num_palette) {
+-				palette_entries = info_ptr->num_palette;
++			if (palette_entries > png_num_palette) {
++				palette_entries = png_num_palette;
+ 			}
+ 
+ 			palette = GdipAlloc (sizeof(ColorPalette) + (num_colours - 1) * sizeof(ARGB));
+@@ -331,29 +343,30 @@ gdip_load_png_image_from_file_or_stream 
+ 
+ 			for (i=0; i < palette_entries; i++) {
+ 				set_pixel_bgra (&palette->Entries[i], 0,
+-						info_ptr->palette[i].blue,
+-						info_ptr->palette[i].green,
+-						info_ptr->palette[i].red,
++						png_palette[i].blue,
++						png_palette[i].green,
++						png_palette[i].red,
+ 						0xFF); /* alpha */
+ 			}
+ 		}
+ 
++		png_get_tRNS (png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
+ 		/* Make sure transparency is respected. */
+-		if (info_ptr->num_trans > 0) {
++		if (num_trans > 0) {
+ 			palette->Flags |= PaletteFlagsHasAlpha;
+ 			colourspace_flag |= ImageFlagsHasAlpha;
+ 
+-			if (info_ptr->num_trans > info_ptr->num_palette) {
+-				info_ptr->num_trans = info_ptr->num_palette;
++			if (num_trans > png_num_palette) {
++				num_trans = png_num_palette;
+ 			}
+ 
+-			for (i=0; i < info_ptr->num_trans; i++) {
++			for (i=0; i < num_trans; i++) {
+ 				set_pixel_bgra(&palette->Entries[i], 0,
+-						info_ptr->palette[i].blue,
+-						info_ptr->palette[i].green,
+-						info_ptr->palette[i].red,
++						png_palette[i].blue,
++						png_palette[i].green,
++						png_palette[i].red,
+ #if PNG_LIBPNG_VER > 10399
+-						info_ptr->trans_alpha [i]); /* alpha */
++						trans_alpha [i]); /* alpha */
+ #else
+ 						info_ptr->trans[i]); /* alpha */
+ #endif
+@@ -398,6 +411,8 @@ gdip_load_png_image_from_file_or_stream 
+ 		BYTE		bit_depth;
+ 		int		stride;
+ 		int		interlace;
++		png_colorp	png_palette;
++		int		png_num_palette;
+ 		png_bytep *row_pointers;
+ 		BYTE *rawptr;
+ 		int i, j;
+@@ -490,32 +505,33 @@ gdip_load_png_image_from_file_or_stream 
+ 							png_byte palette = 0;
+ 							png_byte pix = *rowp++;
+ 
++							png_get_PLTE (png_ptr, info_ptr, &png_palette, &png_num_palette);
+ 							palette = (pix >> 6) & 0x03;
+ 							set_pixel_bgra (rawptr, 0,
+-								info_ptr->palette[palette].blue,
+-								info_ptr->palette[palette].green,
+-								info_ptr->palette[palette].red,
++								png_palette[palette].blue,
++								png_palette[palette].green,
++								png_palette[palette].red,
+ 								0xFF); /* alpha */
+ 
+ 							palette = (pix >> 4) & 0x03;
+ 							set_pixel_bgra (rawptr, 4,
+-								info_ptr->palette[palette].blue,
+-								info_ptr->palette[palette].green,
+-								info_ptr->palette[palette].red,
++								png_palette[palette].blue,
++								png_palette[palette].green,
++								png_palette[palette].red,
+ 								0xFF); /* alpha */
+ 
+ 							palette = (pix >> 2) & 0x03;
+ 							set_pixel_bgra (rawptr, 8,
+-								info_ptr->palette[palette].blue,
+-								info_ptr->palette[palette].green,
+-								info_ptr->palette[palette].red,
++								png_palette[palette].blue,
++								png_palette[palette].green,
++								png_palette[palette].red,
+ 								0xFF); /* alpha */
+ 
+ 							palette = pix & 0x03;
+ 							set_pixel_bgra (rawptr, 12,
+-								info_ptr->palette[palette].blue,
+-								info_ptr->palette[palette].green,
+-								info_ptr->palette[palette].red,
++								png_palette[palette].blue,
++								png_palette[palette].green,
++								png_palette[palette].red,
+ 								0xFF); /* alpha */
+ 							rawptr += 16;
+ 						}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-9999.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.10.ebuild
index 61660dfc99ef..7f164e8f865b 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-9999.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-2.10.ebuild
@@ -1,25 +1,20 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-9999.ebuild,v 1.6 2010/11/07 22:06:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.10.ebuild,v 1.1 2011/02/27 12:46:28 pacho Exp $
 
 EAPI=2
 
-EGIT_REPO_URI="http://github.com/mono/${PN}.git"
-EGIT_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/git-src/${P}"
-
-inherit go-mono mono flag-o-matic git autotools
+inherit eutils go-mono mono flag-o-matic
 
 DESCRIPTION="Library for using System.Drawing with mono"
-HOMEPAGE="http://www.go-mono.com/"
-
-SRC_URI=""
+HOMEPAGE="http://www.mono-project.com"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cairo"
 
-RDEPEND=">=dev-libs/glib-2.16
+RDEPEND=">=dev-libs/glib-2.16:2
 		>=media-libs/freetype-2.3.7
 		>=media-libs/fontconfig-2.6
 		>=media-libs/libpng-1.4
@@ -36,9 +31,9 @@ DEPEND="${RDEPEND}"
 
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}/${PN}-2.10.1-libpng15.patch" )
+
 src_prepare() {
-	rm -rf cairo pixman
-	sed -i -e 's:pixman cairo::' Makefile.am || die
 	go-mono_src_prepare
 	sed -i -e 's:ungif:gif:g' configure || die
 }