aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
-rw-r--r--debian/patches/006_nxcomp_libpng15.full+lite.patch44
-rw-r--r--debian/patches/series1
3 files changed, 47 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index d79c7f671..b0e8fc27a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
nx-libs (2:3.5.0.10) UNRELEASED; urgency=low
- * Continue development...
+ * Add patch: 006_nxcomp_libpng15.full+lite.patch, fix build against
+ libpng 1.5.x.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 01 Feb 2012 14:48:31 +0100
diff --git a/debian/patches/006_nxcomp_libpng15.full+lite.patch b/debian/patches/006_nxcomp_libpng15.full+lite.patch
new file mode 100644
index 000000000..5ef84780c
--- /dev/null
+++ b/debian/patches/006_nxcomp_libpng15.full+lite.patch
@@ -0,0 +1,44 @@
+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
+diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp
+--- a/nxcomp/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200
++++ b/nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300
+@@ -414,7 +414,7 @@
+
+ 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 @@
+
+ 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 @@
+ 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);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index d22f4b4c8..92917666d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@
003_nxcompshad_gcc43.full.patch
004_nx-x11_fix-nxcompshad-build.full.patch
005_nxcomp_gcc43.full+lite.patch
+006_nxcomp_libpng15.full+lite.patch
007_nxcompshad_clean-gch-files.full.patch
009_nxproxy-add-man-page.full+lite.patch
009_nxagent-add-man-page.full.patch