updpkg: 2.11.0

4 files changed, 95 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 21601015360b..ce3dcad16f1e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,22 @@
 # Generated by mksrcinfo v8
-# Wed Jul 13 14:30:14 UTC 2016
+# Tue Oct 11 11:50:57 UTC 2016
 pkgbase = visit-build
 	pkgdesc = Interactive parallel visualization and graphical analysis tool (built with build_visit).
-	pkgver = 2.10.3
+	pkgver = 2.11.0
 	pkgrel = 1
 	url = https://wci.llnl.gov/simulation/computer-codes/visit
 	arch = i686
 	arch = x86_64
 	license = BSD
 	license = custom
-	makedepends = qtchooser
 	makedepends = cmake
 	makedepends = svn
 	makedepends = java-runtime
 	makedepends = gcc-fortran
 	makedepends = wget
 	depends = qt5-webkit
+	depends = qt5-svg
+	depends = qt5-tools
 	depends = python2-numpy
 	depends = openmpi
 	depends = glu
@@ -24,16 +25,18 @@ pkgbase = visit-build
 	conflicts = visit
 	conflicts = visit-bin
 	options = !emptydirs
-	source = https://portal.nersc.gov/svn/visit/trunk/releases/2.10.3/build_visit2_10_3
-	source = https://portal.nersc.gov/svn/visit/trunk/releases/2.10.3/visit2.10.3.tar.gz
+	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 = visit.sh
+	source = no_install_qt5.patch
 	source = no_extract_visit.patch
 	source = vtk_gcc6.patch
 	source = qt5-qpa.patch
-	sha256sums = 72694d887700d642c0d23ac02bff62cfcabb2ba7d0f567c0bbbb870b0187eff2
-	sha256sums = 05018215c4727eb42d47bb5cc4ff937b2a2ccaca90d141bc7fa426a0843a5dbc
+	sha256sums = 96c2cf1a65024d6e2d68c55f56c3ee7df78d02776b1c50e76664ebd95a45f27f
+	sha256sums = f01b34c61081cd767199a3229c2012ab2344e01bc2df84965a3cd266e08ba5b5
 	sha256sums = d07a11e67ad646579fbc341f30e1eb63ebd38a5fbdd4f3ea36e8f460419028da
-	sha256sums = fe8ffacc194689bf5f3165a4cc54b0ef49371b34ef68dd952b5a828a82364108
+	sha256sums = 8ec6767c3943c3b93c9817ef0d051799c5ebfac75e73e58175befd08bfd320e0
+	sha256sums = 6dfdf3fdf6e64437106fc4f9facc79e80ab204de12bb480c6209c6b3fc5b4e07
 	sha256sums = f08e867357837dd6e2fa8b20d033ad39aa0f59fc13d2333f7153d0eb83b2cb5a
 	sha256sums = a523dd42c61ccd6743f23d35e63518c4dd33a465fa024e4431f002932464f26b
 
diff --git a/PKGBUILD b/PKGBUILD
index c12ecd74f19d..866311e44a97 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,27 +3,29 @@
 
 pkgname=visit-build
 _pkgname=visit
-pkgver=2.10.3
+pkgver=2.11.0
 _pkgver=${pkgver//./_}
 pkgrel=1
 pkgdesc="Interactive parallel visualization and graphical analysis tool (built with build_visit)."
 arch=('i686' 'x86_64')
 url="https://wci.llnl.gov/simulation/computer-codes/visit"
 license=('BSD' 'custom')
-makedepends=('qtchooser' 'cmake' 'svn' 'java-runtime' 'gcc-fortran' 'wget')
-depends=('qt5-webkit' 'python2-numpy' 'openmpi' 'glu' 'java-environment')
+makedepends=('cmake' 'svn' 'java-runtime' 'gcc-fortran' 'wget')
+depends=('qt5-webkit' 'qt5-svg' 'qt5-tools'  'python2-numpy' 'openmpi' 'glu' 'java-environment')
 conflicts=('visit' 'visit-bin')
 provides=('visit')
 source=("https://portal.nersc.gov/svn/${_pkgname}/trunk/releases/${pkgver}/build_${_pkgname}${_pkgver}"
         "https://portal.nersc.gov/svn/${_pkgname}/trunk/releases/${pkgver}/${_pkgname}${pkgver}.tar.gz"
         "visit.sh"
+        'no_install_qt5.patch'
         'no_extract_visit.patch'
         "vtk_gcc6.patch"
         'qt5-qpa.patch')
-sha256sums=('72694d887700d642c0d23ac02bff62cfcabb2ba7d0f567c0bbbb870b0187eff2'
-            '05018215c4727eb42d47bb5cc4ff937b2a2ccaca90d141bc7fa426a0843a5dbc'
+sha256sums=('96c2cf1a65024d6e2d68c55f56c3ee7df78d02776b1c50e76664ebd95a45f27f'
+            'f01b34c61081cd767199a3229c2012ab2344e01bc2df84965a3cd266e08ba5b5'
             'd07a11e67ad646579fbc341f30e1eb63ebd38a5fbdd4f3ea36e8f460419028da'
-            'fe8ffacc194689bf5f3165a4cc54b0ef49371b34ef68dd952b5a828a82364108'
+            '8ec6767c3943c3b93c9817ef0d051799c5ebfac75e73e58175befd08bfd320e0'
+            '6dfdf3fdf6e64437106fc4f9facc79e80ab204de12bb480c6209c6b3fc5b4e07'
             'f08e867357837dd6e2fa8b20d033ad39aa0f59fc13d2333f7153d0eb83b2cb5a'
             'a523dd42c61ccd6743f23d35e63518c4dd33a465fa024e4431f002932464f26b')
 
@@ -33,7 +35,8 @@ prepare(){
   cd "${srcdir}"
 
   # Fix to use python2 in the build script
-  sed -i -e 's/python-config/python2-config/g' -e 's/PYTHON_COMMAND="python"/PYTHON_COMMAND="python2"/g'\
+  sed -i -e 's/python-config/python2-config/g' \
+    -e 's/PYTHON_COMMAND="python"/PYTHON_COMMAND="python2"/g' \
     "${srcdir}/build_${_pkgname}${_pkgver}"
 
   # Build directory
@@ -47,6 +50,9 @@ prepare(){
   # Do not re-extract the visit source code
   patch "${srcdir}/build_${_pkgname}${_pkgver}" no_extract_visit.patch
 
+  # Do not install qt5
+  patch "${srcdir}/build_${_pkgname}${_pkgver}" no_install_qt5.patch
+
   # Patch build_visit to apply patch that permits to build vtk with gcc6
   patch "${srcdir}/build_${_pkgname}${_pkgver}" vtk_gcc6.patch
 
@@ -62,8 +68,9 @@ prepare(){
   patch "${srcdir}/${_pkgname}${pkgver}/src/bin/frontendlauncher" qt5-qpa.patch
 
   # Download all files with '--download-only' option
-  _build_command ${srcdir} --download-only
+  _build_command "${srcdir}" --download-only
 }
+
 build() {
   cd "${srcdir}"
 
@@ -79,7 +86,7 @@ build() {
   fi
 
   # Now build everything
-  _build_command ${srcdir} "--makeflags ${MAKEFLAGS}"
+  _build_command "${srcdir}" "--makeflags ${MAKEFLAGS}"
 
 }
 
@@ -109,7 +116,7 @@ _build_command(){
     --installation-build-dir "${dir}/build" \
     --thirdparty-path "${dir}/thirdparty" \
     --tarball "${dir}/${_pkgname}${pkgver}.tar.gz" \
-    --system-cmake --qt5 --system-qt --system-python \
+    --system-cmake --system-qt --system-python \
     --parallel-build --parallel \
     --cc gcc --cxx g++ --fortran \
     --cflag "${CFLAGS}" --cxxflag "${CXXFLAGS}" \
diff --git a/no_extract_visit.patch b/no_extract_visit.patch
index a90c7b02b623..c5c6c97eee58 100644
--- a/no_extract_visit.patch
+++ b/no_extract_visit.patch
@@ -1,46 +1,53 @@
-3993,4014c3993,4014
-<     if [[ "$DO_SVN" != "yes" || "$USE_VISIT_FILE" == "yes" ]] ; then
-<         #
-<         # Unzip the file, provided a gzipped file exists.
-<         #
-<         if [[ -f ${VISIT_FILE} ]] ; then
-<            info "Unzipping/untarring ${VISIT_FILE} . . ."
-<            uncompress_untar ${VISIT_FILE}
-<            if [[ $? != 0 ]] ; then
-<               warn \
-< "Unable to untar ${VISIT_FILE}.  Corrupted file or out of space on device?"
-<               return 1
-<            fi
-<         elif [[ -f ${VISIT_FILE%.*} ]] ; then
-<            info "Unzipping ${VISIT_FILE%.*} . . ."
-<            $TAR xf ${VISIT_FILE%.*}
-<            if [[ $? != 0 ]] ; then
-<               warn  \
-< "Unable to untar ${VISIT_FILE%.*}.  Corrupted file or out of space on device?"
-<               return 1
-<            fi
-<         fi
-<     fi
----
-> #    if [[ "$DO_SVN" != "yes" || "$USE_VISIT_FILE" == "yes" ]] ; then
-> #        #
-> #        # Unzip the file, provided a gzipped file exists.
-> #        #
-> #        if [[ -f ${VISIT_FILE} ]] ; then
-> #           info "Unzipping/untarring ${VISIT_FILE} . . ."
-> #           uncompress_untar ${VISIT_FILE}
-> #           if [[ $? != 0 ]] ; then
-> #              warn \
-> #"Unable to untar ${VISIT_FILE}.  Corrupted file or out of space on device?"
-> #              return 1
-> #           fi
-> #        elif [[ -f ${VISIT_FILE%.*} ]] ; then
-> #           info "Unzipping ${VISIT_FILE%.*} . . ."
-> #           $TAR xf ${VISIT_FILE%.*}
-> #           if [[ $? != 0 ]] ; then
-> #              warn  \
-> #"Unable to untar ${VISIT_FILE%.*}.  Corrupted file or out of space on device?"
-> #              return 1
-> #           fi
-> #        fi
-> #    fi
+--- build_visit2_11_0.orig	2016-09-24 12:53:02.084527748 +0200
++++ build_visit2_11_0	2016-09-24 12:54:30.911401672 +0200
+@@ -4079,28 +4079,28 @@
+ 
+ function build_visit
+ {
+-    if [[ "$DO_SVN" != "yes" || "$USE_VISIT_FILE" == "yes" ]] ; then
+-        #
+-        # Unzip the file, provided a gzipped file exists.
+-        #
+-        if [[ -f ${VISIT_FILE} ]] ; then
+-            info "Unzipping/untarring ${VISIT_FILE} . . ."
+-            uncompress_untar ${VISIT_FILE}
+-            if [[ $? != 0 ]] ; then
+-                warn \
+-                    "Unable to untar ${VISIT_FILE}.  Corrupted file or out of space on device?"
+-                return 1
+-            fi
+-        elif [[ -f ${VISIT_FILE%.*} ]] ; then
+-            info "Unzipping ${VISIT_FILE%.*} . . ."
+-            $TAR xf ${VISIT_FILE%.*}
+-            if [[ $? != 0 ]] ; then
+-                warn  \
+-                    "Unable to untar ${VISIT_FILE%.*}.  Corrupted file or out of space on device?"
+-                return 1
+-            fi
+-        fi
+-    fi
++    #if [[ "$DO_SVN" != "yes" || "$USE_VISIT_FILE" == "yes" ]] ; then
++        ##
++        ## Unzip the file, provided a gzipped file exists.
++        ##
++        #if [[ -f ${VISIT_FILE} ]] ; then
++            #info "Unzipping/untarring ${VISIT_FILE} . . ."
++            #uncompress_untar ${VISIT_FILE}
++            #if [[ $? != 0 ]] ; then
++                #warn \
++                    #"Unable to untar ${VISIT_FILE}.  Corrupted file or out of space on device?"
++                #return 1
++            #fi
++        #elif [[ -f ${VISIT_FILE%.*} ]] ; then
++            #info "Unzipping ${VISIT_FILE%.*} . . ."
++            #$TAR xf ${VISIT_FILE%.*}
++            #if [[ $? != 0 ]] ; then
++                #warn  \
++                    #"Unable to untar ${VISIT_FILE%.*}.  Corrupted file or out of space on device?"
++                #return 1
++            #fi
++        #fi
++    #fi
+ 
+     #
+     # Set up the config-site file, which gives configure the information it
diff --git a/no_install_qt5.patch b/no_install_qt5.patch
new file mode 100644
index 000000000000..eae28c13a4c2
--- /dev/null
+++ b/no_install_qt5.patch
@@ -0,0 +1,14 @@
+--- build_visit2_11_0	2016-10-11 11:25:17.084725631 +0200
++++ build_visit2_11_0.new	2016-10-11 11:24:51.038404838 +0200
+@@ -16573,8 +16573,9 @@
+                 echo "SETUP_APP_VERSION(QT $QT_VERSION)" >> $HOSTCONF
+                 if [[ "$IS_QT5" == "yes" ]]; then
+                     echo "VISIT_OPTION_DEFAULT(VISIT_QT5 ON TYPE BOOL)" >> $HOSTCONF
+-                    echo "VISIT_OPTION_DEFAULT(VISIT_QT_DIR \${VISITHOME}/qt/\${QT_VERSION}/\${VISITARCH})" >> $HOSTCONF
+-                    echo "VISIT_OPTION_DEFAULT(VISIT_QT_BIN \${VISIT_QT_DIR}/bin)" >> $HOSTCONF
++                    echo "VISIT_OPTION_DEFAULT(VISIT_QT_DIR ${QT_INSTALL_DIR})" >> $HOSTCONF
++                    echo "VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${QT_BIN_DIR})" >> $HOSTCONF
++                    echo "SET(VISIT_QT_SKIP_INSTALL ON)" >> $HOSTCONF
+                 else 
+                     if [[ $USE_SYSTEM_QT == "yes" ]]; then
+                         echo "VISIT_OPTION_DEFAULT(QT_QTUITOOLS_INCLUDE_DIR ${QT_QTUITOOLS_INCLUDE_DIR})" >> $HOSTCONF