[paraview] 01/06: Fix FTBFS against new libjpeg. (Closes: #765939)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository paraview.

commit 183704d50fa9240ce711045b0a5c6bc6591b9606
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Oct 20 20:13:01 2014 +0200

    Fix FTBFS against new libjpeg. (Closes: #765939)
---
 debian/patches/fix_GLintptr_FTBFS.patch | 31 +++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/fix_GLintptr_FTBFS.patch b/debian/patches/fix_GLintptr_FTBFS.patch
new file mode 100644
index 0000000..fc4da77
--- /dev/null
+++ b/debian/patches/fix_GLintptr_FTBFS.patch
@@ -0,0 +1,31 @@
+Description: fixes FTBFS against new libjpeg-turbo
+Author: Ondřej Surý <ondrej at debian.org>
+Bug-Debian: https://bugs.debian.org/765939
+Reviewed-By: Anton Gladky <gladk at debian.org>
+Last-Update: 2014-10-20
+
+Index: paraview-4.1.0+dfsg/VTK/Rendering/OpenGL/vtkOpenGL.h
+===================================================================
+--- paraview-4.1.0+dfsg.orig/VTK/Rendering/OpenGL/vtkOpenGL.h
++++ paraview-4.1.0+dfsg/VTK/Rendering/OpenGL/vtkOpenGL.h
+@@ -20,6 +20,7 @@
+ 
+ // To prevent gl.h to include glext.h provided by the system
+ #define GL_GLEXT_LEGACY
++#define GLX_GLEXT_LEGACY
+ #if defined(__APPLE__) && (defined(VTK_USE_CARBON) || defined(VTK_USE_COCOA))
+ # include <OpenGL/gl.h> // Include OpenGL API.
+ #else
+Index: paraview-4.1.0+dfsg/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
+===================================================================
+--- paraview-4.1.0+dfsg.orig/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
++++ paraview-4.1.0+dfsg/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
+@@ -27,7 +27,7 @@
+ 
+ // define GLX_GLXEXT_LEGACY to prevent glx.h to include glxext.h provided by
+ // the system
+-//#define GLX_GLXEXT_LEGACY
++#define GLX_GLXEXT_LEGACY
+ #include "GL/glx.h"
+ 
+ #include "vtkgl.h"
diff --git a/debian/patches/series b/debian/patches/series
index 7df6a0e..16cdaa6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ fix_libav10.patch
 fix_path_paraview.patch
 fix_FTBFS_KWSys.patch
 fix_ftbfs_gcc49.patch
+fix_GLintptr_FTBFS.patch

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