diff options
author | Maurizio D'Addona | 2017-10-11 12:04:03 +0200 |
---|---|---|
committer | Maurizio D'Addona | 2017-10-11 12:08:51 +0200 |
commit | 12e5a63a60e29ca82356cd61f6a65623b8d027b0 (patch) | |
tree | 722fb37e27bc317ec599c198cb52579aa796bab7 | |
parent | ab148147427656f1c19660d0198a0083867f8c80 (diff) | |
download | aur-12e5a63a60e29ca82356cd61f6a65623b8d027b0.tar.gz |
Update to version 2.13
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | PKGBUILD | 10 | ||||
-rw-r--r-- | calculix_2.13_archlinux.patch (renamed from calculix_2.12_archlinux.patch) | 34 |
3 files changed, 31 insertions, 31 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Jun 29 09:19:29 UTC 2017 +# Wed Oct 11 10:00:36 UTC 2017 pkgbase = calculix pkgdesc = CalculiX: 3D finite element solver and post-processor (executables) - pkgver = 2.12 - pkgrel = 2 + pkgver = 2.13 + pkgrel = 1 url = http://www.calculix.de/ arch = i686 arch = x86_64 @@ -20,12 +20,12 @@ pkgbase = calculix optdepends = calculix-doc: documentation and examples options = !makeflags options = !buildflags - source = http://www.dhondt.de/ccx_2.12.src.tar.bz2 - source = http://www.dhondt.de/cgx_2.12.all.tar.bz2 - source = calculix_2.12_archlinux.patch - sha256sums = d75427dfb6db70fdfbb5939df22da8addf0ea4522cff32c9cdc4029e39b6b914 - sha256sums = 504e5230902fb3c18001807c1394375b1cf81a10a0e99bd03f121c9b38717a83 - sha256sums = e99905bacaede0d09a232136b0eef9b53097e73578c3be9478404c646fad24c5 + source = http://www.dhondt.de/ccx_2.13.src.tar.bz2 + source = http://www.dhondt.de/cgx_2.13.all.tar.bz2 + source = calculix_2.13_archlinux.patch + sha256sums = d620dd4e12fed9fa0a13a95200fe2f2ae799d94576353c8b63be0957895f737b + sha256sums = dfbe696315347981bc740e55638e3ef0161afde2597b1f63c732021f852289b7 + sha256sums = 1153c834e9239018cd4fd1adf666ae37a01de9bf05dc75c62f11da6d22a703a9 pkgname = calculix @@ -6,8 +6,8 @@ # may fail if make uses more than one job. pkgname=calculix -pkgver=2.12 -pkgrel=2 +pkgver=2.13 +pkgrel=1 pkgdesc="CalculiX: 3D finite element solver and post-processor (executables)" arch=('i686' 'x86_64') options=(!makeflags !buildflags) @@ -26,9 +26,9 @@ source=("http://www.dhondt.de/ccx_${_ccxver}.src.tar.bz2" "http://www.dhondt.de/cgx_${_cgxver}.all.tar.bz2" "calculix_${_mainver}_archlinux.patch") -sha256sums=('d75427dfb6db70fdfbb5939df22da8addf0ea4522cff32c9cdc4029e39b6b914' - '504e5230902fb3c18001807c1394375b1cf81a10a0e99bd03f121c9b38717a83' - 'e99905bacaede0d09a232136b0eef9b53097e73578c3be9478404c646fad24c5') +sha256sums=('d620dd4e12fed9fa0a13a95200fe2f2ae799d94576353c8b63be0957895f737b' + 'dfbe696315347981bc740e55638e3ef0161afde2597b1f63c732021f852289b7' + '1153c834e9239018cd4fd1adf666ae37a01de9bf05dc75c62f11da6d22a703a9') prepare() { diff --git a/calculix_2.12_archlinux.patch b/calculix_2.13_archlinux.patch index 4b4262f3ff46..1da5d6099595 100644 --- a/calculix_2.12_archlinux.patch +++ b/calculix_2.13_archlinux.patch @@ -1,6 +1,6 @@ -diff -ur CalculiX_orig/ccx_2.11/src/Makefile CalculiX/ccx_2.12/src/Makefile ---- CalculiX_orig/ccx_2.12/src/Makefile -+++ CalculiX/ccx_2.12/src/Makefile +diff -ur CalculiX_orig/ccx_2.13/src/Makefile CalculiX/ccx_2.13/src/Makefile +--- CalculiX_orig/ccx_2.13/src/Makefile ++++ CalculiX/ccx_2.13/src/Makefile @@ -2,2 +2,2 @@ -CFLAGS = -Wall -O3 -fopenmp -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT +CFLAGS = -Wall -O3 -fopenmp -I /usr/include/spooles -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT @@ -13,9 +13,9 @@ diff -ur CalculiX_orig/ccx_2.11/src/Makefile CalculiX/ccx_2.12/src/Makefile - ../../../ARPACK/libarpack_INTEL.a \ - -lpthread -lm -lc +LIBS = -lpthread -lm -lc -lspooles -larpack -lblas -diff -ur CalculiX_orig/cgx_2.12/src/Makefile CalculiX/cgx_2.11/src/Makefile ---- CalculiX_orig/cgx_2.12/src/Makefile -+++ CalculiX/cgx_2.12/src/Makefile +diff -ur CalculiX_orig/cgx_2.13/src/Makefile CalculiX/cgx_2.13/src/Makefile +--- CalculiX_orig/cgx_2.13/src/Makefile ++++ CalculiX/cgx_2.13/src/Makefile @@ -1,14 +1,8 @@ CFLAGS = -O3 -Wall \ -I./ \ @@ -37,26 +37,26 @@ diff -ur CalculiX_orig/cgx_2.12/src/Makefile CalculiX/cgx_2.11/src/Makefile @@ -59,1 +53,1 @@ - ../../libSNL/src/*.cpp +# ../../libSNL/src/*.cpp -diff -ur CalculiX_orig/cgx_2.12/src/cgx.h CalculiX/cgx_2.11/src/cgx.h ---- CalculiX_orig/cgx_2.12/src/cgx.h -+++ CalculiX/cgx_2.12/src/cgx.h +diff -ur CalculiX_orig/cgx_2.13/src/cgx.h CalculiX/cgx_2.13/src/cgx.h +--- CalculiX_orig/cgx_2.13/src/cgx.h ++++ CalculiX/cgx_2.13/src/cgx.h @@ -81,8 +81,8 @@ #elif defined AFLIB -- #define HELPFILE {"/usr/local/CalculiX/cgx_2.12/doc/cgx/cgx.html",\ -- "/usr/local/CalculiX/ccx_2.12/doc/ccx/ccx.html",\ -- "/usr/local/CalculiX/cgx_2.12/doc/aflib/aflib.pdf"} +- #define HELPFILE {"/usr/local/CalculiX/cgx_2.13/doc/cgx/cgx.html",\ +- "/usr/local/CalculiX/ccx_2.13/doc/ccx/ccx.html",\ +- "/usr/local/CalculiX/cgx_2.13/doc/aflib/aflib.pdf"} + #define HELPFILE {"/usr/share/doc/cgx/cgx.html",\ + "/usr/share/doc/doc/ccx/ccx.html",\ + "/usr/share/doc/doc/aflib/aflib.pdf"} #else -- #define HELPFILE {"/usr/local/CalculiX/cgx_2.12/doc/cgx/cgx.html",\ -- "/usr/local/CalculiX/ccx_2.12/doc/ccx/ccx.html"} +- #define HELPFILE {"/usr/local/CalculiX/cgx_2.13/doc/cgx/cgx.html",\ +- "/usr/local/CalculiX/ccx_2.13/doc/ccx/ccx.html"} + #define HELPFILE {"/usr/share/doc/cgx/cgx.html",\ + "/usr/share/doc/ccx/ccx.html"} #endif -diff -ur CalculiX_orig/cgx_2.12/src/uselibSNL.h CalculiX/cgx_2.12/src/uselibSNL.h ---- CalculiX_orig/cgx_2.12/src/uselibSNL.h -+++ CalculiX/cgx_2.12/src/uselibSNL.h +diff -ur CalculiX_orig/cgx_2.13/src/uselibSNL.h CalculiX/cgx_2.13/src/uselibSNL.h +--- CalculiX_orig/cgx_2.13/src/uselibSNL.h ++++ CalculiX/cgx_2.13/src/uselibSNL.h @@ -8,1 +8,3 @@ #include <cgx.h> +#undef max |