main/gimp: libpng 1.5 compatibility fixes

2 files changed, 395 insertions, 4 deletions

diff --git a/main/gimp/APKBUILD b/main/gimp/APKBUILD
index 32a2b2b979..8aa6b05885 100644
--- a/main/gimp/APKBUILD
+++ b/main/gimp/APKBUILD
@@ -11,14 +11,25 @@ makedepends="gtk+-dev libxpm-dev libxmu-dev librsvg-dev dbus-glib-dev
 	jpeg-dev libpng-dev curl-dev"
 install=
 subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://ftp.$pkgname.org/pub/$pkgname/v2.6/$pkgname-$pkgver.tar.bz2"
+source="ftp://ftp.$pkgname.org/pub/$pkgname/v2.6/$pkgname-$pkgver.tar.bz2
+	gimp-libpng1.5-compat.patch"
 
+_builddir="${srcdir}/${pkgname}-${pkgver}"
 prepare() { 
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
+
+	for i in $source; do
+		case $i in
+		*.patch)
+			msg "Applying $i..."
+			patch -s -p1 -N -i "$srcdir"/$i || return 1
+			;;
+		esac
+	done
 }
 
 build() { 
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--enable-mp \
@@ -34,8 +45,9 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	ln -s gimptool-2.0 "$pkgdir/usr/bin/gimptool" || return 1
 }
+
 md5sums="bb2939fe13e54fc7255cef5d097bb5dd  gimp-2.6.11.tar.bz2"
diff --git a/main/gimp/gimp-libpng1.5-compat.patch b/main/gimp/gimp-libpng1.5-compat.patch
new file mode 100644
index 0000000000..e3429e314c
--- /dev/null
+++ b/main/gimp/gimp-libpng1.5-compat.patch
@@ -0,0 +1,379 @@
+From 2a53e15a7a373c13dec4333c5dd8d2cfde9ebd40 Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <wiz@danbala.tuwien.ac.at>
+Date: Mon, 24 Jan 2011 18:06:50 +0100
+Subject: [PATCH] Bug 640409 - png-1.5 compatibility fixes
+
+---
+ plug-ins/common/file-png.c |  138 +++++++++++++++++++++++++++-----------------
+ 1 files changed, 84 insertions(+), 54 deletions(-)
+
+diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c
+index be3b4c6..2ccd0e5 100644
+--- a/plug-ins/common/file-png.c
++++ b/plug-ins/common/file-png.c
+@@ -652,7 +652,11 @@ on_read_error (png_structp png_ptr, png_const_charp error_msg)
+                                 error_data->drawable->width, num);
+     }
+ 
++#if (PNG_LIBPNG_VER < 10500)
+   longjmp (png_ptr->jmpbuf, 1);
++#else
++  png_longjmp (png_ptr, 1);
++#endif
+ }
+ 
+ /*
+@@ -696,7 +700,7 @@ load_image (const gchar  *filename,
+   pp = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+   info = png_create_info_struct (pp);
+ 
+-  if (setjmp (pp->jmpbuf))
++  if (setjmp (png_jmpbuf(pp)))
+     {
+       g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                    _("Error while reading '%s'. File corrupted?"),
+@@ -737,17 +741,19 @@ load_image (const gchar  *filename,
+    * Latest attempt, this should be my best yet :)
+    */
+ 
+-  if (info->bit_depth == 16)
++  if (png_get_bit_depth(pp, info) == 16)
+     {
+       png_set_strip_16 (pp);
+     }
+ 
+-  if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8)
++  if (png_get_color_type(pp, info) == PNG_COLOR_TYPE_GRAY &&
++      png_get_bit_depth(pp, info) < 8)
+     {
+       png_set_expand (pp);
+     }
+ 
+-  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8)
++  if (png_get_color_type(pp, info) == PNG_COLOR_TYPE_PALETTE &&
++      png_get_bit_depth(pp, info) < 8)
+     {
+       png_set_packing (pp);
+     }
+@@ -756,8 +762,8 @@ load_image (const gchar  *filename,
+    * Expand G+tRNS to GA, RGB+tRNS to RGBA
+    */
+ 
+-  if (info->color_type != PNG_COLOR_TYPE_PALETTE &&
+-      (info->valid & PNG_INFO_tRNS))
++  if (png_get_color_type(pp, info) != PNG_COLOR_TYPE_PALETTE &&
++      png_get_valid(pp, info, PNG_INFO_tRNS) != 0)
+     {
+       png_set_expand (pp);
+     }
+@@ -774,7 +780,7 @@ load_image (const gchar  *filename,
+    */
+ 
+   if (png_get_valid (pp, info, PNG_INFO_tRNS) &&
+-      info->color_type == PNG_COLOR_TYPE_PALETTE)
++      png_get_color_type(pp, info) == PNG_COLOR_TYPE_PALETTE)
+     {
+       png_get_tRNS (pp, info, &alpha_ptr, &num, NULL);
+       /* Copy the existing alpha values from the tRNS chunk */
+@@ -796,7 +802,7 @@ load_image (const gchar  *filename,
+ 
+   png_read_update_info (pp, info);
+ 
+-  switch (info->color_type)
++  switch (png_get_color_type(pp, info))
+     {
+     case PNG_COLOR_TYPE_RGB:           /* RGB */
+       bpp = 3;
+@@ -835,7 +841,9 @@ load_image (const gchar  *filename,
+       return -1;
+     }
+ 
+-  image = gimp_image_new (info->width, info->height, image_type);
++  image = gimp_image_new (png_get_image_width(pp, info),
++                          png_get_image_height(pp, info),
++                          image_type);
+   if (image == -1)
+     {
+       g_set_error (error, 0, 0,
+@@ -848,7 +856,9 @@ load_image (const gchar  *filename,
+    * Create the "background" layer to hold the image...
+    */
+ 
+-  layer = gimp_layer_new (image, _("Background"), info->width, info->height,
++  layer = gimp_layer_new (image, _("Background"),
++                          png_get_image_width(pp, info),
++                          png_get_image_height(pp, info),
+                           layer_type, 100, GIMP_NORMAL_MODE);
+   gimp_image_insert_layer (image, layer, -1, 0);
+ 
+@@ -882,7 +892,8 @@ load_image (const gchar  *filename,
+ 
+       gimp_layer_set_offsets (layer, offset_x, offset_y);
+ 
+-      if ((abs (offset_x) > info->width) || (abs (offset_y) > info->height))
++      if ((abs (offset_x) > png_get_image_width(pp, info)) ||
++          (abs (offset_y) > png_get_image_height(pp, info)))
+         {
+           if (interactive)
+             g_message (_("The PNG file specifies an offset that caused "
+@@ -937,23 +948,27 @@ load_image (const gchar  *filename,
+ 
+   empty = 0; /* by default assume no full transparent palette entries */
+ 
+-  if (info->color_type & PNG_COLOR_MASK_PALETTE)
++  if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE)
+     {
++      png_colorp palette;
++      int num_palette;
++      png_get_PLTE(pp, info, &palette, &num_palette);
++
+       if (png_get_valid (pp, info, PNG_INFO_tRNS))
+         {
+           for (empty = 0; empty < 256 && alpha[empty] == 0; ++empty)
+             /* Calculates number of fully transparent "empty" entries */;
+ 
+           /*  keep at least one entry  */
+-          empty = MIN (empty, info->num_palette - 1);
++          empty = MIN (empty, num_palette - 1);
+ 
+-          gimp_image_set_colormap (image, (guchar *) (info->palette + empty),
+-                                   info->num_palette - empty);
++          gimp_image_set_colormap (image, (guchar *) (palette + empty),
++                                   num_palette - empty);
+         }
+       else
+         {
+-          gimp_image_set_colormap (image, (guchar *) info->palette,
+-                                   info->num_palette);
++          gimp_image_set_colormap (image, (guchar *) palette,
++                                   num_palette);
+         }
+     }
+ 
+@@ -971,18 +986,20 @@ load_image (const gchar  *filename,
+    */
+ 
+   tile_height = gimp_tile_height ();
+-  pixel = g_new0 (guchar, tile_height * info->width * bpp);
++  pixel = g_new0 (guchar, tile_height * png_get_image_width(pp, info) * bpp);
+   pixels = g_new (guchar *, tile_height);
+ 
+   for (i = 0; i < tile_height; i++)
+-    pixels[i] = pixel + info->width * info->channels * i;
++    pixels[i] = pixel + (png_get_image_width(pp, info) *
++                         png_get_channels(pp, info) *
++                         i);
+ 
+   /* Install our own error handler to handle incomplete PNG files better */
+   error_data.drawable    = drawable;
+   error_data.pixel       = pixel;
+   error_data.tile_height = tile_height;
+-  error_data.width       = info->width;
+-  error_data.height      = info->height;
++  error_data.width       = png_get_image_width(pp, info);
++  error_data.height      = png_get_image_height(pp, info);
+   error_data.bpp         = bpp;
+   error_data.pixel_rgn   = &pixel_rgn;
+ 
+@@ -995,10 +1012,11 @@ load_image (const gchar  *filename,
+        */
+ 
+       for (begin = 0, end = tile_height;
+-           begin < info->height; begin += tile_height, end += tile_height)
++           begin < png_get_image_height(pp, info);
++           begin += tile_height, end += tile_height)
+         {
+-          if (end > info->height)
+-            end = info->height;
++          if (end > png_get_image_height(pp, info))
++            end = png_get_image_height(pp, info);
+ 
+           num = end - begin;
+ 
+@@ -1015,10 +1033,11 @@ load_image (const gchar  *filename,
+           gimp_pixel_rgn_set_rect (&pixel_rgn, pixel, 0, begin,
+                                    drawable->width, num);
+ 
+-          memset (pixel, 0, tile_height * info->width * bpp);
++          memset (pixel, 0, tile_height * png_get_image_width(pp, info) * bpp);
+ 
+           gimp_progress_update (((gdouble) pass +
+-                                 (gdouble) end / (gdouble) info->height) /
++                                 (gdouble) end /
++                                 (gdouble) png_get_image_height(pp, info)) /
+                                 (gdouble) num_passes);
+         }
+     }
+@@ -1071,7 +1090,8 @@ load_image (const gchar  *filename,
+ 
+   {
+     png_uint_32 proflen;
+-    png_charp   profname, profile;
++    png_charp   profname;
++    png_bytep   profile;
+     int         profcomp;
+ 
+     if (png_get_iCCP (pp, info, &profname, &profcomp, &profile, &proflen))
+@@ -1199,6 +1219,8 @@ save_image (const gchar  *filename,
+   guchar red, green, blue;      /* Used for palette background */
+   time_t cutime;                /* Time since epoch */
+   struct tm *gmt;               /* GMT broken down */
++  int color_type;               /* type of colors in image */
++  int bit_depth;                /* width of colors in bit */
+ 
+   guchar remap[256];            /* Re-mapping for the palette */
+ 
+@@ -1207,7 +1229,9 @@ save_image (const gchar  *filename,
+   if (pngvals.comment)
+     {
+       GimpParasite *parasite;
++#ifndef PNG_iTXt_SUPPORTED
+       gsize text_length = 0;
++#endif
+ 
+       parasite = gimp_image_parasite_find (orig_image_ID, "gimp-comment");
+       if (parasite)
+@@ -1248,7 +1272,7 @@ save_image (const gchar  *filename,
+   pp = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+   info = png_create_info_struct (pp);
+ 
+-  if (setjmp (pp->jmpbuf))
++  if (setjmp (png_jmpbuf(pp)))
+     {
+       g_set_error (error, 0, 0,
+                    _("Error while saving '%s'. Could not save image."),
+@@ -1290,11 +1314,6 @@ save_image (const gchar  *filename,
+ 
+   png_set_compression_level (pp, pngvals.compression_level);
+ 
+-  info->width          = drawable->width;
+-  info->height         = drawable->height;
+-  info->bit_depth      = 8;
+-  info->interlace_type = pngvals.interlaced;
+-
+   /*
+    * Initialise remap[]
+    */
+@@ -1308,37 +1327,36 @@ save_image (const gchar  *filename,
+   switch (type)
+     {
+     case GIMP_RGB_IMAGE:
+-      info->color_type = PNG_COLOR_TYPE_RGB;
++      color_type = PNG_COLOR_TYPE_RGB;
+       bpp = 3;
+       break;
+ 
+     case GIMP_RGBA_IMAGE:
+-      info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
++      color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+       bpp = 4;
+       break;
+ 
+     case GIMP_GRAY_IMAGE:
+-      info->color_type = PNG_COLOR_TYPE_GRAY;
++      color_type = PNG_COLOR_TYPE_GRAY;
+       bpp = 1;
+       break;
+ 
+     case GIMP_GRAYA_IMAGE:
+-      info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
++      color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
+       bpp = 2;
+       break;
+ 
+     case GIMP_INDEXED_IMAGE:
+       bpp = 1;
+-      info->color_type = PNG_COLOR_TYPE_PALETTE;
+-      info->valid |= PNG_INFO_PLTE;
+-      info->palette =
+-        (png_colorp) gimp_image_get_colormap (image_ID, &num_colors);
+-      info->num_palette = num_colors;
++      color_type = PNG_COLOR_TYPE_PALETTE;
++      png_set_PLTE(pp, info,
++                   (png_colorp) gimp_image_get_colormap (image_ID, &num_colors),
++                   num_colors);
+       break;
+ 
+     case GIMP_INDEXEDA_IMAGE:
+       bpp = 2;
+-      info->color_type = PNG_COLOR_TYPE_PALETTE;
++      color_type = PNG_COLOR_TYPE_PALETTE;
+       /* fix up transparency */
+       respin_cmap (pp, info, remap, image_ID, drawable);
+       break;
+@@ -1352,17 +1370,28 @@ save_image (const gchar  *filename,
+    * Fix bit depths for (possibly) smaller colormap images
+    */
+ 
+-  if (info->valid & PNG_INFO_PLTE)
++  bit_depth = 8;
++
++  if (png_get_valid(pp, info, PNG_INFO_PLTE))
+     {
+-      if (info->num_palette <= 2)
+-        info->bit_depth = 1;
+-      else if (info->num_palette <= 4)
+-        info->bit_depth = 2;
+-      else if (info->num_palette <= 16)
+-        info->bit_depth = 4;
++      png_colorp palette;
++      int num_palette;
++      png_get_PLTE(pp, info, &palette, &num_palette);
++      
++      if (num_palette <= 2)
++        bit_depth = 1;
++      else if (num_palette <= 4)
++        bit_depth = 2;
++      else if (num_palette <= 16)
++        bit_depth = 4;
+       /* otherwise the default is fine */
+     }
+ 
++  png_set_IHDR(pp, info,
++               drawable->width, drawable->height, bit_depth, color_type,
++               pngvals.interlaced ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE,
++               PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
++
+   /* All this stuff is optional extras, if the user is aiming for smallest
+      possible file size she can turn them all off */
+ 
+@@ -1476,7 +1505,8 @@ save_image (const gchar  *filename,
+    * Convert unpacked pixels to packed if necessary
+    */
+ 
+-  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8)
++  if (png_get_color_type(pp, info) ==
++      PNG_COLOR_TYPE_PALETTE && png_get_bit_depth(pp, info) < 8)
+     png_set_packing (pp);
+ 
+   /*
+@@ -1528,7 +1558,7 @@ save_image (const gchar  *filename,
+ 
+           /* If we're dealing with a paletted image with
+            * transparency set, write out the remapped palette */
+-          if (info->valid & PNG_INFO_tRNS)
++          if (png_get_valid(pp, info, PNG_INFO_tRNS))
+             {
+               guchar inverse_remap[256];
+ 
+@@ -1548,7 +1578,7 @@ save_image (const gchar  *filename,
+             }
+           /* Otherwise if we have a paletted image and transparency
+            * couldn't be set, we ignore the alpha channel */
+-          else if (info->valid & PNG_INFO_PLTE && bpp == 2)
++          else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2)
+             {
+               for (i = 0; i < num; ++i)
+                 {
+@@ -1563,7 +1593,7 @@ save_image (const gchar  *filename,
+           png_write_rows (pp, pixels, num);
+ 
+           gimp_progress_update (((double) pass + (double) end /
+-                                 (double) info->height) /
++                                 (double) png_get_image_height(pp, info)) /
+                                 (double) num_passes);
+         }
+     }
+-- 
+1.7.3.4
+