Update to version 2.12

3 files changed, 29 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8920e2859cae..46d44a3e315c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Aug  8 09:21:51 UTC 2016
+# Tue Apr  4 06:50:04 UTC 2017
 pkgbase = calculix
 	pkgdesc = CalculiX: 3D finite element solver and post-processor (executables)
-	pkgver = 2.11
+	pkgver = 2.12
 	pkgrel = 1
 	url = http://www.calculix.de/
 	arch = i686
@@ -20,12 +20,12 @@ pkgbase = calculix
 	optdepends = calculix-doc: documentation and examples
 	options = !makeflags
 	options = !buildflags
-	source = http://www.dhondt.de/ccx_2.11.src.tar.bz2
-	source = http://www.dhondt.de/cgx_2.11.all.tar.bz2
-	source = calculix_2.11_archlinux.patch
-	sha256sums = 11588c7a2836cadbc4c6f2b866b0daa67512eebe755887094a76a997e6dc2493
-	sha256sums = 11c6ab303121708463320dbf85ed300caddad02d2388b2920b8b960c5b4c1942
-	sha256sums = d22826c4e7c5b1e579d49ff2166a0497f67c0a8640ae9376c174a3a8d20bea7f
+	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 = a848dbf9c9a88957b49b5d71eff3bc4e4a5ff731e954672ee7a91efa1dca27bd
+	sha256sums = e99905bacaede0d09a232136b0eef9b53097e73578c3be9478404c646fad24c5
 
 pkgname = calculix
 
diff --git a/PKGBUILD b/PKGBUILD
index b2d610765166..3de996e51524 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 #       may fail if make uses more than one job.
 
 pkgname=calculix
-pkgver=2.11
+pkgver=2.12
 pkgrel=1
 pkgdesc="CalculiX: 3D finite element solver and post-processor (executables)"
 arch=('i686' 'x86_64')
@@ -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=('11588c7a2836cadbc4c6f2b866b0daa67512eebe755887094a76a997e6dc2493'
-            '11c6ab303121708463320dbf85ed300caddad02d2388b2920b8b960c5b4c1942'
-            'd22826c4e7c5b1e579d49ff2166a0497f67c0a8640ae9376c174a3a8d20bea7f')
+sha256sums=('d75427dfb6db70fdfbb5939df22da8addf0ea4522cff32c9cdc4029e39b6b914'
+            'a848dbf9c9a88957b49b5d71eff3bc4e4a5ff731e954672ee7a91efa1dca27bd'
+            'e99905bacaede0d09a232136b0eef9b53097e73578c3be9478404c646fad24c5')
 
 prepare()
 {
diff --git a/calculix_2.11_archlinux.patch b/calculix_2.12_archlinux.patch
index 0c80b9818116..4b4262f3ff46 100644
--- a/calculix_2.11_archlinux.patch
+++ b/calculix_2.12_archlinux.patch
@@ -1,6 +1,6 @@
-diff -ur CalculiX_orig/ccx_2.11/src/Makefile CalculiX/ccx_2.11/src/Makefile
---- CalculiX_orig/ccx_2.11/src/Makefile
-+++ CalculiX/ccx_2.11/src/Makefile
+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
 @@ -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.11/src/Makefile
 -	../../../ARPACK/libarpack_INTEL.a \
 -       -lpthread -lm -lc
 +LIBS = -lpthread -lm -lc -lspooles -larpack -lblas
-diff -ur CalculiX_orig/cgx_2.11/src/Makefile CalculiX/cgx_2.11/src/Makefile
---- CalculiX_orig/cgx_2.11/src/Makefile
-+++ CalculiX/cgx_2.11/src/Makefile
+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
 @@ -1,14 +1,8 @@
  CFLAGS = -O3 -Wall \
    -I./ \
@@ -37,35 +37,27 @@ diff -ur CalculiX_orig/cgx_2.11/src/Makefile CalculiX/cgx_2.11/src/Makefile
 @@ -59,1 +53,1 @@
 - ../../libSNL/src/*.cpp
 +# ../../libSNL/src/*.cpp
-diff -ur CalculiX_orig/cgx_2.11/src/cgx.h CalculiX/cgx_2.11/src/cgx.h
---- CalculiX_orig/cgx_2.11/src/cgx.h
-+++ CalculiX/cgx_2.11/src/cgx.h
+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
 @@ -81,8 +81,8 @@
  #elif defined AFLIB
--  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.11/doc/cgx/cgx.html",\
--    "/usr/local/CalculiX/ccx_2.11/doc/ccx/ccx.html",\
--    "/usr/local/CalculiX/cgx_2.11/doc/aflib/aflib.pdf"}
+-  #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/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.11/doc/cgx/cgx.html",\
--    "/usr/local/CalculiX/ccx_2.11/doc/ccx/ccx.html"}
+-  #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/share/doc/cgx/cgx.html",\
 +    "/usr/share/doc/ccx/ccx.html"}
  #endif
-diff -ur CalculiX_orig/cgx_2.11/src/uselibSNL.h CalculiX/cgx_2.11/src/uselibSNL.h
---- CalculiX_orig/cgx_2.11/src/uselibSNL.h
-+++ CalculiX/cgx_2.11/src/uselibSNL.h
+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
 @@ -8,1 +8,3 @@
  #include <cgx.h>
 +#undef max
 +#undef min
-diff -ur CalculiX_orig/cgx_2.11/src/uselibSNL.cpp CalculiX/cgx_2.11/src/uselibSNL.cpp
---- CalculiX_orig/cgx_2.11/src/uselibSNL.cpp
-+++ CalculiX/cgx_2.11/src/uselibSNL.cpp
-@@ -1243,3 +1243,3 @@
-   char buffer[MAX_LINE_LENGTH];
--  int foundPntAtPole[2]={0.,0.}, foundPntAtMeridian[2]={0.,0.};
-+  int foundPntAtPole[2]={0,0}, foundPntAtMeridian[2]={0,0};
-   double umin, umax,vmin,vmax, du,dv;