[vtk7] 24/24: Add patch to deal with gl2ps-1.4.0

[Gert Wollny]

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

gewo pushed a commit to branch master
in repository vtk7.

commit bbbf6785bd2a748a7bc7bdaa3076a9b1a4588d51
Author: Gert Wollny <gewo at debian.org>
Date:   Sun Jul 9 06:36:17 2017 +0000

    Add patch to deal with gl2ps-1.4.0
---
 debian/patches/107_gl2ps_1.4.0.patch      | 21 +++++++++------------
 debian/patches/99-hdf5-1.10-compatibility |  2 --
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/debian/patches/107_gl2ps_1.4.0.patch b/debian/patches/107_gl2ps_1.4.0.patch
index 796b7be..f533efe 100644
--- a/debian/patches/107_gl2ps_1.4.0.patch
+++ b/debian/patches/107_gl2ps_1.4.0.patch
@@ -8,12 +8,10 @@ Subject: [PATCH] For gl2ps most recent git, gl2psAddPolyPrimitive() requires
  Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
-diff --git a/Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx b/Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx
-index ad086b03f89..1bdd0072d17 100644
 --- a/Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx
 +++ b/Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx
-@@ -183,15 +183,15 @@ void vtkOpenGLGL2PSHelperImpl::ProcessTransformFeedback(
-       {
+@@ -183,15 +183,15 @@
+     {
        case GL_POINTS:
          gl2psAddPolyPrimitive(GL2PS_POINT, 1, verts, 0, 0.f, 0.f, 0xffff, 1,
 -                              pointSize, 0);
@@ -23,26 +21,26 @@ index ad086b03f89..1bdd0072d17 100644
        case GL_LINES:
          curVert = (curVert + 1) % 2;
          if (curVert == 0)
-           {
+         {
 -          gl2psAddPolyPrimitive(GL2PS_LINE, 2, verts, 0, 0.f, 0.f,
 -                                this->LineStipple, 1, lineWidth, 0);
 +          gl2psAddPolyPrimitive(GL2PS_LINE, 2, verts, 0, 0.f, 0.f, this->LineStipple, 1, 
 +                                lineWidth, gl2psLineCap (GL2PS_LINE_CAP_ROUND), gl2psLineJoin (GL2PS_LINE_JOIN_ROUND), 0);
-           }
+         }
          break;
  
-@@ -199,8 +199,8 @@ void vtkOpenGLGL2PSHelperImpl::ProcessTransformFeedback(
+@@ -199,8 +199,8 @@
          curVert = (curVert + 1) % 3;
          if (curVert == 0)
-           {
+         {
 -          gl2psAddPolyPrimitive(GL2PS_TRIANGLE, 3, verts, 0, 0.f, 0.f, 0xffff,
 -                                1, 1, 0);
 +          gl2psAddPolyPrimitive(GL2PS_TRIANGLE, 3, verts, 0, 0.f, 0.f, 0xffff, 1, 
 +                                1, gl2psLineCap (GL2PS_LINE_CAP_ROUND), gl2psLineJoin (GL2PS_LINE_JOIN_ROUND), 0);
-           }
+         }
          break;
  
-@@ -270,9 +270,9 @@ void vtkOpenGLGL2PSHelperImpl::DrawString(const std::string &str,
+@@ -270,9 +270,9 @@
        bgVerts[4].xyz[2] = bgVerts[0].xyz[2];
  
        gl2psAddPolyPrimitive(GL2PS_TRIANGLE, 3, bgVerts,     0, 0, 0, 0xffff, 0,
@@ -51,7 +49,6 @@ index ad086b03f89..1bdd0072d17 100644
        gl2psAddPolyPrimitive(GL2PS_TRIANGLE, 3, bgVerts + 2, 0, 0, 0, 0xffff, 0,
 -                            0, 0);
 +                            0, gl2psLineCap (GL2PS_LINE_CAP_ROUND), gl2psLineJoin (GL2PS_LINE_JOIN_ROUND), 0);
-       }
      }
+   }
  
-
diff --git a/debian/patches/99-hdf5-1.10-compatibility b/debian/patches/99-hdf5-1.10-compatibility
index 5e6c002..92c6633 100644
--- a/debian/patches/99-hdf5-1.10-compatibility
+++ b/debian/patches/99-hdf5-1.10-compatibility
@@ -2,8 +2,6 @@ Description: The H5FD_class_t struct gained an extra member in 1.10
 Author: Iain Lane <iain.lane at canonical.com>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=846372
 
-Index: b/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx
-===================================================================
 --- a/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx
 +++ b/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx
 @@ -139,7 +139,11 @@

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