[SCM] jkmeter/master: Added patch to fix FTBFS with libpng 1.5

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 40a1fe3875e01935e302b77f4393a63ccfba0ee2
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Jul 31 13:16:19 2011 +0200

    Added patch to fix FTBFS with libpng 1.5

diff --git a/debian/patches/02-build_with_new_libpng.patch b/debian/patches/02-build_with_new_libpng.patch
new file mode 100644
index 0000000..96613dc
--- /dev/null
+++ b/debian/patches/02-build_with_new_libpng.patch
@@ -0,0 +1,22 @@
+Description: Fix FTBFS with libpng 1.5
+Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+Forwarded: no
+
+--- jkmeter-0.4.0.orig/source/mkimage.cc
++++ jkmeter-0.4.0/source/mkimage.cc
+@@ -73,9 +73,15 @@ XImage *mkimage (const char *file, X_dis
+                   PNG_TRANSFORM_STRIP_16 | PNG_TRANSFORM_PACKING | PNG_TRANSFORM_EXPAND,
+                   0);
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	dx = png_get_image_width(png_ptr, png_info);
++	dy = png_get_image_height(png_ptr, png_info);
++	dp = (png_get_color_type(png_ptr, png_info) & PNG_COLOR_MASK_ALPHA) ? 4 : 3;
++#else
+     dx = png_info->width;
+     dy = png_info->height;
+     dp = (png_info->color_type & PNG_COLOR_MASK_ALPHA) ? 4 : 3;
++#endif
+     data = (const unsigned char **)(png_get_rows (png_ptr, png_info));
+ 
+     image = XCreateImage (disp->dpy (),
diff --git a/debian/patches/series b/debian/patches/series
index d3b72df..758a3ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-makefile.patch
+02-build_with_new_libpng.patch

-- 
jkmeter packaging