diff options
| -rw-r--r-- | graphics/flphoto/distinfo | 3 | ||||
| -rw-r--r-- | graphics/flphoto/patches/patch-image.cxx | 14 | ||||
| -rw-r--r-- | wm/metisse/distinfo | 3 | ||||
| -rw-r--r-- | wm/metisse/patches/patch-fvwm-insitu_libs_PictureImageLoader.c | 26 |
4 files changed, 44 insertions, 2 deletions
diff --git a/graphics/flphoto/distinfo b/graphics/flphoto/distinfo index a1e433a6ba4..2843f772898 100644 --- a/graphics/flphoto/distinfo +++ b/graphics/flphoto/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2008/09/19 15:31:29 joerg Exp $ +$NetBSD: distinfo,v 1.7 2011/07/08 20:48:28 wiz Exp $ SHA1 (flphoto-1.2-source.tar.bz2) = 634cdbf80690b96009fb1c2952f0dff3733710ba RMD160 (flphoto-1.2-source.tar.bz2) = 1a9d574182a1f21f44493fa5e6f39d58c0d6c2a1 @@ -6,3 +6,4 @@ Size (flphoto-1.2-source.tar.bz2) = 501459 bytes SHA1 (patch-aa) = 0a47885db0284d770c10db8d1dcc3c315df85dbc SHA1 (patch-ab) = f4d9616afa1e83e6e43cf84f1dfdf670a5ab7dd3 SHA1 (patch-ac) = b80af462911c719a9bfea7ad778e77ac5e760da9 +SHA1 (patch-image.cxx) = a8bea3d8ccfd9ad62e3a36320b02a8736bbfa9da diff --git a/graphics/flphoto/patches/patch-image.cxx b/graphics/flphoto/patches/patch-image.cxx new file mode 100644 index 00000000000..9a3790fb70c --- /dev/null +++ b/graphics/flphoto/patches/patch-image.cxx @@ -0,0 +1,14 @@ +$NetBSD: patch-image.cxx,v 1.1 2011/07/08 20:48:28 wiz Exp $ + +Fix build with png-1.5. + +--- image.cxx.orig 2003-10-22 03:49:41.000000000 +0000 ++++ image.cxx +@@ -91,6 +91,7 @@ extern "C" { + #endif // HAVE_LIBJPEG + + #ifdef HAVE_LIBPNG ++# include <zlib.h> + # include <png.h> + #endif // HAVE_LIBPNG + 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; + } |