diff options
author | Maurizio D'Addona | 2020-02-17 17:41:22 +0100 |
---|---|---|
committer | Maurizio D'Addona | 2020-02-17 17:41:22 +0100 |
commit | e1a2fdfe3093c4c4adf1ee18b6133201d15a26c8 (patch) | |
tree | 5bbc25f3bc0bdb14ed0219b188f5bea63cee4e10 | |
parent | 34635324b8075f5d2bffae5483baa00ca1c887f2 (diff) | |
download | aur-e1a2fdfe3093c4c4adf1ee18b6133201d15a26c8.tar.gz |
Updates cgx tp version 2.16.1
-rwxr-xr-x | .SRCINFO | 8 | ||||
-rwxr-xr-x | PKGBUILD | 12 | ||||
-rwxr-xr-x | calculix_2.16_archlinux.patch | 22 |
3 files changed, 21 insertions, 21 deletions
@@ -1,7 +1,7 @@ pkgbase = calculix pkgdesc = CalculiX: 3D finite element solver and post-processor (executables) pkgver = 2.16 - pkgrel = 1 + pkgrel = 2 url = http://www.calculix.de/ arch = i686 arch = x86_64 @@ -21,12 +21,12 @@ pkgbase = calculix options = !buildflags source = http://www.dhondt.de/ccx_2.16.src.tar.bz2 source = http://www.dhondt.de/ccx_2.16.test.tar.bz2 - source = http://www.dhondt.de/cgx_2.16.all.tar.bz2 + source = http://www.dhondt.de/cgx_2.16.1.all.tar.bz2 source = calculix_2.16_archlinux.patch sha256sums = ebd95a0e4d52a3a8fb969eefc85417c82f649f25526bb6d83d69868ab44d47b7 sha256sums = fcbeb4d03a960ec26b5027fd729f6a13b607ab5fece4c5673c16fa740592f687 - sha256sums = 8389dbe31aa2d371f45f921743f39e91979e8bebb6cf43d5e645331c2f036ca1 - sha256sums = e4017aae611a87b3c82357d9ee8794a38cf714d36a8da83d8c0ad546dfaad8f4 + sha256sums = 0125efb8dfe47c920b266d8c6a326677eae3967a113a75c079405c1d9415cb54 + sha256sums = 54f34feffd3c07b1cc1e1390e50b3f2db575c7f9c60d1fb4515e440d36c69bbd pkgname = calculix @@ -7,7 +7,7 @@ pkgname=calculix pkgver=2.16 -pkgrel=1 +pkgrel=2 pkgdesc="CalculiX: 3D finite element solver and post-processor (executables)" arch=('i686' 'x86_64') options=(!makeflags !buildflags) @@ -23,13 +23,13 @@ checkdepends=('perl') # when upstream fixes the issue source=("http://www.dhondt.de/ccx_${pkgver}.src.tar.bz2" "http://www.dhondt.de/ccx_${pkgver}.test.tar.bz2" - "http://www.dhondt.de/cgx_${pkgver}.all.tar.bz2" + "http://www.dhondt.de/cgx_${pkgver}.1.all.tar.bz2" "calculix_${pkgver}_archlinux.patch") sha256sums=('ebd95a0e4d52a3a8fb969eefc85417c82f649f25526bb6d83d69868ab44d47b7' 'fcbeb4d03a960ec26b5027fd729f6a13b607ab5fece4c5673c16fa740592f687' - '8389dbe31aa2d371f45f921743f39e91979e8bebb6cf43d5e645331c2f036ca1' - 'e4017aae611a87b3c82357d9ee8794a38cf714d36a8da83d8c0ad546dfaad8f4') + '0125efb8dfe47c920b266d8c6a326677eae3967a113a75c079405c1d9415cb54' + '54f34feffd3c07b1cc1e1390e50b3f2db575c7f9c60d1fb4515e440d36c69bbd') prepare() { @@ -50,7 +50,7 @@ build() make msg2 "Building gui..." - cd "${srcdir}/CalculiX/cgx_${pkgver}/src" + cd "${srcdir}/CalculiX/cgx_${pkgver}.1/src" make msg2 "Build complete" @@ -122,7 +122,7 @@ package() install -d ${pkgdir}/usr/bin install -Dm755 ${srcdir}/CalculiX/ccx_${pkgver}/src/ccx_${pkgver} ${pkgdir}/usr/bin/ccx - install -Dm755 ${srcdir}/CalculiX/cgx_${pkgver}/src/cgx ${pkgdir}/usr/bin/cgx + install -Dm755 ${srcdir}/CalculiX/cgx_${pkgver}.1/src/cgx ${pkgdir}/usr/bin/cgx msg2 "Done" } diff --git a/calculix_2.16_archlinux.patch b/calculix_2.16_archlinux.patch index 5279f95f1831..a6050cdf5001 100755 --- a/calculix_2.16_archlinux.patch +++ b/calculix_2.16_archlinux.patch @@ -13,9 +13,9 @@ diff -ur CalculiX_orig/ccx_2.16/src/Makefile CalculiX/ccx_2.16/src/Makefile - ../../../ARPACK/libarpack_INTEL.a \ - -lpthread -lm -lc +LIBS = -lpthread -lm -lc -lspooles -larpack -lblas -llapack -diff -ur CalculiX_orig/cgx_2.16/src/Makefile CalculiX/cgx_2.16/src/Makefile ---- CalculiX_orig/cgx_2.16/src/Makefile -+++ CalculiX/cgx_2.16/src/Makefile +diff -ur CalculiX_orig/cgx_2.16.1/src/Makefile CalculiX/cgx_2.16/src/Makefile +--- CalculiX_orig/cgx_2.16-1/src/Makefile ++++ CalculiX/cgx_2.16.1/src/Makefile @@ -1,14 +1,8 @@ CFLAGS = -O3 -Wall \ -I./ \ @@ -37,26 +37,26 @@ diff -ur CalculiX_orig/cgx_2.16/src/Makefile CalculiX/cgx_2.16/src/Makefile @@ -59,1 +53,1 @@ - ../../libSNL/src/*.cpp +# ../../libSNL/src/*.cpp -diff -ur CalculiX_orig/cgx_2.16/src/cgx.h CalculiX/cgx_2.16/src/cgx.h ---- CalculiX_orig/cgx_2.16/src/cgx.h -+++ CalculiX/cgx_2.16/src/cgx.h +diff -ur CalculiX_orig/cgx_2.16.1/src/cgx.h CalculiX/cgx_2.16/src/cgx.h +--- CalculiX_orig/cgx_2.16.1/src/cgx.h ++++ CalculiX/cgx_2.16.1/src/cgx.h @@ -81,8 +81,8 @@ #elif defined AFLIB -- #define HELPFILE {"/usr/local/CalculiX/cgx_2.16/doc/cgx/cgx.html",\ +- #define HELPFILE {"/usr/local/CalculiX/cgx_2.16.1/doc/cgx/cgx.html",\ - "/usr/local/CalculiX/ccx_2.16/doc/ccx/ccx.html",\ - "/usr/local/CalculiX/cgx_2.8/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.16/doc/cgx/cgx.html",\ +- #define HELPFILE {"/usr/local/CalculiX/cgx_2.16.1/doc/cgx/cgx.html",\ - "/usr/local/CalculiX/ccx_2.16/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.16/src/uselibSNL.h CalculiX/cgx_2.16/src/uselibSNL.h ---- CalculiX_orig/cgx_2.16/src/uselibSNL.h -+++ CalculiX/cgx_2.16/src/uselibSNL.h +diff -ur CalculiX_orig/cgx_2.16.1/src/uselibSNL.h CalculiX/cgx_2.16/src/uselibSNL.h +--- CalculiX_orig/cgx_2.16.1/src/uselibSNL.h ++++ CalculiX/cgx_2.16.1/src/uselibSNL.h @@ -8,1 +8,3 @@ #include <cgx.h> +#undef max |