Date: Saturday, May 7, 2016 @ 10:34:25 Author: ronald Revision: 174060
add gcc6 patch Added: vtk6/trunk/gcc6.patch Modified: vtk6/trunk/PKGBUILD ------------+ PKGBUILD | 10 +++++++--- gcc6.patch | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-05-07 08:06:33 UTC (rev 174059) +++ PKGBUILD 2016-05-07 08:34:25 UTC (rev 174060) @@ -6,7 +6,7 @@ pkgname=vtk6 pkgver=6.3.0 _majorver=6.3 -pkgrel=2 +pkgrel=3 pkgdesc='A software system for 3D computer graphics, image processing, and visualization. Legacy 6.3 version.' arch=('i686' 'x86_64') url='http://www.vtk.org/' @@ -34,7 +34,8 @@ remove-vtkxdmf3.patch::https://github.com/nschloe/VTK/commit/a98527dfe9ce23beebf386fab07caef99b911ede.patch find-libxml2.patch::https://github.com/nschloe/VTK/commit/6216f98a7124e12a2c1cefd113347f94b51f3c51.patch ffmpeg3_compat.patch - gdal2.patch) + gdal2.patch + gcc6.patch) options=(staticlibs) sha1sums=('452efab1eedf6202f2d9a3362b5f69adfc44edda' '424b138c079a688cd8c52c43d12b54e2f2b06acf' @@ -42,7 +43,8 @@ 'f8c9270941707a296ff5e0ea3c73a1f0407c6f9b' 'baa807e4495219b3104b6245ca79b8f33ff299db' 'a78177f8dd6dedd9ad189fa12730ec53c7d02508' - 'c60610e7c8cf0ad93d7c02cbf8a20fc415f59b3e') + 'c60610e7c8cf0ad93d7c02cbf8a20fc415f59b3e' + '0dc5e510a7f522e32484e2e77205c1a9d2c48854') prepare() { cd "${srcdir}"/VTK-$pkgver @@ -52,6 +54,7 @@ patch -Np1 -i "${srcdir}"/find-libxml2.patch patch -Np1 -i "${srcdir}"/gdal2.patch patch -Np1 -i "${srcdir}"/ffmpeg3_compat.patch + patch -Np1 -i "${srcdir}"/gcc6.patch sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ @@ -109,6 +112,7 @@ ninja } + package() { cd "${srcdir}/build" Added: gcc6.patch =================================================================== --- gcc6.patch (rev 0) +++ gcc6.patch 2016-05-07 08:34:25 UTC (rev 174060) @@ -0,0 +1,24 @@ +diff -Naur a/CMake/GenerateExportHeader.cmake b/CMake/GenerateExportHeader.cmake +--- a/CMake/GenerateExportHeader.cmake 2016-05-07 10:25:47.104258276 +0200 ++++ b/CMake/GenerateExportHeader.cmake 2016-05-07 10:26:51.085595051 +0200 +@@ -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 "[3-9]\\.[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 -Naur a/CMake/vtkCompilerExtras.cmake b/CMake/vtkCompilerExtras.cmake +--- a/CMake/vtkCompilerExtras.cmake 2016-05-07 10:25:47.104258276 +0200 ++++ b/CMake/vtkCompilerExtras.cmake 2016-05-07 10:27:20.496204378 +0200 +@@ -32,7 +32,7 @@ + OUTPUT_VARIABLE _gcc_version_info + ERROR_VARIABLE _gcc_version_info) + +- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]*" ++ string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*" + _gcc_version "${_gcc_version_info}") + if(NOT _gcc_version) + string (REGEX REPLACE ".*\\(GCC\\).*([34]\\.[0-9]).*" "\\1.0"