[vtk6] 11/12: Add patch that enables compiling with gcc-6. Closes: #812296

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository vtk6.

commit f2883f3f5dab35de788a84766e35964bc0eab545
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Sun Mar 27 14:54:37 2016 +0000

    Add patch that enables compiling with gcc-6. Closes: #812296
---
 CMake/GenerateExportHeader.cmake           |  2 +-
 CMake/vtkCompilerExtras.cmake              |  2 +-
 debian/patches/104_fix_gcc_version_6.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/CMake/GenerateExportHeader.cmake b/CMake/GenerateExportHeader.cmake
index ecfae31..abc62cd 100644
--- a/CMake/GenerateExportHeader.cmake
+++ b/CMake/GenerateExportHeader.cmake
@@ -166,7 +166,7 @@ macro(_test_compiler_hidden_visibility)
     execute_process(COMMAND ${CMAKE_C_COMPILER} ARGS --version
       OUTPUT_VARIABLE _gcc_version_info
       ERROR_VARIABLE _gcc_version_info)
-    string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
+    string(REGEX MATCH "[3456]\\.[0-9]\\.[0-9]*"
       _gcc_version "${_gcc_version_info}")
     # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
     # patch level, handle this here:
diff --git a/CMake/vtkCompilerExtras.cmake b/CMake/vtkCompilerExtras.cmake
index 4e0ea4e..91105a1 100644
--- a/CMake/vtkCompilerExtras.cmake
+++ b/CMake/vtkCompilerExtras.cmake
@@ -27,7 +27,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     OUTPUT_VARIABLE _gcc_version_info
     ERROR_VARIABLE _gcc_version_info)
 
-  string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
+  string (REGEX MATCH "[3456]\\.[0-9]\\.[0-9]*"
     _gcc_version "${_gcc_version_info}")
   if(NOT _gcc_version)
     string (REGEX REPLACE ".*\\(GCC\\).*([34]\\.[0-9]).*" "\\1.0"
diff --git a/debian/patches/104_fix_gcc_version_6.patch b/debian/patches/104_fix_gcc_version_6.patch
new file mode 100644
index 0000000..390152c
--- /dev/null
+++ b/debian/patches/104_fix_gcc_version_6.patch
@@ -0,0 +1,26 @@
+Description: Fix to be able to compile with gcc-6
+Author: Gerardo Malazdrewicz <gerardo at malazdrewicz.com.ar>
+Bug: https://bugs.debian.org/812296
+
+--- a/CMake/GenerateExportHeader.cmake	2016-02-10 23:14:42.395094043 -0400
++++ b/CMake/GenerateExportHeader.cmake	2016-02-10 23:10:16.756787993 -0400
+@@ -166,7 +166,7 @@
+     execute_process(COMMAND ${CMAKE_C_COMPILER} ARGS --version
+       OUTPUT_VARIABLE _gcc_version_info
+       ERROR_VARIABLE _gcc_version_info)
+-    string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
++    string(REGEX MATCH "[3456]\\.[0-9]\\.[0-9]*"
+       _gcc_version "${_gcc_version_info}")
+     # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
+     # patch level, handle this here:
+--- a/CMake/vtkCompilerExtras.cmake	2016-02-10 23:14:47.587139148 -0400
++++ b/CMake/vtkCompilerExtras.cmake	2016-02-10 23:07:47.667495203 -0400
+@@ -27,7 +27,7 @@
+     OUTPUT_VARIABLE _gcc_version_info
+     ERROR_VARIABLE _gcc_version_info)
+ 
+-  string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
++  string (REGEX MATCH "[3456]\\.[0-9]\\.[0-9]*"
+     _gcc_version "${_gcc_version_info}")
+   if(NOT _gcc_version)
+     string (REGEX REPLACE ".*\\(GCC\\).*([34]\\.[0-9]).*" "\\1.0"
diff --git a/debian/patches/series b/debian/patches/series
index 78f7370..8176c13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 100_javac-heap.patch
 101_java_install_path.patch
 102_enable_system_proj4_lib.patch
+104_fix_gcc_version_6.patch

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