diff options
| author | tnn <tnn@pkgsrc.org> | 2011-01-19 16:04:00 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2011-01-19 16:04:00 +0000 |
| commit | 80b26e9da674d4fbcc24046f3d97d8eda921a893 (patch) | |
| tree | 24e8841a2ca535d9b8ed86de8f4f0174f860835d /editors/xemacs | |
| parent | 2fe1f53291a0c17af29d901f038a01720dc4e217 (diff) | |
| download | pkgsrc-80b26e9da674d4fbcc24046f3d97d8eda921a893.tar.gz | |
png-1.5 build fix
Diffstat (limited to 'editors/xemacs')
| -rw-r--r-- | editors/xemacs/distinfo | 3 | ||||
| -rw-r--r-- | editors/xemacs/patches/patch-aj | 45 |
2 files changed, 47 insertions, 1 deletions
diff --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo index baa52f224e4..d519a4367ff 100644 --- a/editors/xemacs/distinfo +++ b/editors/xemacs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2010/12/16 17:45:12 hauke Exp $ +$NetBSD: distinfo,v 1.16 2011/01/19 16:04:00 tnn Exp $ SHA1 (xemacs/xemacs-21.4.22.tar.gz) = 24ed9b13d80c53c06bba60c7bb68387f692b7373 RMD160 (xemacs/xemacs-21.4.22.tar.gz) = f7d71d3607c3301760df8f7ae5a93d1d37df56ba @@ -12,5 +12,6 @@ SHA1 (patch-af) = 97cd3d340f349a645a7be9a683879528d9f4c5f2 SHA1 (patch-ag) = 0ccbead4be5da92e73a15432ff1b063da13cf0b4 SHA1 (patch-ah) = 9a02b989a6d45cdfead22ea703acceca722cf313 SHA1 (patch-ai) = ea752473a56d20907201763966ecdeaaeffac84a +SHA1 (patch-aj) = 8e8eaaa0eece7a5ee09a7645ae05db35efa081bb SHA1 (patch-ak) = bfbd285a1cc7d4e93a2fc884e03492dec9302e55 SHA1 (patch-al) = 247826009110453a868525e711e084b7dee49664 diff --git a/editors/xemacs/patches/patch-aj b/editors/xemacs/patches/patch-aj new file mode 100644 index 00000000000..bf834c8e5b8 --- /dev/null +++ b/editors/xemacs/patches/patch-aj @@ -0,0 +1,45 @@ +$NetBSD: patch-aj,v 1.3 2011/01/19 16:04:01 tnn Exp $ + +--- src/glyphs-eimage.c.orig 2007-08-20 19:52:28.000000000 +0000 ++++ src/glyphs-eimage.c +@@ -937,8 +937,8 @@ png_instantiate (Lisp_Object image_insta + { + int y; + unsigned char **row_pointers; +- 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); + + /* Wow, allocate all the memory. Truly, exciting. */ + unwind.eimage = xnew_array_and_zero (unsigned char, width * height * 3); +@@ -990,22 +990,22 @@ png_instantiate (Lisp_Object image_insta + /* 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); |