summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel Souza Franco2018-05-09 21:22:07 +0200
committerGabriel Souza Franco2018-05-09 21:22:07 +0200
commit2faa9ec9f1c948c9b0b4566b174f89dc855eaf8e (patch)
tree72a5cd5a6ba461439d2d8ff36891c9434759d891
parentcd733757bc18992ed67a7e4e2b631cc3760963ab (diff)
downloadaur-2faa9ec9f1c948c9b0b4566b174f89dc855eaf8e.tar.gz
Add patch for gcc 8
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD13
-rw-r--r--gcc8.patch20
3 files changed, 33 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 50f7f9904e5..1fb5050b7bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = freecad
pkgdesc = A general purpose 3D CAD modeler
pkgver = 0.17
- pkgrel = 2
+ pkgrel = 3
url = http://www.freecadweb.org/
arch = x86_64
license = LGPL
@@ -37,15 +37,17 @@ pkgbase = freecad
optdepends = graphviz
optdepends = openscad
source = freecad-0.17.tar.gz::https://github.com/FreeCAD/FreeCAD/archive/0.17.tar.gz
- source = freecad-e17b340-rollup.patch::https://github.com/FreeCAD/FreeCAD/compare/0.17...e17b340.patch
+ source = freecad-3bb5ff4-rollup.patch::https://github.com/FreeCAD/FreeCAD/compare/0.17...3bb5ff4.patch
source = freecad.desktop
source = freecad.xml
source = remove-qtwebkit.patch
+ source = gcc8.patch
sha256sums = ae017393476b6dc7f1192bcaf91ceedc2f9b791f2495307ce7c45efadb5266fb
- sha256sums = b8504058e8b46b600b28262a38cf2605989ca0c3a81ab0ed6326704b9913e62b
+ sha256sums = a975d2da786003faceb3d15228084355867785998183dd44cfeb37f18b5af838
sha256sums = 617968d7bbd1da71bdedaed1b66c5d6eaf24e0fb34678b93f5d925d370c66296
sha256sums = 248918de7d3c2145b5cc4fbbc9e224d22f4a6ca7ead2680e8c3a32e91772482a
sha256sums = de214a281d421d44b02b469ecf72e36c4d61f10c40431e511e09734aca316baf
+ sha256sums = 618bb85c4f3a4eb0e329d1fc30391b777c9b0cffe97aa1e96d45f58b18424311
pkgname = freecad
diff --git a/PKGBUILD b/PKGBUILD
index fc8f807653d..d3099d163dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,8 +9,8 @@
pkgname=freecad
pkgver=0.17
-_rollup=e17b340
-pkgrel=2
+_rollup=3bb5ff4
+pkgrel=3
pkgdesc='A general purpose 3D CAD modeler'
arch=('x86_64')
url='http://www.freecadweb.org/'
@@ -25,18 +25,21 @@ optdepends=('python2-matplotlib' 'python2-pyqt4' 'graphviz' 'openscad')
source=("$pkgname-$pkgver.tar.gz::https://github.com/FreeCAD/FreeCAD/archive/$pkgver.tar.gz"
"$pkgname-$_rollup-rollup.patch::https://github.com/FreeCAD/FreeCAD/compare/$pkgver...$_rollup.patch"
"${pkgname}.desktop" "${pkgname}.xml"
- 'remove-qtwebkit.patch')
+ 'remove-qtwebkit.patch'
+ 'gcc8.patch')
sha256sums=('ae017393476b6dc7f1192bcaf91ceedc2f9b791f2495307ce7c45efadb5266fb'
- 'b8504058e8b46b600b28262a38cf2605989ca0c3a81ab0ed6326704b9913e62b'
+ 'a975d2da786003faceb3d15228084355867785998183dd44cfeb37f18b5af838'
'617968d7bbd1da71bdedaed1b66c5d6eaf24e0fb34678b93f5d925d370c66296'
'248918de7d3c2145b5cc4fbbc9e224d22f4a6ca7ead2680e8c3a32e91772482a'
- 'de214a281d421d44b02b469ecf72e36c4d61f10c40431e511e09734aca316baf')
+ 'de214a281d421d44b02b469ecf72e36c4d61f10c40431e511e09734aca316baf'
+ '618bb85c4f3a4eb0e329d1fc30391b777c9b0cffe97aa1e96d45f58b18424311')
prepare() {
cd "${srcdir}/FreeCAD-${pkgver}"
patch -Np1 -i ../$pkgname-$_rollup-rollup.patch
patch -Np1 -i ../remove-qtwebkit.patch
+ patch -Np1 -i ../gcc8.patch
}
build() {
diff --git a/gcc8.patch b/gcc8.patch
new file mode 100644
index 00000000000..06d7e5733f5
--- /dev/null
+++ b/gcc8.patch
@@ -0,0 +1,20 @@
+diff --git a/src/3rdParty/salomesmesh/inc/SMESH_Algo.hxx b/src/3rdParty/salomesmesh/inc/SMESH_Algo.hxx
+index a362ed290..7e23608f5 100644
+--- a/src/3rdParty/salomesmesh/inc/SMESH_Algo.hxx
++++ b/src/3rdParty/salomesmesh/inc/SMESH_Algo.hxx
+@@ -30,6 +30,7 @@
+
+ #include "SMESH_SMESH.hxx"
+
++#include "SMDS_MeshNode.hxx"
+ #include "SMDSAbs_ElementType.hxx"
+ #include "SMESH_Comment.hxx"
+ #include "SMESH_ComputeError.hxx"
+@@ -45,7 +46,6 @@
+ #include <map>
+ #include <set>
+
+-class SMDS_MeshNode;
+ class SMESHDS_Mesh;
+ class SMESHDS_SubMesh;
+ class SMESH_Gen;