Update to version 2.17

3 files changed, 42 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index acd02206285e..2005d8393bc6 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = calculix
 	pkgdesc = CalculiX: 3D finite element solver and post-processor (executables)
-	pkgver = 2.16
-	pkgrel = 4
+	pkgver = 2.17
+	pkgrel = 1
 	url = http://www.calculix.de/
 	arch = i686
 	arch = x86_64
@@ -20,14 +20,14 @@ pkgbase = calculix
 	optdepends = calculix-doc: documentation and examples
 	options = !makeflags
 	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.1.all.tar.bz2
-	source = calculix_2.16_archlinux.patch
-	sha256sums = ebd95a0e4d52a3a8fb969eefc85417c82f649f25526bb6d83d69868ab44d47b7
-	sha256sums = fcbeb4d03a960ec26b5027fd729f6a13b607ab5fece4c5673c16fa740592f687
-	sha256sums = 0125efb8dfe47c920b266d8c6a326677eae3967a113a75c079405c1d9415cb54
-	sha256sums = 089e57f785c5c95669e133a2b5effb9c238a123b6d68ac568cf22ef71199a91e
+	source = http://www.dhondt.de/ccx_2.17.src.tar.bz2
+	source = http://www.dhondt.de/ccx_2.17.test.tar.bz2
+	source = http://www.dhondt.de/cgx_2.17.all.tar.bz2
+	source = calculix_2.17_archlinux.patch
+	sha256sums = ca708ad4aa729d9f84a9faba343c1bcc0b7cc84ed372616ebb55c8e6fa8f6e50
+	sha256sums = 798f94e536197bb10a74bae096f2a29a5111239020e7d10f93e1ad3d90c370cf
+	sha256sums = 01b32864714d7ed7c760567e3a04077f3e41fe171d1804b305c96c344b0e4d2e
+	sha256sums = a3c8c91c6ecd4b958ed366fb78cd6ebde077d238f7aaa2d0714fab31d6ff48c9
 
 pkgname = calculix
 
diff --git a/PKGBUILD b/PKGBUILD
index 2b257efc62fc..d96ccc28994b 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 #       may fail if make uses more than one job.
 
 pkgname=calculix
-pkgver=2.16
-pkgrel=4
+pkgver=2.17
+pkgrel=1
 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}.1.all.tar.bz2"
+      	"http://www.dhondt.de/cgx_${pkgver}.all.tar.bz2"
         "calculix_${pkgver}_archlinux.patch")
 
-sha256sums=('ebd95a0e4d52a3a8fb969eefc85417c82f649f25526bb6d83d69868ab44d47b7'
-            'fcbeb4d03a960ec26b5027fd729f6a13b607ab5fece4c5673c16fa740592f687'
-            '0125efb8dfe47c920b266d8c6a326677eae3967a113a75c079405c1d9415cb54'
-            '089e57f785c5c95669e133a2b5effb9c238a123b6d68ac568cf22ef71199a91e')
+sha256sums=('ca708ad4aa729d9f84a9faba343c1bcc0b7cc84ed372616ebb55c8e6fa8f6e50'
+            '798f94e536197bb10a74bae096f2a29a5111239020e7d10f93e1ad3d90c370cf'
+            '01b32864714d7ed7c760567e3a04077f3e41fe171d1804b305c96c344b0e4d2e'
+            'a3c8c91c6ecd4b958ed366fb78cd6ebde077d238f7aaa2d0714fab31d6ff48c9')
 
 prepare()
 {
@@ -50,7 +50,7 @@ build()
     make
     
     msg2 "Building gui..."
-    cd "${srcdir}/CalculiX/cgx_${pkgver}.1/src"
+    cd "${srcdir}/CalculiX/cgx_${pkgver}/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}.1/src/cgx ${pkgdir}/usr/bin/cgx
+    install -Dm755 ${srcdir}/CalculiX/cgx_${pkgver}/src/cgx ${pkgdir}/usr/bin/cgx
 
     msg2 "Done"  
 }
diff --git a/calculix_2.16_archlinux.patch b/calculix_2.17_archlinux.patch
index 1a26f20e8a65..584ddb8982ea 100755
--- a/calculix_2.16_archlinux.patch
+++ b/calculix_2.17_archlinux.patch
@@ -1,6 +1,6 @@
-diff -ur CalculiX_orig/ccx_2.16/src/Makefile CalculiX/ccx_2.16/src/Makefile
---- CalculiX_orig/ccx_2.16/src/Makefile
-+++ CalculiX/ccx_2.16/src/Makefile
+diff -ur CalculiX_orig/ccx_2.17/src/Makefile CalculiX/ccx_2.17/src/Makefile
+--- CalculiX_orig/ccx_2.17/src/Makefile
++++ CalculiX/ccx_2.17/src/Makefile
 @@ -2,2 +2,2 @@ 
 -CFLAGS = -Wall -O2 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
 -FFLAGS = -Wall -O2
@@ -14,12 +14,11 @@ 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.1/src/Makefile CalculiX/cgx_2.16/src/Makefile
---- CalculiX_orig/cgx_2.16-1/src/Makefile
-+++ CalculiX/cgx_2.16.1/src/Makefile
+diff -ur CalculiX_orig/cgx_2.17/src/Makefile CalculiX/cgx_2.16/src/Makefile
+--- CalculiX_orig/cgx_2.17/src/Makefile
++++ CalculiX/cgx_2.17/src/Makefile
 @@ -1,14 +1,8 @@
--CFLAGS = -O2 -Wall -Wno-narrowing \
-+CFLAGS = -O2 -Wall -Wno-narrowing -fcommon\
+ CFLAGS = -O2 -Wall -Wno-narrowing \
    -I./ \
 -  -I/usr/include \
 -  -I/usr/include/GL \
@@ -39,26 +38,30 @@ diff -ur CalculiX_orig/cgx_2.16.1/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.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 @@
+diff -ur CalculiX_orig/cgx_2.17/src/cgx.h CalculiX/cgx_2.17/src/cgx.h
+--- CalculiX_orig/cgx_2.17/src/cgx.h
++++ CalculiX/cgx_2.17/src/cgx.h
+@@ -85,12 +85,12 @@
  #elif defined AFLIB
--  #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/local/CalculiX/cgx_2.17/doc/cgx/cgx.html",\
+-    "/usr/local/CalculiX/ccx_2.17/doc/ccx/ccx.html",\
+-    "/usr/local/CalculiX/cgx_2.16/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"}
+   /* default tet mesher, 0:Netgen ng_vol, 1:tetgen */
+   #define     TETMESHER  1
  #else
--  #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/local/CalculiX/cgx_2.17/doc/cgx/cgx.html",\
+-    "/usr/local/CalculiX/ccx_2.17/doc/ccx/ccx.html"}
 +  #define     HELPFILE        {"/usr/share/doc/cgx/cgx.html",\
 +    "/usr/share/doc/ccx/ccx.html"}
+   /* default tet mesher, 0:Netgen ng_vol, 1:tetgen */
+   #define     TETMESHER  1
  #endif
-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
+diff -ur CalculiX_orig/cgx_2.17/src/uselibSNL.h CalculiX/cgx_2.17/src/uselibSNL.h
+--- CalculiX_orig/cgx_2.17/src/uselibSNL.h
++++ CalculiX/cgx_2.17/src/uselibSNL.h
 @@ -8,1 +8,3 @@
  #include <cgx.h>
 +#undef max