diff options
| author | wiz <wiz@pkgsrc.org> | 2010-06-13 22:43:46 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2010-06-13 22:43:46 +0000 |
| commit | 92e0cb52cb783546e352182244f761180817e141 (patch) | |
| tree | 4a9b97c2969a25f1eeb6596ee96fc25429cef7d5 /graphics/gimp | |
| parent | 01bd00f60b043c603cfe4fa796bf28af3a849cca (diff) | |
| download | pkgsrc-92e0cb52cb783546e352182244f761180817e141.tar.gz | |
Bump PKGREVISION for libpng shlib name change.
Also add some patches to remove use of deprecated symbols and fix other
problems when looking for or compiling against libpng-1.4.x.
Diffstat (limited to 'graphics/gimp')
| -rw-r--r-- | graphics/gimp/Makefile | 4 | ||||
| -rw-r--r-- | graphics/gimp/buildlink3.mk | 4 | ||||
| -rw-r--r-- | graphics/gimp/distinfo | 3 | ||||
| -rw-r--r-- | graphics/gimp/patches/patch-ad | 21 |
4 files changed, 27 insertions, 5 deletions
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index f5fb6189bd3..829c0f01ce6 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.190 2010/04/09 15:45:09 wiz Exp $ +# $NetBSD: Makefile,v 1.191 2010/06/13 22:44:32 wiz Exp $ DISTNAME= gimp-2.6.8 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/v2.6/ \ ${MASTER_SITE_GNU:=gimp/v2.6/} \ diff --git a/graphics/gimp/buildlink3.mk b/graphics/gimp/buildlink3.mk index d6bd8d80bce..adde132683f 100644 --- a/graphics/gimp/buildlink3.mk +++ b/graphics/gimp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.30 2010/01/18 09:59:00 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.31 2010/06/13 22:44:32 wiz Exp $ BUILDLINK_TREE+= gimp @@ -6,7 +6,7 @@ BUILDLINK_TREE+= gimp GIMP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gimp+= gimp>=2.4.0 -BUILDLINK_ABI_DEPENDS.gimp+= gimp>=2.6.8nb1 +BUILDLINK_ABI_DEPENDS.gimp+= gimp>=2.6.8nb3 BUILDLINK_PKGSRCDIR.gimp?= ../../graphics/gimp pkgbase := gimp diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo index ec3e2e79155..3e0e62da21e 100644 --- a/graphics/gimp/distinfo +++ b/graphics/gimp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.51 2009/12/16 19:16:49 drochner Exp $ +$NetBSD: distinfo,v 1.52 2010/06/13 22:44:32 wiz Exp $ SHA1 (gimp-2.6.8.tar.bz2) = a550943f086abc9bf6b96d576741337b7186a4f4 RMD160 (gimp-2.6.8.tar.bz2) = da02fedcc00ebaac04bfd21c153a7130d3ff5e08 @@ -6,3 +6,4 @@ Size (gimp-2.6.8.tar.bz2) = 16342377 bytes SHA1 (patch-aa) = 52d9b1995e47b3ae34510fef074c7000f2527adb SHA1 (patch-ab) = 4f5ba210bc69db55f79b67f0238aafc13992c050 SHA1 (patch-ac) = b1f4b802eebbb2d2145e0e282e65d48a0409a6b8 +SHA1 (patch-ad) = c17936829fb90c6cf726caf10ac8d42c146ef0a7 diff --git a/graphics/gimp/patches/patch-ad b/graphics/gimp/patches/patch-ad new file mode 100644 index 00000000000..31ba313b740 --- /dev/null +++ b/graphics/gimp/patches/patch-ad @@ -0,0 +1,21 @@ +$NetBSD: patch-ad,v 1.8 2010/06/13 22:44:32 wiz Exp $ + +--- plug-ins/file-ico/ico-load.c.orig 2009-07-20 20:20:51.000000000 +0000 ++++ plug-ins/file-ico/ico-load.c +@@ -287,14 +287,14 @@ ico_read_png (FILE *fp, + 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); |