Fix compilation with libpng 1.5, thanks to Samuli Suominen in bug 384461.

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

4 files changed, 82 insertions, 8 deletions

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index d52df3df28e7..f38ca8937ba5 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/xemacs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.148 2011/08/02 05:43:01 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.149 2011/09/26 18:28:02 graaff Exp $
+
+  26 Sep 2011; Hans de Graaff <graaff@gentoo.org> xemacs-21.4.22-r2.ebuild,
+  +files/xemacs-21.4.22-libpng15.patch:
+  Fix compilation with libpng 1.5, thanks to Samuli Suominen in bug 384461.
 
   02 Aug 2011; Matt Turner <mattst88@gentoo.org> xemacs-21.4.22-r1.ebuild,
   xemacs-21.4.22-r2.ebuild, xemacs-21.5.29-r2.ebuild, xemacs-21.5.30.ebuild,
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 9a954aafa86b..2e12acbdebe6 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX README.Gentoo 1426 RMD160 2aee174f6eaa410ac036ad316fb860be340b17a7 SHA1 0f10e8c6907e6f4c33e284ef37ffee9f6467c84c SHA256 9fa4fa31fc4deb0742dd220c8a1cf41af2bb4f4651e4f995589389afcc9f5f92
 AUX xemacs-21.4.19-db.patch 3157 RMD160 354d4b70dce5313ecd8732336b2562f66153c351 SHA1 f83a0870a07a10ec5f177c0e0292607463ff095a SHA256 c0c0cf18ccd01ee0e34e913c4f275977f4f61aa7343fef9fdff1f3ba84096022
@@ -7,6 +7,7 @@ AUX xemacs-21.4.19-texi.patch 1107 RMD160 2cedf0e0dfe50fdb2eb578fd7605629ea28a6f
 AUX xemacs-21.4.21-vcdiff.patch 476 RMD160 1298334c8d309f9054d98ec98bdda6dba494b653 SHA1 63bedf52451d64907f410b6a6534d82371a42e3e SHA256 adf0bb95ef289187027203f28fb0055be817c6b54211912bc33c16a9ff9cfb2c
 AUX xemacs-21.4.22-deprecated-ldap.patch 516 RMD160 35e7e3041b6ed89e98fb541a85f145ff753f3f9d SHA1 c3d948e1d26fc1514d8ed18d33c112597458ff3f SHA256 41100c6c9fc45d90aa4618e9e9897f229854fbea60ba34fb0e6b82e8e8a37a7b
 AUX xemacs-21.4.22-large-images.patch 4695 RMD160 f67bc1b0900bcefce0c31ce07ab298df84e00e91 SHA1 764f25a2e2938fd9ec6f88597e7ffdc3af41cd9c SHA256 bde9b13e2e57f25564d732213fa5cb5f2bef17ce8580f8d18e81975febade3f8
+AUX xemacs-21.4.22-libpng15.patch 2593 RMD160 28b3a4c033c3f9ccd60e97c9870b8acc55920bcc SHA1 d96a49744f6a7d2bdfa6b21bf590f2ecaa99a6be SHA256 d2e1b5a1410cd6394f055092db591caba3c615f6bb26d4c8f1ff6507b0d70a69
 AUX xemacs-21.5.29-large-images.patch 3738 RMD160 95c508a325510cf883190fb03af8c1b84f9da51e SHA1 ac4e62cf676db315beae79ed43274659013013dd SHA256 fa842acfb13ecf8c2ba214172b825760e98e024592f26f5df9e854b5e93a895f
 AUX xemacs-21.5.29-optimization-bug.patch 371 RMD160 77a86c16783b3e6e416fb1fd0f5fa799b088034d SHA1 5c52deccf1d692afc8becf6eb15a9e8906425f4c SHA256 14c5d9ddab865a9e4a1c6d4f64ed44e4b16e0eccb9fdcef94cedfaa30948863c
 AUX xemacs-21.5.29-vcdiff.patch 476 RMD160 1298334c8d309f9054d98ec98bdda6dba494b653 SHA1 63bedf52451d64907f410b6a6534d82371a42e3e SHA256 adf0bb95ef289187027203f28fb0055be817c6b54211912bc33c16a9ff9cfb2c
@@ -17,16 +18,16 @@ DIST xemacs-21.5.29.tar.gz 15453810 RMD160 96b951fd44915b3b73a9d69a7ab80c1237fde
 DIST xemacs-21.5.30.tar.gz 15500732 RMD160 0cca64db9f03c8f2052be743a5b0bb0531776430 SHA1 cdef683d52ea0abd9d71d06f3b30582bc1b51445 SHA256 cc9573faea6e8442965b47ab011e647f4e0313c985cf4f9b751c52ce4767cc97
 DIST xemacs-21.5.31.tar.gz 15802193 RMD160 ba3b82cf6876e14302c2635e2c0033633613541a SHA1 b12e024f82aa70e65b6b6eeb203f6cee80912f30 SHA256 d59f90b7e72621376a23daa484f1929945d0527350a10989fd086bde9d0a997d
 EBUILD xemacs-21.4.22-r1.ebuild 6585 RMD160 b8a446c2ca25dbc81f1d4603b36db9101a1148e4 SHA1 a210545e1eeb423738198201f60cc18f83ebc83d SHA256 7e54d7b14c399debbabdd857094cde56b3395f7c807eefdc4b1b2110e2bdea78
-EBUILD xemacs-21.4.22-r2.ebuild 6718 RMD160 45eb8f182b5292e3ce0e89d0fe6d2df6425ba1a8 SHA1 ebf8bc5030c1e9a2c443471ea8a3c581432c00c9 SHA256 5a0103fe1808ed6cbeab9fdd7e3c446ef81f50aaf48ecdfc461d30cce3d8c238
+EBUILD xemacs-21.4.22-r2.ebuild 6806 RMD160 8cde76b7152d9230e3b19046cd43a2b95ff81b2c SHA1 53356916faf371b8ed384d4df2f2ac6f05a3f8dd SHA256 c57d011b77ec69f07c3a0055eb3a1c075beea572a6635f47a58020e8085900b5
 EBUILD xemacs-21.5.29-r2.ebuild 7075 RMD160 07dddc9e10b3f07b1aa433e98ae0164914efb0f9 SHA1 b11e1d4cbc1c807d5fdf47a56cd2759dd953335f SHA256 77ede56e5b56eeced999ba5d62f5f60c7709cf55d3b1c5427e2735936e4322f9
 EBUILD xemacs-21.5.30.ebuild 6901 RMD160 da6c96e45195221a05ac54a75dfefd4f943cf036 SHA1 0bd73250dad141d7cc54ac48be9ca45a1c4a9cea SHA256 557f2fcfb1720ca1da0d57c9480313f6062590e339f4596e0b9efe6754a4e34b
 EBUILD xemacs-21.5.31.ebuild 6806 RMD160 1dcc83a8c5e1ff99e3ddb103daf318234973ab0b SHA1 9f0240a512ccc66d011f1e6d43659ca0b806d910 SHA256 a03ed69371291c131991fff9160ae754f895f7d45c322b3c0e5a1eb8d6fb6eb8
-MISC ChangeLog 25737 RMD160 22ec07ae3214c0ed0716af8a067db2851cdc35d4 SHA1 dcae5d222f0b619152dd6d52b7123bd71f321437 SHA256 8bf266abe522a4c04bd61f8a4e05cbc70f82f42b1ed74ede0176bd350aa45c64
+MISC ChangeLog 25928 RMD160 66ad1b82e6c95bb07043392f87248d753bb4192e SHA1 920945bf72253ad9d5d0ee5219c7b93e4afa9b6f SHA256 090cdfe03f557c4f984e8f19d09773aaa8774f612fa25301bc6f2c25b9022719
 MISC metadata.xml 711 RMD160 fc8a32ef389e34f90c14f2c26d75ac3cdc7e28a0 SHA1 b56f6ef2c44d658e3505f97c1686e52a40e4ee00 SHA256 abb7f5df5077d65ee8df0ed47e57faabe561de5bd09493912a3f06ef695f8f58
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk43jmoACgkQTVUdg23rv531eQCfVnLJ7nv33r3DvjgJpnU5PpiY
-OpUAn2N2XMi5nhg7HbKnArz6Eip1pDlT
-=HUo6
+iF4EAREIAAYFAk6AxEAACgkQiIP6VqMIqNfkwwD/fHCVP5Ku15UaJYl1PWC9WN/M
+TCX/wJrujd6ffjV+wA4A/jFzYoDsS2BhIl8U0deZ4PNuE0oXlfwp6qLCID56nPjN
+=jBAP
 -----END PGP SIGNATURE-----
diff --git a/app-editors/xemacs/files/xemacs-21.4.22-libpng15.patch b/app-editors/xemacs/files/xemacs-21.4.22-libpng15.patch
new file mode 100644
index 000000000000..0143e375d749
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.22-libpng15.patch
@@ -0,0 +1,66 @@
+diff -ur xemacs-21.4.22.orig/src/glyphs-eimage.c xemacs-21.4.22/src/glyphs-eimage.c
+--- xemacs-21.4.22.orig/src/glyphs-eimage.c	2011-09-26 19:44:57.889720996 +0300
++++ xemacs-21.4.22/src/glyphs-eimage.c	2011-09-26 19:48:07.026226254 +0300
+@@ -946,8 +946,8 @@
+     int y;
+     unsigned char **row_pointers;
+     UINT_64_BIT pixels_sq;
+-    height = info_ptr->height;
+-    width = info_ptr->width;
++    height = png_get_image_height(png_ptr, info_ptr);
++    width = png_get_image_width(png_ptr, info_ptr);
+     pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
+     if (pixels_sq > ((size_t) -1) / 3)
+       signal_image_error ("PNG image too large to instantiate", instantiator);
+@@ -1002,22 +1002,22 @@
+     /* Now that we're using EImage, ask for 8bit RGB triples for any type
+        of image*/
+     /* convert palette images to full RGB */
+-    if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
++    if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE)
+       png_set_expand (png_ptr);
+     /* send grayscale images to RGB too */
+-    if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
+-	info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
++    if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY ||
++	png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA)
+       png_set_gray_to_rgb (png_ptr);
+     /* we can't handle alpha values */
+-    if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
++    if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA)
+       png_set_strip_alpha (png_ptr);
+     /* tell libpng to strip 16 bit depth files down to 8 bits */
+-    if (info_ptr->bit_depth == 16)
++    if (png_get_bit_depth(png_ptr, info_ptr) == 16)
+       png_set_strip_16 (png_ptr);
+     /* if the image is < 8 bits, pad it out */
+-    if (info_ptr->bit_depth < 8)
++    if (png_get_bit_depth(png_ptr, info_ptr) < 8)
+       {
+-	if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
++	if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY)
+ 	  png_set_expand (png_ptr);
+ 	else
+ 	  png_set_packing (png_ptr);
+@@ -1036,16 +1036,18 @@
+      */
+     {
+       int i;
++      png_textp text;
++      int num_text;
+ 
+-      for (i = 0 ; i < info_ptr->num_text ; i++)
++      for (i = 0 ; i < num_text ; i++)
+ 	{
+ 	  /* How paranoid do I have to be about no trailing NULLs, and
+ 	     using (int)info_ptr->text[i].text_length, and strncpy and a temp
+ 	     string somewhere? */
+ 
+ 	  warn_when_safe (Qpng, Qinfo, "%s - %s",
+-			  info_ptr->text[i].key,
+-			  info_ptr->text[i].text);
++			  text[i].key,
++			  text[i].text);
+ 	}
+     }
+ #endif
diff --git a/app-editors/xemacs/xemacs-21.4.22-r2.ebuild b/app-editors/xemacs/xemacs-21.4.22-r2.ebuild
index afc677bf083b..9b762994077d 100644
--- a/app-editors/xemacs/xemacs-21.4.22-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.22-r2.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/app-editors/xemacs/xemacs-21.4.22-r2.ebuild,v 1.4 2011/08/02 05:43:01 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.22-r2.ebuild,v 1.5 2011/09/26 18:28:02 graaff Exp $
 
 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
@@ -73,6 +73,9 @@ src_unpack() {
 	# crashes.
 	epatch "${FILESDIR}"/${P}-deprecated-ldap.patch
 
+	# Fix compilation with libpng 1.5, bug 384461
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+
 	# Run autoconf. XEmacs tries to be smart by providing a stub
 	# configure.ac file for autoconf 2.59 but this throws our
 	# autotools eclass so it must be removed first.