summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoreolianoe2016-11-14 13:57:11 +0100
committereolianoe2016-11-14 13:57:11 +0100
commit897dfd082546e96cd78b311c7ab912b16805e6e4 (patch)
treeb7c5e45d3db8482ed6d2d6895fb92f60a01aa8da
parentab8a3a64f640f3ef8cb61ab83d12acbf1b72792c (diff)
downloadaur-897dfd082546e96cd78b311c7ab912b16805e6e4.tar.gz
updpkg: 2.12.0
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD8
-rw-r--r--vtk_gcc6.patch27
3 files changed, 24 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ce3dcad16f1..d762787cc01 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Tue Oct 11 11:50:57 UTC 2016
+# Mon Nov 14 12:56:53 UTC 2016
pkgbase = visit-build
pkgdesc = Interactive parallel visualization and graphical analysis tool (built with build_visit).
- pkgver = 2.11.0
+ pkgver = 2.12.0
pkgrel = 1
url = https://wci.llnl.gov/simulation/computer-codes/visit
arch = i686
@@ -25,19 +25,19 @@ pkgbase = visit-build
conflicts = visit
conflicts = visit-bin
options = !emptydirs
- source = https://portal.nersc.gov/svn/visit/trunk/releases/2.11.0/build_visit2_11_0
- source = https://portal.nersc.gov/svn/visit/trunk/releases/2.11.0/visit2.11.0.tar.gz
+ source = https://portal.nersc.gov/svn/visit/trunk/releases/2.12.0/build_visit2_12_0
+ source = https://portal.nersc.gov/svn/visit/trunk/releases/2.12.0/visit2.12.0.tar.gz
source = visit.sh
source = no_install_qt5.patch
source = no_extract_visit.patch
source = vtk_gcc6.patch
source = qt5-qpa.patch
- sha256sums = 96c2cf1a65024d6e2d68c55f56c3ee7df78d02776b1c50e76664ebd95a45f27f
- sha256sums = f01b34c61081cd767199a3229c2012ab2344e01bc2df84965a3cd266e08ba5b5
+ sha256sums = 8338f8512abe559e6cece231160b873a221c0d24c0fcc6a0a962cc6071cd6515
+ sha256sums = 5b4e1b9d5a0e7edaa64c53bab300c9c1e3a1a13494180156a4f25a9c6d078dd4
sha256sums = d07a11e67ad646579fbc341f30e1eb63ebd38a5fbdd4f3ea36e8f460419028da
sha256sums = 8ec6767c3943c3b93c9817ef0d051799c5ebfac75e73e58175befd08bfd320e0
sha256sums = 6dfdf3fdf6e64437106fc4f9facc79e80ab204de12bb480c6209c6b3fc5b4e07
- sha256sums = f08e867357837dd6e2fa8b20d033ad39aa0f59fc13d2333f7153d0eb83b2cb5a
+ sha256sums = 77b1f762b05c660c2cb5f2b071533768fb6f905a2b7b14f4b4db29e0ada380bc
sha256sums = a523dd42c61ccd6743f23d35e63518c4dd33a465fa024e4431f002932464f26b
pkgname = visit-build
diff --git a/PKGBUILD b/PKGBUILD
index 866311e44a9..6bc3c744d1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=visit-build
_pkgname=visit
-pkgver=2.11.0
+pkgver=2.12.0
_pkgver=${pkgver//./_}
pkgrel=1
pkgdesc="Interactive parallel visualization and graphical analysis tool (built with build_visit)."
@@ -21,12 +21,12 @@ source=("https://portal.nersc.gov/svn/${_pkgname}/trunk/releases/${pkgver}/build
'no_extract_visit.patch'
"vtk_gcc6.patch"
'qt5-qpa.patch')
-sha256sums=('96c2cf1a65024d6e2d68c55f56c3ee7df78d02776b1c50e76664ebd95a45f27f'
- 'f01b34c61081cd767199a3229c2012ab2344e01bc2df84965a3cd266e08ba5b5'
+sha256sums=('8338f8512abe559e6cece231160b873a221c0d24c0fcc6a0a962cc6071cd6515'
+ '5b4e1b9d5a0e7edaa64c53bab300c9c1e3a1a13494180156a4f25a9c6d078dd4'
'd07a11e67ad646579fbc341f30e1eb63ebd38a5fbdd4f3ea36e8f460419028da'
'8ec6767c3943c3b93c9817ef0d051799c5ebfac75e73e58175befd08bfd320e0'
'6dfdf3fdf6e64437106fc4f9facc79e80ab204de12bb480c6209c6b3fc5b4e07'
- 'f08e867357837dd6e2fa8b20d033ad39aa0f59fc13d2333f7153d0eb83b2cb5a'
+ '77b1f762b05c660c2cb5f2b071533768fb6f905a2b7b14f4b4db29e0ada380bc'
'a523dd42c61ccd6743f23d35e63518c4dd33a465fa024e4431f002932464f26b')
options=(!emptydirs)
diff --git a/vtk_gcc6.patch b/vtk_gcc6.patch
index 5e0dd86f43c..167064a68ea 100644
--- a/vtk_gcc6.patch
+++ b/vtk_gcc6.patch
@@ -1,9 +1,9 @@
---- build_visit2_10_3 2016-07-13 10:21:46.960665498 +0200
-+++ build_visit2_10_3.new 2016-07-13 13:15:57.205848552 +0200
-@@ -18575,6 +18575,50 @@
- return 0;
- }
-
+--- build_visit2_12_0 2016-11-14 11:33:10.689430637 +0100
++++ build_visit2_12_0.new 2016-11-14 11:35:32.026790825 +0100
+@@ -19335,6 +19335,49 @@
+ # *************************************************************************** #
+ # Function 6, build_vtk #
+ # *************************************************************************** #
+function apply_vtk_gcc6_patch
+{
+ patch -p1 << \EOF
@@ -47,15 +47,14 @@
+
+ return 0;
+}
-+
- function apply_vtk_610_patch_2
+
+ function apply_vtk_600_patch
{
- patch -p0 << \EOF
-@@ -18795,6 +18839,7 @@
+@@ -19733,6 +19776,7 @@
+ # also apply objc flag patch to 6.1.0
+
if [[ ${VTK_VERSION} == 6.1.0 ]] ; then
++ apply_vtk_gcc6_patch
apply_vtk_600_patch
apply_vtk_610_patch_2
-+ apply_vtk_gcc6_patch
- if [[ "$OPSYS" == "Linux" ]] ; then
- apply_vtk_610_patch
- fi
+ apply_vtk_610_patch_3