Fix building with libpng14.

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

diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index 0524f4d9ccf38c8e7ab9f7d8c166dc2fb913ce2c..6f5c3bedb4245b374b1b5d1afb609e1b37a73089 100644 (file)
--- a/dev-dotnet/libgdiplus/ChangeLog
+++ b/dev-dotnet/libgdiplus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-dotnet/libgdiplus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.106 2010/02/20 10:33:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.107 2010/03/09 22:28:34 ssuominen Exp $
+
+  09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> libgdiplus-2.6.ebuild,
+  +files/libgdiplus-2.6-libpng14.patch:
+  Fix building with libpng14.
 
 *libgdiplus-2.6 (19 Feb 2010)
 

diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index 0c106f2c567d3e9521aa3fac7234cb8fe69893b8..0aec5efe1dd423b66e72d2c59f896df6143ea8a2 100644 (file)
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -2,6 +2,7 @@ AUX libgdiplus-1.1.13-libungif-configure-fix.diff 528 RMD160 456f3711ef77ebe406e
 AUX libgdiplus-1.2.4-cairo.patch 395 RMD160 145c58e3bbbd719011d62ea5df12b42b57fe52b4 SHA1 45733b28559a78b81dd6d5ff56b6e8f9cf9879e9 SHA256 2436ae7e5e6309f1a9de0c82edb3e782a8661b5a46453564231fa230f2bbb242
 AUX libgdiplus-1.2.5-imglibs.patch 5743 RMD160 0c42aaf53d7e46489cd203f3633a487bb8e1146f SHA1 29bebd9434a818abcefc64caa2cba69a5dff3b38 SHA256 3c54fdead42729e8c8b6f9103b413c51df4a29273aa5a7def505b4abc1613fed
 AUX libgdiplus-1.2.6-autotool-variables.patch 1025 RMD160 320f836ab095e8eb8c453fc568a141561746c81d SHA1 2bfba4793df7ba087a6b547275a5c8a816239d33 SHA256 c2d4123b50e514fbd4eaf2a2bf27646d92e7c5105156dffc8c2513b19d1998f5
+AUX libgdiplus-2.6-libpng14.patch 578 RMD160 2e5defa0a4951f22bb70fd8f11670879173cfd70 SHA1 79c42160a0f535cb9b6e98692c7c498526a0fd8b SHA256 01a07e28a23f88104c2033b3719ab9bf7eed9abc11b1f0189b131e87c0beded5
 DIST libgdiplus-1.2.4.tar.bz2 2848526 RMD160 90d17f78ba50256d71478c105bbba0a30b68ab3e SHA1 53498e13ba0756ff1cb8a0b6227044dbc6bb3603 SHA256 373af7c1cf80d765e25a843ee69fe50809defab25a3e3a6df8ef974a47cb1326
 DIST libgdiplus-1.2.6.tar.bz2 2897855 RMD160 9eeb1f3859017e1b73d7b49d96cb103413a806b6 SHA1 57321ab24b9fe1f821e39e3cffdf8c16a2e9677b SHA256 5eb1a7a8d3b75c751eac6075239469059238082aee1963bc6a172b3073046cfe
 DIST libgdiplus-2.0.tar.bz2 1971529 RMD160 5279db7cc3be45cb0a3a79bc10b48172a6549445 SHA1 3f4fc1cb2808932e946aa2bb049494fd87fdaa5d SHA256 0a308dc3a8d1a91f036502ed45b8debc3c6f838d86cf6e15430c6969ab4a33b1
@@ -13,7 +14,7 @@ EBUILD libgdiplus-2.0.9999.ebuild 1377 RMD160 efc285430c720f83ee3145e2f1b73def2d
 EBUILD libgdiplus-2.0.ebuild 1359 RMD160 1f71da0b2ca02c2e63a2627e5e9936b48b272fb0 SHA1 61a02d73f0d6798291517a08ab83485718095818 SHA256 39afcec679b68757a4a727a5ddc3afc4dc8a5e0600009d23df32d6878b51a63a
 EBUILD libgdiplus-2.4.2.ebuild 1090 RMD160 1a905455e2869721bdab75a660c71f4d908f3c4c SHA1 ab9dcbd812f2d56f8c2ece6378e76d04c426b777 SHA256 1ab48fae45b85766387b30455b1cdbd7072689691da21e0e69cef49a3b4155a6
 EBUILD libgdiplus-2.4.9999.ebuild 1276 RMD160 c00cfb9eb338ff100342c38152a212b07645b4b8 SHA1 f1209d0f257d3c67e0fa9550c2d52df0a973651b SHA256 450ecc43bd403f5562e8354a70da6db96fb289ad8f1a412792982bdf6d600c44
-EBUILD libgdiplus-2.6.ebuild 1093 RMD160 17710f19e308e7391324af5426a470d257794396 SHA1 afcf1fec05ee0d167beaac814b766aa75b50c1e5 SHA256 4d1a8f06e0470f6241b9dace836122c6f7e3452391b73c1b2218c9f34eeaecc2
+EBUILD libgdiplus-2.6.ebuild 1244 RMD160 3dbd1e6e677153a43910aed32032d9f4dabdaece SHA1 528870ec2d9f67cc530f4ad9a5add2bb199363e1 SHA256 3261e2a6b82b421b5be845c154789263a9bffc3fe06004f702db75c0c257bc9a
 EBUILD libgdiplus-9999.ebuild 1224 RMD160 32a355c9bc1aeae1156a2fd111b3ee29c0c18ce2 SHA1 f91714e0e9846ff2fa240ac11aa7ca8772595d0d SHA256 055540bc629ad0e990c66ca44371ca69256b605d4827f782be6a89a1c0edf1b1
-MISC ChangeLog 17319 RMD160 d7e92c10c9772a7e2c01f3563278951095da6776 SHA1 066f4fe51d11decbae25cea2b5f63fa37f7e3ebe SHA256 825356197ce96864e99ad319fb237cde4c6be1127db8fbdb557349678fcd7a75
+MISC ChangeLog 17469 RMD160 e89b6e23d336aeeb9520112c32856b66c64279d9 SHA1 113fcedba406e5723e526d55f04a617d150a82a9 SHA256 48a9bbd6637a38d8c419a578874100f0af93cef04630d5c586392b444803459c
 MISC metadata.xml 246 RMD160 c049a364d331203a1fbf6d9796e74abe79307a26 SHA1 4d2431d4bf0e6eb30006d5033ab6ab75aa0d55bd SHA256 8dcd2a872f353f47b9647d9dbff0ea4ead52425af362279057e94b89e0b7fc81

diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-2.6-libpng14.patch b/dev-dotnet/libgdiplus/files/libgdiplus-2.6-libpng14.patch
new file mode 100644 (file)
index 0000000..518c335
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/libgdiplus-2.6-libpng14.patch
@@ -0,0 +1,22 @@
+http://repos.archlinux.org/wsvn/packages/libgdiplus/trunk/gdiplus-png14.patch
+
+--- src/pngcodec.c
++++ src/pngcodec.c
+@@ -352,7 +352,7 @@
+                                               info_ptr->palette[i].blue,
+                                               info_ptr->palette[i].green,
+                                               info_ptr->palette[i].red,
+-                                              info_ptr->trans[i]); /* alpha */
++                                              info_ptr->trans_alpha[i]); /* alpha */
+                       }
+               }
+ 
+@@ -418,7 +418,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)) {

diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.6.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.6.ebuild
index 5a931af8a15743f538e247d67c9b43b66a29228f..447cdca0ce44faf6fb94caa39fb2a3ad3ee7085b 100644 (file)
--- a/dev-dotnet/libgdiplus/libgdiplus-2.6.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-2.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.6.ebuild,v 1.1 2010/02/20 10:33:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.6.ebuild,v 1.2 2010/03/09 22:28:34 ssuominen Exp $
 
 EAPI=2
 
-inherit go-mono mono flag-o-matic
+inherit eutils go-mono mono flag-o-matic
 
 DESCRIPTION="Library for using System.Drawing with mono"
 HOMEPAGE="http://www.go-mono.com/"
@@ -34,6 +34,10 @@ RESTRICT="test"
 src_prepare() {
        go-mono_src_prepare
        sed -i -e 's:ungif:gif:g' configure || die
+
+       # info_ptr->trans_alpha might be no-go with libpng12
+       has_version ">=media-libs/libpng-1.4" && epatch \
+               "${FILESDIR}"/${P}-libpng14.patch
 }
 
 src_configure() {