summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Aznarán Laos2023-05-10 14:59:15 -0500
committerCarlos Aznarán Laos2023-05-10 14:59:15 -0500
commit44f49e4345626782cde1a7a1c2f5f2261fbe3ff9 (patch)
tree5999e54a44d852a4a50a02707ddeb81babe772c6
parenta91e6dffa512d3b2c73b3c7e7e7144ded3253834 (diff)
downloadaur-44f49e4345626782cde1a7a1c2f5f2261fbe3ff9.tar.gz
Add gcc 13 compatibility patch
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD13
2 files changed, 14 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8f5c09401609..3264d609450d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gmsh
pkgdesc = An automatic 3D finite element mesh generator with pre and post-processing facilities.
pkgver = 4.11.1
- pkgrel = 1
+ pkgrel = 2
url = https://gmsh.info
arch = x86_64
license = custom
@@ -25,9 +25,13 @@ pkgbase = gmsh
source = https://gmsh.info/src/gmsh-4.11.1-source.tgz
source = gmsh.desktop
source = gmsh.completion
+ source = gcc-13-1-compatibility.patch::https://gitlab.onelab.info/gmsh/gmsh/-/commit/fb81a9c9026700e078de947b4522cb39e543a86b.patch
+ source = gcc-13-2-compatibility.patch::https://gitlab.onelab.info/gmsh/gmsh/-/commit/aceb09c807b78ea26555f99fcb16c4f87c31fb5a.patch
sha256sums = c5fe1b7cbd403888a814929f2fd0f5d69e27600222a18c786db5b76e8005b365
sha256sums = 43a8ca33ac917ee7196fdae305ff2c8cb9ae1072569ee546c0ce8ff580c966ae
sha256sums = 11605e97636a56cf51e445e65019526ee253bd2e0553fb71ba6d94488dcd34ef
+ sha256sums = c315dc4912191b2821fe44b9e75799cb6503bf800010c6bb9d34ee0ed5f0398f
+ sha256sums = beb9404bbb9377e6240b369dd70cfc317209202cb32bdc55f4e6fc5837b2da12
pkgname = gmsh
depends = fltk
diff --git a/PKGBUILD b/PKGBUILD
index fa9d4345928c..482d4d116a2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: mickele <mimocciola@yahoo.com>
pkgname=('gmsh' 'gmsh-docs')
pkgver=4.11.1
-pkgrel=1
+pkgrel=2
pkgdesc="An automatic 3D finite element mesh generator with pre and post-processing facilities."
arch=('x86_64')
url="https://gmsh.info"
@@ -12,10 +12,14 @@ makedepends=('cmake' 'desktop-file-utils' 'sed' 'swig' 'texlive-core' 'voro++'
'fltk' 'med' 'opencascade' 'cairo' 'metis' 'alglib' 'ann'
'glu' 'cgns' 'lapack')
options=(!emptydirs)
-source=("${url}/src/${pkgname}-${pkgver}-source.tgz" gmsh.desktop gmsh.completion)
+source=("${url}/src/${pkgname}-${pkgver}-source.tgz" gmsh.desktop gmsh.completion
+ gcc-13-1-compatibility.patch::https://gitlab.onelab.info/gmsh/gmsh/-/commit/fb81a9c9026700e078de947b4522cb39e543a86b.patch
+ gcc-13-2-compatibility.patch::https://gitlab.onelab.info/gmsh/gmsh/-/commit/aceb09c807b78ea26555f99fcb16c4f87c31fb5a.patch)
sha256sums=('c5fe1b7cbd403888a814929f2fd0f5d69e27600222a18c786db5b76e8005b365'
'43a8ca33ac917ee7196fdae305ff2c8cb9ae1072569ee546c0ce8ff580c966ae'
- '11605e97636a56cf51e445e65019526ee253bd2e0553fb71ba6d94488dcd34ef')
+ '11605e97636a56cf51e445e65019526ee253bd2e0553fb71ba6d94488dcd34ef'
+ 'c315dc4912191b2821fe44b9e75799cb6503bf800010c6bb9d34ee0ed5f0398f'
+ 'beb9404bbb9377e6240b369dd70cfc317209202cb32bdc55f4e6fc5837b2da12')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}-source"
@@ -27,7 +31,8 @@ prepare() {
-i src/fltk/graphicWindow.cpp
sed -e "s|https://gmsh.info/|file:///usr/share/licenses/gmsh/|" \
-i src/fltk/helpWindow.cpp
-
+ patch -p1 -i ../gcc-13-1-compatibility.patch
+ patch -p1 -i ../gcc-13-2-compatibility.patch
}
build() {