diff options
| author | Gabriel Souza Franco | 2018-06-08 15:59:48 +0200 |
|---|---|---|
| committer | Gabriel Souza Franco | 2018-06-08 15:59:48 +0200 |
| commit | 291b0dbdb6c1a93dcecc410527ad512137721108 (patch) | |
| tree | a596328507bf102d9e4586d4410f05b76242e34e | |
| parent | becf536a18e6a8d011832090435f9073f02eacf6 (diff) | |
| download | aur-291b0dbdb6c1a93dcecc410527ad512137721108.tar.gz | |
Workaround SMESH build failure
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | smesh-pthread.patch | 18 |
3 files changed, 26 insertions, 5 deletions
@@ -1,7 +1,7 @@ pkgbase = freecad pkgdesc = A general purpose 3D CAD modeler pkgver = 0.17 - pkgrel = 4 + pkgrel = 5 url = http://www.freecadweb.org/ arch = x86_64 license = LGPL @@ -42,12 +42,14 @@ pkgbase = freecad source = freecad.xml source = remove-qtwebkit.patch source = gcc8.patch + source = smesh-pthread.patch sha256sums = ae017393476b6dc7f1192bcaf91ceedc2f9b791f2495307ce7c45efadb5266fb sha256sums = c4a4e084da448c78644e8acc1f3158cf2cb82ee4936b5b79e282497fd62d566e sha256sums = 617968d7bbd1da71bdedaed1b66c5d6eaf24e0fb34678b93f5d925d370c66296 sha256sums = 248918de7d3c2145b5cc4fbbc9e224d22f4a6ca7ead2680e8c3a32e91772482a sha256sums = de214a281d421d44b02b469ecf72e36c4d61f10c40431e511e09734aca316baf sha256sums = 618bb85c4f3a4eb0e329d1fc30391b777c9b0cffe97aa1e96d45f58b18424311 + sha256sums = 170c90ee6ef64cf3c8e6a35ca94bb1187d346707f7e0779022e614563c6b74f6 pkgname = freecad @@ -10,7 +10,7 @@ pkgname=freecad pkgver=0.17 _rollup=84d6128 -pkgrel=4 +pkgrel=5 pkgdesc='A general purpose 3D CAD modeler' arch=('x86_64') url='http://www.freecadweb.org/' @@ -25,14 +25,14 @@ 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' - 'gcc8.patch') + 'remove-qtwebkit.patch' 'gcc8.patch' 'smesh-pthread.patch') sha256sums=('ae017393476b6dc7f1192bcaf91ceedc2f9b791f2495307ce7c45efadb5266fb' 'c4a4e084da448c78644e8acc1f3158cf2cb82ee4936b5b79e282497fd62d566e' '617968d7bbd1da71bdedaed1b66c5d6eaf24e0fb34678b93f5d925d370c66296' '248918de7d3c2145b5cc4fbbc9e224d22f4a6ca7ead2680e8c3a32e91772482a' 'de214a281d421d44b02b469ecf72e36c4d61f10c40431e511e09734aca316baf' - '618bb85c4f3a4eb0e329d1fc30391b777c9b0cffe97aa1e96d45f58b18424311') + '618bb85c4f3a4eb0e329d1fc30391b777c9b0cffe97aa1e96d45f58b18424311' + '170c90ee6ef64cf3c8e6a35ca94bb1187d346707f7e0779022e614563c6b74f6') prepare() { cd "${srcdir}/FreeCAD-${pkgver}" @@ -40,6 +40,7 @@ prepare() { patch -Np1 -i ../$pkgname-$_rollup-rollup.patch patch -Np1 -i ../remove-qtwebkit.patch patch -Np1 -i ../gcc8.patch + patch -Np1 -i ../smesh-pthread.patch } build() { diff --git a/smesh-pthread.patch b/smesh-pthread.patch new file mode 100644 index 000000000000..3497015488cd --- /dev/null +++ b/smesh-pthread.patch @@ -0,0 +1,18 @@ +--- a/src/3rdParty/salomesmesh/CMakeLists.txt 2018-04-06 10:48:37.000000000 +0200 ++++ a/src/3rdParty/salomesmesh/CMakeLists.txt 2018-04-06 10:48:37.000000000 +0200 +@@ -85,6 +85,7 @@ + else(MSVC) + if(BUILD_FEM_NETGEN) + set(SMESH_LIBS ++ pthread + ${NGLIB_LIBRARIES} + ${OCC_LIBRARIES} + ${OCC_OCAF_LIBRARIES} +@@ -92,6 +93,7 @@ + ADD_DEFINITIONS(${NETGEN_DEFINITIONS}) + else(BUILD_FEM_NETGEN) + set(SMESH_LIBS ++ pthread + ${OCC_LIBRARIES} + ${OCC_OCAF_LIBRARIES} + ) |