Bug#820347: juce: diff for NMU version 4.1.0+repack-4.1

[Tobias Frost]

On Thu, 7 Apr 2016 18:40:41 +0200 Gianfranco Costamagna <locutusofborg@
debian.org> wrote:
> Package: juce
> Version: 4.1.0+repack-4
> Severity: serious
> Tags: patch
> 
> Dear maintainer,
> 
> I have prepared a patch for juce, but I don't feel confident with it,
so I didn't upload as NMU.
> 
> diff -Nru juce-4.1.0+repack/debian/changelog juce-
4.1.0+repack/debian/changelog
> --- juce-4.1.0+repack/debian/changelog  2016-03-28 21:17:30.000000000
+0200
> +++ juce-4.1.0+repack/debian/changelog  2016-04-07 18:36:40.000000000
+0200
> @@ -1,3 +1,10 @@
> +juce (4.1.0+repack-4.1) UNRELEASED; urgency=medium
> +
> +  * Non-maintainer upload.
> +  * fix build with libpng16.
> +
> + -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 07 Apr
2016 18:36:34 +0200
> +
>  juce (4.1.0+repack-4) unstable; urgency=medium
> 
>    * Updated B-D from libpng12-dev to libpng-dev.
> diff -Nru juce-4.1.0+repack/debian/patches/fix-build-libpng16.patch
juce-4.1.0+repack/debian/patches/fix-build-libpng16.patch
> --- juce-4.1.0+repack/debian/patches/fix-build-libpng16.patch   1970-
01-01 01:00:00.000000000 +0100
> +++ juce-4.1.0+repack/debian/patches/fix-build-libpng16.patch   2016-
04-07 18:38:04.000000000 +0200
> @@ -0,0 +1,29 @@
> +Description: Fix build with libpng16
> + This patch is inspired with the patch available at https://gist.git
hub.com/balr0g/3004353
> +Author: Gianfranco Costamagna <locutusofborg at debian.org>
> +
> +--- juce-
4.1.0+repack.orig/modules/juce_graphics/image_formats/juce_PNGLoader.cp
p
> ++++ juce-
4.1.0+repack/modules/juce_graphics/image_formats/juce_PNGLoader.cpp
> +@@ -320,7 +320,7 @@ namespace PNGHelpers
> + ^M
> +     static void JUCE_CDECL errorCallback (png_structp p,
png_const_charp)^M
> +     {^M
> +-        longjmp (*(jmp_buf*) p->error_ptr, 1);^M
> ++        setjmp(png_jmpbuf(p));^M
> +     }^M
> + ^M
> +     static void JUCE_CDECL warningCallback (png_structp,
png_const_charp) {}^M

Hi Gianfranco,

Patch looks good to me.
I'll take it and schedula an NMU.

-- 
tobi