Merge branch '3.6.x'

1 files changed, 0 insertions, 43 deletions

diff --git a/debian/patches/0006_nxcomp_libpng15.full+lite.patch b/debian/patches/0006_nxcomp_libpng15.full+lite.patch
deleted file mode 100644
index 0b305a7fb..000000000
--- a/debian/patches/0006_nxcomp_libpng15.full+lite.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Fix building against libpng 1.5.
- From the libpng homepage...
- 
- The libpng 1.5.x series continues the evolution of the libpng API,
- finally hiding the contents of the venerable and hoary png_struct and
- png_info data structures inside private (i.e., non-installed) header
- files. Instead of direct struct-access, applications should be using
- the various png_get_xxx() and png_set_xxx() accessor functions, which
- have existed for almost as long as libpng itself. (Apps that compiled
- against libpng 1.4 without warnings about deprecated features should
- happily compile against 1.5, too.
-Forwarded: pending...
-Author: Fedora packagers of NX
-Last-Update: 2012-02-06
---- a/nxcomp/Pgn.cpp
-+++ b/nxcomp/Pgn.cpp
-@@ -414,7 +414,7 @@ int DecompressPng16(unsigned char *compr
- 
-   png_read_info(pngPtr, infoPtr);
- 
--  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
-+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_set_expand(pngPtr);
-   }
-@@ -565,7 +565,7 @@ int DecompressPng24(unsigned char *compr
- 
-   png_read_info( pngPtr, infoPtr ) ;
- 
--  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
-+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_set_expand(pngPtr);
-   }
-@@ -709,7 +709,7 @@ int DecompressPng32(unsigned char *compr
-   png_read_info(pngPtr, infoPtr) ;
- 
- 
--  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
-+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_set_expand(pngPtr);
-   }