diff options
| author | eolianoe | 2015-10-21 14:28:51 +0200 |
|---|---|---|
| committer | eolianoe | 2015-10-21 14:28:51 +0200 |
| commit | 9a08e36ffab8a0610040e59ca758e0b8bad408d9 (patch) | |
| tree | 7c2d03c5ac8c1f61b3e90f1cd81b36c76364fd8e /no_extract_visit.patch | |
| parent | 3af071ccd956a956b6be86e13ff5518fe3cac84b (diff) | |
| download | aur-9a08e36ffab8a0610040e59ca758e0b8bad408d9.tar.gz | |
Upstream release 2.10.0 and switch to Qt5
Diffstat (limited to 'no_extract_visit.patch')
| -rw-r--r-- | no_extract_visit.patch | 70 |
1 files changed, 46 insertions, 24 deletions
diff --git a/no_extract_visit.patch b/no_extract_visit.patch index 7de7c3d7c367..a90c7b02b623 100644 --- a/no_extract_visit.patch +++ b/no_extract_visit.patch @@ -1,24 +1,46 @@ ---- build_visit2_9_2 2015-09-29 18:35:16.929401021 +0200 -+++ build_visit2_9_2.new 2015-09-29 18:36:49.289624506 +0200 -@@ -2433,14 +2433,14 @@ - return -1 - fi - elif [[ -f ${SRC_FILE%.*} ]] ; then -- info "Untarring ${SRC_FILE%.*} . . ." -- $TAR xf ${SRC_FILE%.*} -+ #info "Untarring ${SRC_FILE%.*} . . ." -+ #$TAR xf ${SRC_FILE%.*} - untarred_src=1 -- if [[ $? != 0 ]] ; then -- warn \ --"Unable to untar ${SRC_FILE%.*}. Corrupted file or out of space on device?" -- return -1 -- fi -+ #if [[ $? != 0 ]] ; then -+ #warn \ -+#"Unable to untar ${SRC_FILE%.*}. Corrupted file or out of space on device?" -+ #return -1 -+ #fi - fi - - return $untarred_src +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 |