diff options
author | wiz <wiz> | 2011-07-08 20:48:28 +0000 |
---|---|---|
committer | wiz <wiz> | 2011-07-08 20:48:28 +0000 |
commit | e5285fce6738186faac9f458deb802f6a9e8bace (patch) | |
tree | 730f8e43075605c835203adf79c9d63b84eac7a9 /wm | |
parent | 1c6e8aa98ad3631b13992ecd53bf6af9e8a3d01d (diff) | |
download | pkgsrc-e5285fce6738186faac9f458deb802f6a9e8bace.tar.gz |
Fix build with png-1.5.
Diffstat (limited to 'wm')
-rw-r--r-- | wm/metisse/distinfo | 3 | ||||
-rw-r--r-- | wm/metisse/patches/patch-fvwm-insitu_libs_PictureImageLoader.c | 26 |
2 files changed, 28 insertions, 1 deletions
diff --git a/wm/metisse/distinfo b/wm/metisse/distinfo index eb920a18054..afe14a23a45 100644 --- a/wm/metisse/distinfo +++ b/wm/metisse/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2010/12/27 14:28:38 obache Exp $ +$NetBSD: distinfo,v 1.9 2011/07/08 20:57:02 wiz Exp $ SHA1 (metisse-0.4.1.tar.bz2) = acf97b125905d91988955560a9b14b06a530eed6 RMD160 (metisse-0.4.1.tar.bz2) = 7487322f22a3655d756b5d3d3cc59afbf277d137 @@ -11,3 +11,4 @@ SHA1 (patch-ae) = 356b60c73fc85a87dbc6bf832035e29f0ccc614b SHA1 (patch-af) = 45cf852490bd30d17cac341916d83b0688f7bce0 SHA1 (patch-ag) = ec2cfd9c8602e440faba1a1722b6d1f05451a7fe SHA1 (patch-ah) = 6afe0c047a67f83149a4130b4eae55612e437ad0 +SHA1 (patch-fvwm-insitu_libs_PictureImageLoader.c) = a4d860ba441cab16aa3c9a49d20b7c9de3b030be diff --git a/wm/metisse/patches/patch-fvwm-insitu_libs_PictureImageLoader.c b/wm/metisse/patches/patch-fvwm-insitu_libs_PictureImageLoader.c new file mode 100644 index 00000000000..708ea7c6ced --- /dev/null +++ b/wm/metisse/patches/patch-fvwm-insitu_libs_PictureImageLoader.c @@ -0,0 +1,26 @@ +$NetBSD: patch-fvwm-insitu_libs_PictureImageLoader.c,v 1.1 2011/07/08 20:57:02 wiz Exp $ + +Fix build with png-1.5. + +--- fvwm-insitu/libs/PictureImageLoader.c.orig 2008-12-09 12:52:20.000000000 +0000 ++++ fvwm-insitu/libs/PictureImageLoader.c +@@ -165,16 +165,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; + } |