[grads] 06/06: Include png16.patch

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository grads.

commit c099d3548e42ece277cc27cdc08a2b22ac4f138d
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jan 4 00:27:54 2016 +0000

    Include png16.patch
---
 debian/patches/png16.patch | 93 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/debian/patches/png16.patch b/debian/patches/png16.patch
new file mode 100644
index 0000000..719e7ca
--- /dev/null
+++ b/debian/patches/png16.patch
@@ -0,0 +1,93 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Move from png1.5 -> png1.6
+Last-Updated: 2016-01-05
+Forwarded: no
+
+Index: grads-2.1~a3/configure.ac
+===================================================================
+--- grads-2.1~a3.orig/configure.ac
++++ grads-2.1~a3/configure.ac
+@@ -463,8 +463,8 @@ if test "$with_printim" != "no" ; then
+       ])
+     ])
+     GA_UNSET_FLAGS
+-    GA_SET_FLAGS([libpng15])
+-    AC_CHECK_LIB([png15], [main], 
++    GA_SET_FLAGS([libpng16])
++    AC_CHECK_LIB([png16], [main], 
+     [ have_libpng=yes 
+     ])
+     GA_UNSET_FLAGS
+@@ -480,9 +480,9 @@ if test "$with_printim" != "no" ; then
+         [ use_printim=yes
+           GA_SET_INCLUDE_VAR([printim_inc], [gd])
+ 	  if test "$have_jpeg" = "yes" ; then
+-	    GA_SET_LIB_VAR([printim_libs], [gd png15 z jpeg])
++	    GA_SET_LIB_VAR([printim_libs], [gd png16 z jpeg])
+ 	  else
+-  	    GA_SET_LIB_VAR([printim_libs], [gd png15 z])
++  	    GA_SET_LIB_VAR([printim_libs], [gd png16 z])
+           fi
+         ])
+       ])
+@@ -528,8 +528,8 @@ if test "$with_cairo" != "no" ; then
+     fi
+     # libpng
+     if test "$have_libpng" = "no" ; then
+-      GA_SET_FLAGS([libpng15])
+-      AC_CHECK_LIB([png15], [main], 
++      GA_SET_FLAGS([libpng16])
++      AC_CHECK_LIB([png16], [main], 
+       [ have_libpng=yes 
+       ])
+       GA_UNSET_FLAGS
+@@ -559,8 +559,8 @@ if test "$with_cairo" != "no" ; then
+             [ AC_CHECK_LIB(Xrender,main,
+               [ AC_CHECK_LIB(cairo,main,
+                 [ use_cairo="yes"
+-                  GA_SET_INCLUDE_VAR([cairo_inc], [cairo freetype2 fontconfig libpng15 pixman-1])
+-                  GA_SET_LIB_VAR(cairo_libs, [cairo Xrender fontconfig freetype pixman-1 png15 xml2 z])
++                  GA_SET_INCLUDE_VAR([cairo_inc], [cairo freetype2 fontconfig libpng16 pixman-1])
++                  GA_SET_LIB_VAR(cairo_libs, [cairo Xrender fontconfig freetype pixman-1 png16 xml2 z])
+ 	        ])
+               ])
+             ])
+@@ -603,8 +603,8 @@ if test "$with_grib2" != "no" ; then
+       GA_UNSET_FLAGS
+     fi
+     if test "$have_libpng" = "no" ; then
+-      GA_SET_FLAGS([libpng15])
+-      AC_CHECK_LIB([png15], [main], 
++      GA_SET_FLAGS([libpng16])
++      AC_CHECK_LIB([png16], [main], 
+       [ have_libpng=yes 
+       ])
+       GA_UNSET_FLAGS
+@@ -622,7 +622,7 @@ if test "$with_grib2" != "no" ; then
+         [ AC_CHECK_LIB([grib2c], [main], 
+           [ use_grib2=yes 
+             GA_SET_INCLUDE_VAR([grib2_inc], [grib2c])
+-            GA_SET_LIB_VAR([grib2_libs], [grib2c jasper png15 z])
++            GA_SET_LIB_VAR([grib2_libs], [grib2c jasper png16 z])
+           ])
+         ])
+         GA_UNSET_FLAGS
+Index: grads-2.1~a3/doc/supplibs.html
+===================================================================
+--- grads-2.1~a3.orig/doc/supplibs.html
++++ grads-2.1~a3/doc/supplibs.html
+@@ -118,10 +118,10 @@ mkdir $HOME/supplibs/bin</span></p>
+       --prefix=$HOME/supplibs/src/libpng<br>
+       make ; 
+       make install<br>
+-      cp $HOME/supplibs/src/libpng/lib/libpng15.a $HOME/supplibs/lib<br>
+-      mkdir $HOME/supplibs/include/libpng15<br>
+-    cp $HOME/supplibs/src/libpng/include/libpng15/*.h $HOME/supplibs/include/libpng15<br>
+-    cp $HOME/supplibs/src/libpng/lib/pkgconfig/libpng15.pc $HOME/supplibs/lib/pkgconfig</p>
++      cp $HOME/supplibs/src/libpng/lib/libpng16.a $HOME/supplibs/lib<br>
++      mkdir $HOME/supplibs/include/libpng16<br>
++    cp $HOME/supplibs/src/libpng/include/libpng16/*.h $HOME/supplibs/include/libpng16<br>
++    cp $HOME/supplibs/src/libpng/lib/pkgconfig/libpng16.pc $HOME/supplibs/lib/pkgconfig</p>
+     <p><span class="style1">Note: The pkgconfig file is required for building cairo</span></p></td>
+   </tr>
+   <tr bgcolor="ccdceb">

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/grads.git