diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | calculix_2.9_archlinux.patch (renamed from calculix_2.8_archlinux.patch) | 28 |
3 files changed, 26 insertions, 26 deletions
@@ -1,6 +1,6 @@ pkgbase = calculix pkgdesc = CalculiX: 3D finite element solver and post-processor (executables) - pkgver = 2.8p2 + pkgver = 2.9 pkgrel = 1 url = http://www.calculix.de/ arch = i686 @@ -18,12 +18,12 @@ pkgbase = calculix optdepends = calculix-doc: documentation and examples options = !makeflags options = !buildflags - source = http://www.dhondt.de/ccx_2.8p2.src.tar.bz2 - source = http://www.dhondt.de/cgx_2.8.all.tar.bz2 - source = calculix_2.8_archlinux.patch - sha256sums = a21feb1a498b5925ddc9f7f58cb486d930435db4a47d5c583dd73f5160431eb2 - sha256sums = 8e605df835f62748b2d7bba00d7c9ef0a2b797fb7f4ba4a8614062c1f0ba0875 - sha256sums = 6bca58a5d5632d26d926e0348be1fce4eafa27af272df6972f4f8b35b0ce9407 + source = http://www.dhondt.de/ccx_2.9.src.tar.bz2 + source = http://www.dhondt.de/cgx_2.9.all.tar.bz2 + source = calculix_2.9_archlinux.patch + sha256sums = 7ad617c93ff995ae186e8f23c204b5bdac884c0ffb672d60e972c8d3dae36705 + sha256sums = 62f252422c539fa972a02e7b533aa1ea4b9cb5e4fe28caafdea6f1dad7f7bcce + sha256sums = 0f4a6ca904b2a86599b4cd99875bff58e97a928b40e08e01871360a88750ea70 pkgname = calculix @@ -6,7 +6,7 @@ # may fail if make uses more than one job. pkgname=calculix -pkgver=2.8p2 +pkgver=2.9 pkgrel=1 pkgdesc="CalculiX: 3D finite element solver and post-processor (executables)" arch=('i686' 'x86_64') @@ -20,15 +20,15 @@ makedepends=('gcc-fortran') # This is needed because the minor version of ccx and cgx could differ _mainver="${pkgver:0:3}" _ccxver="${pkgver}" -_cgxver="${_mainver}" +_cgxver="${pkgver}" source=("http://www.dhondt.de/ccx_${_ccxver}.src.tar.bz2" "http://www.dhondt.de/cgx_${_cgxver}.all.tar.bz2" "calculix_${_mainver}_archlinux.patch") -sha256sums=('a21feb1a498b5925ddc9f7f58cb486d930435db4a47d5c583dd73f5160431eb2' - '8e605df835f62748b2d7bba00d7c9ef0a2b797fb7f4ba4a8614062c1f0ba0875' - '6bca58a5d5632d26d926e0348be1fce4eafa27af272df6972f4f8b35b0ce9407') +sha256sums=('7ad617c93ff995ae186e8f23c204b5bdac884c0ffb672d60e972c8d3dae36705' + '62f252422c539fa972a02e7b533aa1ea4b9cb5e4fe28caafdea6f1dad7f7bcce' + '0f4a6ca904b2a86599b4cd99875bff58e97a928b40e08e01871360a88750ea70') prepare() { diff --git a/calculix_2.8_archlinux.patch b/calculix_2.9_archlinux.patch index ed8307f2e55e..45f00172d93e 100644 --- a/calculix_2.8_archlinux.patch +++ b/calculix_2.9_archlinux.patch @@ -1,6 +1,6 @@ -diff -ur CalculiX_orig/ccx_2.8p2/src/Makefile CalculiX/ccx_2.8/src/Makefile ---- CalculiX_orig/ccx_2.8p2/src/Makefile -+++ CalculiX/ccx_2.8p2/src/Makefile +diff -ur CalculiX_orig/ccx_2.9/src/Makefile CalculiX/ccx_2.8/src/Makefile +--- CalculiX_orig/ccx_2.9/src/Makefile ++++ CalculiX/ccx_2.9/src/Makefile @@ -2,2 +2,2 @@ -CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE +CFLAGS = -Wall -O3 -I /usr/include/spooles -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE @@ -13,9 +13,9 @@ diff -ur CalculiX_orig/ccx_2.8p2/src/Makefile CalculiX/ccx_2.8/src/Makefile - ../../../ARPACK/libarpack_INTEL.a \ - -lpthread -lm -lc +LIBS = -lpthread -lm -lc -lspooles -larpack -lblas -diff -ur CalculiX_orig/cgx_2.8/src/Makefile CalculiX/cgx_2.8/src/Makefile ---- CalculiX_orig/cgx_2.8/src/Makefile -+++ CalculiX/cgx_2.8/src/Makefile +diff -ur CalculiX_orig/cgx_2.9/src/Makefile CalculiX/cgx_2.8/src/Makefile +--- CalculiX_orig/cgx_2.9/src/Makefile ++++ CalculiX/cgx_2.9/src/Makefile @@ -1,14 +1,8 @@ CFLAGS = -O3 -Wall \ -I./ \ @@ -37,20 +37,20 @@ diff -ur CalculiX_orig/cgx_2.8/src/Makefile CalculiX/cgx_2.8/src/Makefile @@ -59,1 +53,1 @@ - ../../libSNL/src/*.cpp +# ../../libSNL/src/*.cpp -diff -ur CalculiX_orig/cgx_2.8/src/cgx.h CalculiX/cgx_2.8/src/cgx.h ---- CalculiX_orig/cgx_2.8/src/cgx.h -+++ CalculiX/cgx_2.8/src/cgx.h +diff -ur CalculiX_orig/cgx_2.9/src/cgx.h CalculiX/cgx_2.8/src/cgx.h +--- CalculiX_orig/cgx_2.9/src/cgx.h ++++ CalculiX/cgx_2.9/src/cgx.h @@ -81,8 +81,8 @@ #elif defined AFLIB -- #define HELPFILE {"/usr/local/CalculiX/cgx_2.8/doc/cgx/cgx.html",\ -- "/usr/local/CalculiX/ccx_2.8/doc/ccx/ccx.html",\ -- "/usr/local/CalculiX/cgx_2.8/doc/aflib/aflib.pdf"} +- #define HELPFILE {"/usr/local/CalculiX/cgx_2.9/doc/cgx/cgx.html",\ +- "/usr/local/CalculiX/ccx_2.9/doc/ccx/ccx.html",\ +- "/usr/local/CalculiX/cgx_2.9/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.8/doc/cgx/cgx.html",\ -- "/usr/local/CalculiX/ccx_2.8/doc/ccx/ccx.html"} +- #define HELPFILE {"/usr/local/CalculiX/cgx_2.9/doc/cgx/cgx.html",\ +- "/usr/local/CalculiX/ccx_2.9/doc/ccx/ccx.html"} + #define HELPFILE {"/usr/share/doc/cgx/cgx.html",\ + "/usr/share/doc/ccx/ccx.html"} #endif |