From 7b1fe863daa82f4dd7301dacd053fec208e8626f Mon Sep 17 00:00:00 2001 From: Dirk Meyer Date: Mon, 29 Mar 2010 03:51:49 +0000 Subject: - fix build for png-1.4.1 --- graphics/gimp-app/Makefile | 2 +- .../gimp-app/files/patch-plug-ins_file-ico_ico-load.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 graphics/gimp-app/files/patch-plug-ins_file-ico_ico-load.c diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 41b76c785c86..2fbe4e39fd1d 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -191,7 +191,7 @@ post-patch: s|%%GIMP_THUMB_LIBS%%|${GIMP_THUMB_LIBS}|; \ s|%%GIMP_UI_LIBS%%|${GIMP_UI_LIBS}|' \ ${WRKSRC}/plug-ins/pygimp/Makefile.in - @${REINPLACE_CMD} -e 's|"libpng"|"libpng12"|' \ + @${REINPLACE_CMD} -e 's|"libpng"|"libpng14"|' \ -e 's|x86_64|amd64|g' \ ${WRKSRC}/configure diff --git a/graphics/gimp-app/files/patch-plug-ins_file-ico_ico-load.c b/graphics/gimp-app/files/patch-plug-ins_file-ico_ico-load.c new file mode 100644 index 000000000000..0ef633e4f38f --- /dev/null +++ b/graphics/gimp-app/files/patch-plug-ins_file-ico_ico-load.c @@ -0,0 +1,19 @@ +--- plug-ins/file-ico/ico-load.c.orig 2010-03-28 14:29:48.000000000 +0200 ++++ plug-ins/file-ico/ico-load.c 2010-03-28 14:31:00.000000000 +0200 +@@ -287,14 +287,14 @@ + switch (color_type) + { + case PNG_COLOR_TYPE_GRAY: +- png_set_gray_1_2_4_to_8 (png_ptr); ++ png_set_expand_gray_1_2_4_to_8 (png_ptr); + if ( bit_depth == 16 ) + png_set_strip_16 (png_ptr); + png_set_gray_to_rgb (png_ptr); + png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER); + break; + case PNG_COLOR_TYPE_GRAY_ALPHA: +- png_set_gray_1_2_4_to_8 (png_ptr); ++ png_set_expand_gray_1_2_4_to_8 (png_ptr); + if ( bit_depth == 16 ) + png_set_strip_16 (png_ptr); + png_set_gray_to_rgb (png_ptr); -- cgit v1.2.3