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

(Portage version: 2.1.10.11/cvs/Linux x86_64)

3 files changed, 75 insertions, 2 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/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.