diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2016-07-16 12:21:21 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2016-07-16 12:21:21 +0100 |
| commit | ad504b590a7a5014f8801281c7d57ff71535359f (patch) | |
| tree | 47ce78fcaa4236f9fd4fb113a57a87f08f7cb1a8 /patches | |
| parent | d3ed16b1c909fc4f3d2232f98bedcdbb148e10e2 (diff) | |
| download | debian-ad504b590a7a5014f8801281c7d57ff71535359f.tar.gz debian-ad504b590a7a5014f8801281c7d57ff71535359f.tar.bz2 | |
update to include relevant NMU and prepare for 3.5 release
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/libpng16-fix.patch | 24 | ||||
| -rw-r--r-- | patches/series | 1 |
2 files changed, 25 insertions, 0 deletions
diff --git a/patches/libpng16-fix.patch b/patches/libpng16-fix.patch new file mode 100644 index 0000000..4da88ce --- /dev/null +++ b/patches/libpng16-fix.patch @@ -0,0 +1,24 @@ +Description: use png native types, they are platform dependent. + (and also silence some warnings about missing memcpy prototype) +Author: Tobias Frost <tobi@debian.org> +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/netsurf/framebuffer/convert_image.c ++++ b/netsurf/framebuffer/convert_image.c +@@ -21,6 +21,7 @@ + #include <stdio.h> + #include <png.h> + #include <stdlib.h> ++#include <string.h> + + #if PNG_LIBPNG_VER < 10209 + #define png_set_expand_gray_1_2_4_to_8(png) png_set_gray_1_2_4_to_8(png) +@@ -219,7 +220,7 @@ + { + int bit_depth, color_type, interlace, intent; + double gamma; +- unsigned long width, height; ++ png_uint_32 width, height; + + /* Read the PNG details */ + png_get_IHDR(png, info, &width, &height, &bit_depth, diff --git a/patches/series b/patches/series index 3ba4a07..c649698 100644 --- a/patches/series +++ b/patches/series @@ -1,2 +1,3 @@ set-netsurf-config.patch change-install-binary-targets +libpng16-fix.patch |