Update to version 2.10

3 files changed, 31 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3255a7e6c7dd..963e55b54a95 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Dec 12 10:18:07 UTC 2015
+# Mon Mar  7 05:47:02 UTC 2016
 pkgbase = calculix
 	pkgdesc = CalculiX: 3D finite element solver and post-processor (executables)
-	pkgver = 2.9
-	pkgrel = 3
+	pkgver = 2.10
+	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.9.src.tar.bz2
-	source = http://www.dhondt.de/cgx_2.9.all.tar.bz2
-	source = calculix_2.9_archlinux.patch
-	sha256sums = 755e173cfb712c83cefef22cfa43f06caf495e5dffbecf8df3d47f3cf6e6d44d
-	sha256sums = eccce9424a05396c218f1c8cb3c3e92ffd847d4c9e24e5fe7e5812688bcc1f69
-	sha256sums = 0f4a6ca904b2a86599b4cd99875bff58e97a928b40e08e01871360a88750ea70
+	source = http://www.dhondt.de/ccx_2.10.src.tar.bz2
+	source = http://www.dhondt.de/cgx_2.10.all.tar.bz2
+	source = calculix_2.10_archlinux.patch
+	sha256sums = 693497d19d8dd2a5376e64e038d5c248d87f0e2df46d409a83bf976596b319f5
+	sha256sums = b2ea974003374c28b8e24f76f8a6c142db470a8c2a53013e3735efe78e98e84d
+	sha256sums = f171dd982aca9204b24defc3b0a674747b17b5fdb675caf5eff11a5c794cd757
 
 pkgname = calculix
 
diff --git a/PKGBUILD b/PKGBUILD
index cc0cf36602d5..f8b589ede837 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 #       may fail if make uses more than one job.
 
 pkgname=calculix
-pkgver=2.9
-pkgrel=3
+pkgver=2.10
+pkgrel=1
 pkgdesc="CalculiX: 3D finite element solver and post-processor (executables)"
 arch=('i686' 'x86_64')
 options=(!makeflags !buildflags)
@@ -18,7 +18,7 @@ optdepends=('calculix-doc: documentation and examples')
 makedepends=('gcc-fortran')
 
 # This is needed because the minor version of ccx and cgx could differ
-_mainver="${pkgver:0:3}"
+_mainver="${pkgver:0:4}"
 _ccxver="${pkgver}"
 _cgxver="${pkgver}"
 
@@ -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=('755e173cfb712c83cefef22cfa43f06caf495e5dffbecf8df3d47f3cf6e6d44d'
-            'eccce9424a05396c218f1c8cb3c3e92ffd847d4c9e24e5fe7e5812688bcc1f69'
-            '0f4a6ca904b2a86599b4cd99875bff58e97a928b40e08e01871360a88750ea70')
+sha256sums=('693497d19d8dd2a5376e64e038d5c248d87f0e2df46d409a83bf976596b319f5'
+            'b2ea974003374c28b8e24f76f8a6c142db470a8c2a53013e3735efe78e98e84d'
+            'f171dd982aca9204b24defc3b0a674747b17b5fdb675caf5eff11a5c794cd757')
 
 prepare()
 {
diff --git a/calculix_2.9_archlinux.patch b/calculix_2.10_archlinux.patch
index 45f00172d93e..18193cca55fb 100644
--- a/calculix_2.9_archlinux.patch
+++ b/calculix_2.10_archlinux.patch
@@ -1,9 +1,9 @@
-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
+diff -ur CalculiX_orig/ccx_2.10/src/Makefile CalculiX/ccx_2.10/src/Makefile
+--- CalculiX_orig/ccx_2.19/src/Makefile
++++ CalculiX/ccx_2.10/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
+-CFLAGS = -Wall -O3 -fopenmp -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
++CFLAGS = -Wall -O3 -fopenmp -I /usr/include/spooles -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
  FFLAGS = -Wall -O3 -fopenmp
 @@ -21,6 +21,1 @@
 -DIR=../../../SPOOLES.2.2
@@ -13,9 +13,9 @@ diff -ur CalculiX_orig/ccx_2.9/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.9/src/Makefile CalculiX/cgx_2.8/src/Makefile
---- CalculiX_orig/cgx_2.9/src/Makefile
-+++ CalculiX/cgx_2.9/src/Makefile
+diff -ur CalculiX_orig/cgx_2.10/src/Makefile CalculiX/cgx_2.10/src/Makefile
+--- CalculiX_orig/cgx_2.10/src/Makefile
++++ CalculiX/cgx_2.10/src/Makefile
 @@ -1,14 +1,8 @@
  CFLAGS = -O3 -Wall \
    -I./ \
@@ -37,20 +37,20 @@ diff -ur CalculiX_orig/cgx_2.9/src/Makefile CalculiX/cgx_2.8/src/Makefile
 @@ -59,1 +53,1 @@
 - ../../libSNL/src/*.cpp
 +# ../../libSNL/src/*.cpp
-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
+diff -ur CalculiX_orig/cgx_2.10/src/cgx.h CalculiX/cgx_2.10/src/cgx.h
+--- CalculiX_orig/cgx_2.10/src/cgx.h
++++ CalculiX/cgx_2.10/src/cgx.h
 @@ -81,8 +81,8 @@
  #elif defined AFLIB
--  #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/local/CalculiX/cgx_2.10/doc/cgx/cgx.html",\
+-    "/usr/local/CalculiX/ccx_2.10/doc/ccx/ccx.html",\
+-    "/usr/local/CalculiX/cgx_2.10/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.9/doc/cgx/cgx.html",\
--    "/usr/local/CalculiX/ccx_2.9/doc/ccx/ccx.html"}
+-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.10/doc/cgx/cgx.html",\
+-    "/usr/local/CalculiX/ccx_2.10/doc/ccx/ccx.html"}
 +  #define     HELPFILE        {"/usr/share/doc/cgx/cgx.html",\
 +    "/usr/share/doc/ccx/ccx.html"}
  #endif