Update to version 2.14

3 files changed, 35 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f4c7598fafb..e38150593bac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Oct 30 21:40:22 UTC 2017
+# Sun Jul 15 12:16:47 UTC 2018
 pkgbase = calculix
 	pkgdesc = CalculiX: 3D finite element solver and post-processor (executables)
-	pkgver = 2.13
-	pkgrel = 2
+	pkgver = 2.14
+	pkgrel = 1
 	url = http://www.calculix.de/
 	arch = i686
 	arch = x86_64
@@ -13,19 +13,18 @@ pkgbase = calculix
 	depends = spooles
 	depends = libsnl-svn
 	depends = blas
-	depends = freeglut
 	depends = mesa
 	depends = glu
 	depends = libxmu
 	optdepends = calculix-doc: documentation and examples
 	options = !makeflags
 	options = !buildflags
-	source = http://www.dhondt.de/ccx_2.13.src.tar.bz2
-	source = http://www.dhondt.de/cgx_2.13.all.tar.bz2
-	source = calculix_2.13_archlinux.patch
-	sha256sums = 7685f4ddd0dc698fa1ad0f82594a6fe52ffa8f604c1e74befa048d3d46f49ce2
-	sha256sums = dfbe696315347981bc740e55638e3ef0161afde2597b1f63c732021f852289b7
-	sha256sums = 1153c834e9239018cd4fd1adf666ae37a01de9bf05dc75c62f11da6d22a703a9
+	source = http://www.dhondt.de/ccx_2.14.src.tar.bz2
+	source = http://www.dhondt.de/cgx_2.14.all.tar.bz2
+	source = calculix_2.14_archlinux.patch
+	sha256sums = 59de9965d8f69141a34519101f7dd932c7d8d2be15480b31062b92512545fec4
+	sha256sums = 07658fcf2c00489cad16b58c6065ca8402c974f2c7e9d3e9dbca87cfd7275d12
+	sha256sums = f5e0d484339c4ca2f0a48b11fa1ce35bf3d38fae98303870cf893c76248af2fa
 
 pkgname = calculix
 
diff --git a/PKGBUILD b/PKGBUILD
index 531559275917..3cb7f4276f8b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,14 +6,14 @@
 #       may fail if make uses more than one job.
 
 pkgname=calculix
-pkgver=2.13
-pkgrel=2
+pkgver=2.14
+pkgrel=1
 pkgdesc="CalculiX: 3D finite element solver and post-processor (executables)"
 arch=('i686' 'x86_64')
 options=(!makeflags !buildflags)
 url="http://www.calculix.de/"
 license=('GPL2')
-depends=('arpack' 'spooles' 'libsnl-svn' 'blas' 'freeglut' 'mesa' 'glu' 'libxmu' )
+depends=('arpack' 'spooles' 'libsnl-svn' 'blas' 'mesa' 'glu' 'libxmu' )
 optdepends=('calculix-doc: documentation and examples')
 makedepends=('gcc-fortran')
 
@@ -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=('7685f4ddd0dc698fa1ad0f82594a6fe52ffa8f604c1e74befa048d3d46f49ce2'
-            'dfbe696315347981bc740e55638e3ef0161afde2597b1f63c732021f852289b7'
-            '1153c834e9239018cd4fd1adf666ae37a01de9bf05dc75c62f11da6d22a703a9')
+sha256sums=('59de9965d8f69141a34519101f7dd932c7d8d2be15480b31062b92512545fec4'
+            '07658fcf2c00489cad16b58c6065ca8402c974f2c7e9d3e9dbca87cfd7275d12'
+            'f5e0d484339c4ca2f0a48b11fa1ce35bf3d38fae98303870cf893c76248af2fa')
 
 prepare()
 {
@@ -48,7 +48,7 @@ build()
     make
     
     msg2 "Building gui..."
-    cd "${srcdir}/CalculiX/cgx_${_cgxver}/src"
+    cd "${srcdir}/CalculiX/cgx_${_cgxver}.1/src"
     make
 
     msg2 "Build complete"
@@ -62,7 +62,7 @@ package()
     install -d  ${pkgdir}/usr/bin
 
     install -Dm755 ${srcdir}/CalculiX/ccx_${_ccxver}/src/ccx_${_ccxver} ${pkgdir}/usr/bin/ccx
-    install -Dm755 ${srcdir}/CalculiX/cgx_${_cgxver}/src/cgx ${pkgdir}/usr/bin/cgx
+    install -Dm755 ${srcdir}/CalculiX/cgx_${_cgxver}.1/src/cgx ${pkgdir}/usr/bin/cgx
 
     msg2 "Done"  
 }
diff --git a/calculix_2.13_archlinux.patch b/calculix_2.14_archlinux.patch
index 1da5d6099595..0daa22836df3 100644
--- a/calculix_2.13_archlinux.patch
+++ b/calculix_2.14_archlinux.patch
@@ -1,8 +1,8 @@
-diff -ur CalculiX_orig/ccx_2.13/src/Makefile CalculiX/ccx_2.13/src/Makefile
---- CalculiX_orig/ccx_2.13/src/Makefile
-+++ CalculiX/ccx_2.13/src/Makefile
+diff -ur CalculiX_orig/ccx_2.14/src/Makefile CalculiX/ccx_2.14/src/Makefile
+--- CalculiX_orig/ccx_2.14/src/Makefile
++++ CalculiX/ccx_2.14/src/Makefile
 @@ -2,2 +2,2 @@ 
--CFLAGS = -Wall -O3 -fopenmp -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
+-CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
 +CFLAGS = -Wall -O3 -fopenmp -I /usr/include/spooles -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
  FFLAGS = -Wall -O3 -fopenmp
 @@ -21,6 +21,1 @@
@@ -13,9 +13,9 @@ diff -ur CalculiX_orig/ccx_2.13/src/Makefile CalculiX/ccx_2.13/src/Makefile
 -	../../../ARPACK/libarpack_INTEL.a \
 -       -lpthread -lm -lc
 +LIBS = -lpthread -lm -lc -lspooles -larpack -lblas
-diff -ur CalculiX_orig/cgx_2.13/src/Makefile CalculiX/cgx_2.13/src/Makefile
---- CalculiX_orig/cgx_2.13/src/Makefile
-+++ CalculiX/cgx_2.13/src/Makefile
+diff -ur CalculiX_orig/cgx_2.14.1/src/Makefile CalculiX/cgx_2.14.1/src/Makefile
+--- CalculiX_orig/cgx_2.14.1/src/Makefile
++++ CalculiX/cgx_2.14.1/src/Makefile
 @@ -1,14 +1,8 @@
  CFLAGS = -O3 -Wall \
    -I./ \
@@ -37,26 +37,26 @@ diff -ur CalculiX_orig/cgx_2.13/src/Makefile CalculiX/cgx_2.13/src/Makefile
 @@ -59,1 +53,1 @@
 - ../../libSNL/src/*.cpp
 +# ../../libSNL/src/*.cpp
-diff -ur CalculiX_orig/cgx_2.13/src/cgx.h CalculiX/cgx_2.13/src/cgx.h
---- CalculiX_orig/cgx_2.13/src/cgx.h
-+++ CalculiX/cgx_2.13/src/cgx.h
+diff -ur CalculiX_orig/cgx_2.14.1/src/cgx.h CalculiX/cgx_2.14.1/src/cgx.h
+--- CalculiX_orig/cgx_2.14.1/src/cgx.h
++++ CalculiX/cgx_2.14.1/src/cgx.h
 @@ -81,8 +81,8 @@
  #elif defined AFLIB
--  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.13/doc/cgx/cgx.html",\
--    "/usr/local/CalculiX/ccx_2.13/doc/ccx/ccx.html",\
--    "/usr/local/CalculiX/cgx_2.13/doc/aflib/aflib.pdf"}
+-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.14.1/doc/cgx/cgx.html",\
+-    "/usr/local/CalculiX/ccx_2.14/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.13/doc/cgx/cgx.html",\
--    "/usr/local/CalculiX/ccx_2.13/doc/ccx/ccx.html"}
+-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.14.1/doc/cgx/cgx.html",\
+-    "/usr/local/CalculiX/ccx_2.14/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.13/src/uselibSNL.h CalculiX/cgx_2.13/src/uselibSNL.h
---- CalculiX_orig/cgx_2.13/src/uselibSNL.h
-+++ CalculiX/cgx_2.13/src/uselibSNL.h
+diff -ur CalculiX_orig/cgx_2.14.1/src/uselibSNL.h CalculiX/cgx_2.14.1/src/uselibSNL.h
+--- CalculiX_orig/cgx_2.14.1/src/uselibSNL.h
++++ CalculiX/cgx_2.14.1/src/uselibSNL.h
 @@ -8,1 +8,3 @@
  #include <cgx.h>
 +#undef max