Fix building with libpng14.

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

4 files changed, 25 insertions, 14 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index bb1132846585..2064c58a49e6 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.227 2010/02/11 10:22:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.228 2010/03/08 12:00:22 ssuominen Exp $
+
+  08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  openmotif-2.3.2-r2.ebuild, +files/openmotif-2.3.2-libpng14.patch:
+  Fix building with libpng14.
 
 *openmotif-2.3.2-r2 (11 Feb 2010)
 
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 7419f80406f9..9ee6f16f4aa0 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,23 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Mwm.defaults 536 RMD160 99fc40c2e923b53a14b2911c37064f2c9cd3f63b SHA1 ddbe7ab7af3a8caf6ccb9d6ab2c721ce5940edd1 SHA256 5373d8c7bd5460ce83bda99f08725fe9154cd4b5ca2b0698e5a0fda10e50f250
 AUX openmotif-2.3.1-ac-editres.patch 358 RMD160 2bace990711052d7d26a405aa63d6696a33ca50c SHA1 a83e8567f5bc9998f9cbdfbfafce007ac44009a8 SHA256 6ef38a5a3532e3a8d6be85549026410340da0d98aa97dd683aeb70eb5b9c5d52
 AUX openmotif-2.3.1-multilist-stipple.patch 819 RMD160 756e0a20223b157f127197c74c5d71087a06c51f SHA1 c81c77fa9c47f463a851f3591ba9f370c4c7a347 SHA256 2ccc3b9292eb8a2f6eab49198ea54f51bc243d14b64b4bd07aea6712526dd828
 AUX openmotif-2.3.2-ddd-layout.patch 274 RMD160 a99f67abb3722b993cc0ef5277dc5f39aacc7bed SHA1 58f93f5b8b376de628f6d406af9a94662b489000 SHA256 f3de455ff830de4cb08a5cc8ee0bba10bb730bbc8ab448749ce99b98329e13e0
 AUX openmotif-2.3.2-ldflags.patch 654 RMD160 8756d40e95f64a851838042f9cf2152a1b6e9f61 SHA1 f0f9958a259487b0ef6c9d0d9daf8ab2415faa1d SHA256 70236c905c93a50354d990fdb500ba32b94bb28b90ccf8b4ca5052d4ac23ca80
+AUX openmotif-2.3.2-libpng14.patch 339 RMD160 0c4b88048ef382c9690c467263e51b845b7240ae SHA1 1ff64ff0bf948d7a96751114c8d374b689b3cbe0 SHA256 54dde5fa69a3a1fc99455b57317c7c004dad050071d6b41e356e184e72dedf32
 AUX openmotif-2.3.2-sanitise-paths.patch 734 RMD160 de091a0b8d232fc4507c9fc3b3805dd386a9a4c0 SHA1 49e5be643bbd5ee180525ef76458986d555bb038 SHA256 dfdbe238d4009588ee8d3a0a1f8eacf1fffabff746504393a3da87a643c7c086
 AUX openmotif-2.3.2-solaris-2.11.patch 409 RMD160 78e04d1ea6985b663423058754b6d05fdacdf88d SHA1 dc19563eada1094f921d69d0415cdf643697e0a5 SHA256 cfd6f6dde2edd3907b3dc712d2df2096478b20ca4d4dc523b45058c50656a0b7
 DIST openmotif-2.3.0-manual.pdf.tgz 4195259 RMD160 45b1a17a653b01ccf0324e0bc70fd1ef5db5a395 SHA1 1d0f55928ad65ee321564ba962b1608cfd83bb96 SHA256 49692fd4d5441d2dbb5ca36199b209c8503452fda9b36e929d1aa3673bffaecb
 DIST openmotif-2.3.2.tar.gz 5941784 RMD160 2346a93fcec57b9c18b6657d1cc681b6001cba28 SHA1 c98ac1bf3640ce57da34a0704bdeb2b12011ae1f SHA256 f786f3724d33133e8c4b3c9b368c89d680e981ca1c0e8c3280f496976b390c7d
-EBUILD openmotif-2.3.2-r2.ebuild 5191 RMD160 75fefb71569b1f33b0af368217e82662d4cdef45 SHA1 34aaf26d5050d61098e301ae3f279ab14cdec76a SHA256 0fa408f39680f2802e2ac31acbd4dfd47425a02d09284f838727d22dfec7c3bb
+EBUILD openmotif-2.3.2-r2.ebuild 5285 RMD160 9160d3a23d3ad984f92253d3f19ff3bb0bf13938 SHA1 aa8af20b6b2f76a85804ce1976aee3a3a91a2a64 SHA256 dcddb61a957c324278b40a6543d02be10f9278d213a6861e553ebb37012698e6
 EBUILD openmotif-2.3.2.ebuild 4084 RMD160 7bb056c12a1856bd954b1bc614c812745dd8e4d9 SHA1 c4f85b4050c4bfea88ba4c0f5df156cb94848ad2 SHA256 f6aa28e3b4bb6104ad52d0d487b0083c96f1a871c3603c125b31d1a0f5562f0e
-MISC ChangeLog 34483 RMD160 a1b20513accb663a1436e21c0e94afead772cd6f SHA1 84cfeb411647cf86178007282f3c8217b1e5cdbc SHA256 14cb672f9fcfcafced7e6e0c3d34931395175ac542884d5e486f5fd7c9578ffa
+MISC ChangeLog 34642 RMD160 738bc387824f40e861d2e0c2a9c9d61f2b7605c4 SHA1 6f6081a499fcb05f6ef79428605f399d9fe88a8e SHA256 4e717ac9a184cb1e853567da2b4c25378025bc0f2058732be7651dd050bce710
 MISC metadata.xml 219 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 SHA1 02c240887d922c73610257891793b3bdec27fc8e SHA256 c1572876b54cc63c7b7ecad4c9adf1b6460d166c41e84b1df0322c5df6497ffb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkt0fvMACgkQOeoy/oIi7uyLCwCg2+/LUPTzJbj6ArgLP3PCP5IL
-zz4AoLh1QujvvohxZOmHNXfvsv6GCBE1
-=nNcY
------END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/files/openmotif-2.3.2-libpng14.patch b/x11-libs/openmotif/files/openmotif-2.3.2-libpng14.patch
new file mode 100644
index 000000000000..5b817719c7dc
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.3.2-libpng14.patch
@@ -0,0 +1,13 @@
+http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg207680.html
+
+--- lib/Xm/Png.c
++++ lib/Xm/Png.c
+@@ -144,7 +144,7 @@
+     png_bytepp row_pointers = NULL;
+ 
+     fread(sig, 1, 8, infile);
+-    if (!png_check_sig(sig, 8))
++    if (png_sig_cmp(sig, 0, 8))
+         return 1;               /* bad signature */
+ 
+     png_ptr =
diff --git a/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild b/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
index a450fe66210c..a0355556a25c 100644
--- a/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.2-r2.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/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild,v 1.2 2010/02/11 22:04:07 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild,v 1.3 2010/03/08 12:00:22 ssuominen Exp $
 
 EAPI=3
 
@@ -95,6 +95,9 @@ src_prepare() {
 	# add X.Org vendor string to aliases for virtual bindings
 	echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
 
+	has_version ">=media-libs/libpng-1.4" && epatch \
+		"${FILESDIR}"/${P}-libpng14.patch
+
 	AT_M4DIR=. eautoreconf
 }