summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoreolianoe2016-07-11 21:38:52 +0200
committereolianoe2016-07-11 21:38:52 +0200
commitaf1022e82d4fcdc56a11225a3b2299f7c71e5314 (patch)
tree30e3afd26fb13035d0342e76212aab03d71fe043
parentec868db268ee5e441d998c59dd7f33c66af3ac39 (diff)
downloadaur-af1022e82d4fcdc56a11225a3b2299f7c71e5314.tar.gz
Fix compilation errors with gcc6
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
-rw-r--r--gcc6.patch32
3 files changed, 42 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5efd7658043..f28be0a6c7e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Mon Jul 11 19:37:23 UTC 2016
pkgbase = vtk-visit
pkgdesc = A software system for 3D computer graphics, image processing, and visualization (legacy version for VisIt).
pkgver = 6.1.0
- pkgrel = 3
+ pkgrel = 4
url = http://www.vtk.org/
arch = i686
arch = x86_64
@@ -49,11 +51,13 @@ pkgbase = vtk-visit
source = hdf5.patch
source = vtk-type.patch
source = gdal2.patch
+ source = gcc6.patch
sha256sums = bd7df10a479606d529a8b71f466c44a2bdd11fd534c62ce0aa44fad91883fa34
sha256sums = 47fee3346c0d751ef58d1049c2c2160f741b3122058c0f0482ff6153c6c2f3f8
sha256sums = d081f31463c1cab05e8e628550c89559236813af2b7511198e5768868ad601f0
sha256sums = 32a2a771cc6b0aa8c98399fa0b0294e2a1f98c15a5d7ad9cccf2bc50c68da492
sha256sums = 57ae622a7e281887f7948f4d5a53ff0e0301bbdf70594691dd74f20f14b6e882
+ sha256sums = 44ed94ca9fcc073f93938f44050a8af883f211b126fafaf860fa1be5af60c769
pkgname = vtk-visit
diff --git a/PKGBUILD b/PKGBUILD
index f3737313d38..06c4f256008 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ pkgname='vtk-visit'
_pkgname=vtk
_PKGNAME=VTK
pkgver=6.1.0
-pkgrel=3
+pkgrel=4
pkgdesc='A software system for 3D computer graphics, image processing, and visualization (legacy version for VisIt).'
arch=('i686' 'x86_64')
url='http://www.vtk.org/'
@@ -37,12 +37,13 @@ optdepends=('python2: python bindings'
'mariadb')
provides=('vtk=6.1.0')
source=("http://www.vtk.org/files/release/${pkgver:0:3}/${_PKGNAME}-${pkgver}.tar.gz"
- 'mesa.patch' 'hdf5.patch' 'vtk-type.patch' 'gdal2.patch')
+ 'mesa.patch' 'hdf5.patch' 'vtk-type.patch' 'gdal2.patch' 'gcc6.patch')
sha256sums=('bd7df10a479606d529a8b71f466c44a2bdd11fd534c62ce0aa44fad91883fa34'
'47fee3346c0d751ef58d1049c2c2160f741b3122058c0f0482ff6153c6c2f3f8'
'd081f31463c1cab05e8e628550c89559236813af2b7511198e5768868ad601f0'
'32a2a771cc6b0aa8c98399fa0b0294e2a1f98c15a5d7ad9cccf2bc50c68da492'
- '57ae622a7e281887f7948f4d5a53ff0e0301bbdf70594691dd74f20f14b6e882')
+ '57ae622a7e281887f7948f4d5a53ff0e0301bbdf70594691dd74f20f14b6e882'
+ '44ed94ca9fcc073f93938f44050a8af883f211b126fafaf860fa1be5af60c769')
prepare() {
cd "${srcdir}/${_PKGNAME}-${pkgver}"
@@ -52,6 +53,7 @@ prepare() {
patch -Np1 -i "${srcdir}/hdf5.patch"
patch -Np1 -i "${srcdir}/vtk-type.patch"
patch -Np1 -i "${srcdir}/gdal2.patch"
+ patch -Np1 -i "${srcdir}/gcc6.patch"
# Use python2
sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
diff --git a/gcc6.patch b/gcc6.patch
new file mode 100644
index 00000000000..f4f03c0a66a
--- /dev/null
+++ b/gcc6.patch
@@ -0,0 +1,32 @@
+--- a/CMake/vtkCompilerExtras.cmake 2014-01-22 16:55:41.000000000 +0100
++++ b/CMake/vtkCompilerExtras.cmake.new 2016-07-11 21:28:48.107362104 +0200
+@@ -27,10 +27,10 @@
+ OUTPUT_VARIABLE _gcc_version_info
+ ERROR_VARIABLE _gcc_version_info)
+
+- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]"
++ string (REGEX MATCH "[0-9]\\.[0-9]\\.[0-9]"
+ _gcc_version "${_gcc_version_info}")
+ if(NOT _gcc_version)
+- string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0"
++ string (REGEX REPLACE ".*\\(GCC\\).* ([0-9]\\.[0-9]) .*" "\\1.0"
+ _gcc_version "${_gcc_version_info}")
+ endif()
+
+--- a/CMake/GenerateExportHeader.cmake 2014-01-22 16:55:41.000000000 +0100
++++ b/CMake/GenerateExportHeader.cmake.new 2016-07-11 21:28:47.977361853 +0200
+@@ -166,12 +166,12 @@
+ execute_process(COMMAND ${CMAKE_C_COMPILER} --version
+ OUTPUT_VARIABLE _gcc_version_info
+ ERROR_VARIABLE _gcc_version_info)
+- string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]"
++ string(REGEX MATCH "[0-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:
+ if(NOT _gcc_version)
+- string(REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0"
++ string(REGEX REPLACE ".*\\(GCC\\).* ([0-9]\\.[0-9]) .*" "\\1.0"
+ _gcc_version "${_gcc_version_info}")
+ endif()
+