Update patch for gcc10

3 files changed, 8 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d0e682d0f5d7..acd02206285e 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 = 3
+	pkgrel = 4
 	url = http://www.calculix.de/
 	arch = i686
 	arch = x86_64
@@ -27,7 +27,7 @@ pkgbase = calculix
 	sha256sums = ebd95a0e4d52a3a8fb969eefc85417c82f649f25526bb6d83d69868ab44d47b7
 	sha256sums = fcbeb4d03a960ec26b5027fd729f6a13b607ab5fece4c5673c16fa740592f687
 	sha256sums = 0125efb8dfe47c920b266d8c6a326677eae3967a113a75c079405c1d9415cb54
-	sha256sums = 54f34feffd3c07b1cc1e1390e50b3f2db575c7f9c60d1fb4515e440d36c69bbd
+	sha256sums = 089e57f785c5c95669e133a2b5effb9c238a123b6d68ac568cf22ef71199a91e
 
 pkgname = calculix
 
diff --git a/PKGBUILD b/PKGBUILD
index 444c4e0a9a6f..2b257efc62fc 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=calculix
 pkgver=2.16
-pkgrel=3
+pkgrel=4
 pkgdesc="CalculiX: 3D finite element solver and post-processor (executables)"
 arch=('i686' 'x86_64')
 options=(!makeflags !buildflags)
@@ -29,7 +29,7 @@ source=("http://www.dhondt.de/ccx_${pkgver}.src.tar.bz2"
 sha256sums=('ebd95a0e4d52a3a8fb969eefc85417c82f649f25526bb6d83d69868ab44d47b7'
             'fcbeb4d03a960ec26b5027fd729f6a13b607ab5fece4c5673c16fa740592f687'
             '0125efb8dfe47c920b266d8c6a326677eae3967a113a75c079405c1d9415cb54'
-            '54f34feffd3c07b1cc1e1390e50b3f2db575c7f9c60d1fb4515e440d36c69bbd')
+            '089e57f785c5c95669e133a2b5effb9c238a123b6d68ac568cf22ef71199a91e')
 
 prepare()
 {
diff --git a/calculix_2.16_archlinux.patch b/calculix_2.16_archlinux.patch
index a6050cdf5001..1a26f20e8a65 100755
--- a/calculix_2.16_archlinux.patch
+++ b/calculix_2.16_archlinux.patch
@@ -3,8 +3,9 @@ diff -ur CalculiX_orig/ccx_2.16/src/Makefile CalculiX/ccx_2.16/src/Makefile
 +++ CalculiX/ccx_2.16/src/Makefile
 @@ -2,2 +2,2 @@ 
 -CFLAGS = -Wall -O2 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
+-FFLAGS = -Wall -O2
 +CFLAGS = -Wall -O2 -fopenmp -I /usr/include/spooles -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
- FFLAGS = -Wall -O2
++FFLAGS = -Wall -O2 -fallow-argument-mismatch
 @@ -21,6 +21,1 @@
 -DIR=../../../SPOOLES.2.2
 -
@@ -17,7 +18,8 @@ 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 \
+-CFLAGS = -O2 -Wall -Wno-narrowing \
++CFLAGS = -O2 -Wall -Wno-narrowing -fcommon\
    -I./ \
 -  -I/usr/include \
 -  -I/usr/include/GL \