diff options
| author | jmmv <jmmv@pkgsrc.org> | 2011-01-28 22:05:02 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2011-01-28 22:05:02 +0000 |
| commit | b53077c4ab2b8ebca1d318e47f59ff34c7488ef7 (patch) | |
| tree | d9a7c03137718cc01da79f55a33916dd4b95ebe5 | |
| parent | cc131200fd2b3a4aaf12d00013bfb13bea6da4ba (diff) | |
| download | pkgsrc-b53077c4ab2b8ebca1d318e47f59ff34c7488ef7.tar.gz | |
Fix build with png-1.5.
| -rw-r--r-- | wm/fvwm-devel/distinfo | 3 | ||||
| -rw-r--r-- | wm/fvwm-devel/patches/patch-ad | 26 |
2 files changed, 28 insertions, 1 deletions
diff --git a/wm/fvwm-devel/distinfo b/wm/fvwm-devel/distinfo index b550e7e2d07..36dd11096f3 100644 --- a/wm/fvwm-devel/distinfo +++ b/wm/fvwm-devel/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2010/05/28 09:33:12 martti Exp $ +$NetBSD: distinfo,v 1.21 2011/01/28 22:05:02 jmmv Exp $ SHA1 (fvwm-2.5.30.tar.bz2) = fcc082c8e13b262bb4f86f24ed8142a77c10b4f3 RMD160 (fvwm-2.5.30.tar.bz2) = 4959a3a5675fd48e622e24520a5d5158dc5ff9b0 @@ -6,3 +6,4 @@ Size (fvwm-2.5.30.tar.bz2) = 2568104 bytes SHA1 (patch-aa) = 6796b71fbc4c94e1d44938ab050b10b5f24a78a7 SHA1 (patch-ab) = ebc58a6c58e6c09ce0c270c0a1d8d861f2dcdab1 SHA1 (patch-ac) = 9741995ea491250406683c4b25d91c39ec3d9d58 +SHA1 (patch-ad) = c7bff2ba51be7e60ac2694e96684c34ce0ef4c4f diff --git a/wm/fvwm-devel/patches/patch-ad b/wm/fvwm-devel/patches/patch-ad new file mode 100644 index 00000000000..060c0b4f5b1 --- /dev/null +++ b/wm/fvwm-devel/patches/patch-ad @@ -0,0 +1,26 @@ +$NetBSD: patch-ad,v 1.1 2011/01/28 22:05:03 jmmv Exp $ + +Fix build with png-1.5. + +--- libs/PictureImageLoader.c.orig 2007-07-19 09:30:21.000000000 +0000 ++++ libs/PictureImageLoader.c +@@ -458,16 +458,16 @@ Bool PImageLoadPng(FIMAGE_CMD_ARGS) + { + Fpng_set_expand(Fpng_ptr); + } +- if (Finfo_ptr->color_type == FPNG_COLOR_TYPE_RGB_ALPHA) ++ if (png_get_color_type(Fpng_ptr, Finfo_ptr) == FPNG_COLOR_TYPE_RGB_ALPHA) + { + hasa = 1; + } +- if (Finfo_ptr->color_type == FPNG_COLOR_TYPE_GRAY_ALPHA) ++ if (png_get_color_type(Fpng_ptr, Finfo_ptr) == FPNG_COLOR_TYPE_GRAY_ALPHA) + { + hasa = 1; + hasg = 1; + } +- if (Finfo_ptr->color_type == FPNG_COLOR_TYPE_GRAY) ++ if (png_get_color_type(Fpng_ptr, Finfo_ptr) == FPNG_COLOR_TYPE_GRAY) + { + hasg = 1; + } |