Commit c6fff8ca authored by Fabian Kosmale's avatar Fabian Kosmale

freecad: rebuild against boost

parent d05ceade
pkgname=freecad pkgname=freecad
pkgver=0.15.4671 pkgver=0.15.4671
pkgrel=1 pkgrel=2
pkgdesc='A general purpose 3D CAD modeler' pkgdesc='A general purpose 3D CAD modeler'
arch=('x86_64') arch=('x86_64')
url='http://www.freecadweb.org/wiki' url='http://www.freecadweb.org/wiki'
...@@ -11,10 +11,13 @@ options=(!libtool !makeflags) ...@@ -11,10 +11,13 @@ options=(!libtool !makeflags)
install=freecad.install install=freecad.install
source=("http://downloads.sourceforge.net/project/free-cad/FreeCAD%20Source/${pkgname}_${pkgver}.tar.gz" source=("http://downloads.sourceforge.net/project/free-cad/FreeCAD%20Source/${pkgname}_${pkgver}.tar.gz"
"${pkgname}.desktop" "${pkgname}.desktop"
"${pkgname}.xml") "${pkgname}.xml"
"boost_160.patch"
)
sha512sums=('695081117b5511bbc0b7335b63a8760e164987a6dff2c5b0dc86b6b0a93bb7d7b83aa9f4fab1d66d7d2c917a42b0135af78553b463579873a1d1e52e3dd9aecb' sha512sums=('695081117b5511bbc0b7335b63a8760e164987a6dff2c5b0dc86b6b0a93bb7d7b83aa9f4fab1d66d7d2c917a42b0135af78553b463579873a1d1e52e3dd9aecb'
'a58dd5f6d8217b6633d5cc24a0b61954b1044d4156b25b78c00ea29f3ac9ca4932e9bde08bd11fc4327d76c7e82500cf3c2ddc934f426e970757cd200b070aec' 'a58dd5f6d8217b6633d5cc24a0b61954b1044d4156b25b78c00ea29f3ac9ca4932e9bde08bd11fc4327d76c7e82500cf3c2ddc934f426e970757cd200b070aec'
'ac0dfe1b2c58335867e94d4ce86696763b6354dcdca68a653bf115b6ea562f0f8ff7d243d42d0c6fd6e758bd488d626e30cd917bb1b5c676c1f0cafdece005d6') 'ac0dfe1b2c58335867e94d4ce86696763b6354dcdca68a653bf115b6ea562f0f8ff7d243d42d0c6fd6e758bd488d626e30cd917bb1b5c676c1f0cafdece005d6'
'26e3000668e7d02f0b60ede859cfd589d10365f50bf93f6c45b6ab7248fcf12ac56abd48b36cae0343c191dcc0c402b3dce3c5b8db0875043aa3dc17c7d43203')
prepare() { prepare() {
sed -i \ sed -i \
...@@ -25,6 +28,8 @@ prepare() { ...@@ -25,6 +28,8 @@ prepare() {
sed -i \ sed -i \
-e 's|\bpyside-uic\b|python2-pyside-uic|' \ -e 's|\bpyside-uic\b|python2-pyside-uic|' \
$srcdir/freecad-$pkgver/cMake/FindPySideTools.cmake $srcdir/freecad-$pkgver/cMake/FindPySideTools.cmake
cd ${srcdir}/freecad-${pkgver}
patch -Np1 -i ${srcdir}/boost_160.patch
} }
build() { build() {
...@@ -62,4 +67,4 @@ package() { ...@@ -62,4 +67,4 @@ package() {
# Mime info # Mime info
install -D -m644 "${srcdir}/${pkgname}.xml" "${pkgdir}/usr/share/mime/packages/${pkgname}.xml" install -D -m644 "${srcdir}/${pkgname}.xml" "${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
} }
\ No newline at end of file
From e0683f4db0fb56f8139f78ca2e500b21ec2a67f0 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Mon, 28 Dec 2015 13:54:40 +0100
Subject: [PATCH] + fixes #0002347: freecad fails to build with Boost 1.60.0
---
src/Mod/Drawing/App/FeaturePage.cpp | 2 +-
src/Mod/Drawing/App/FeatureViewSymbol.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/Mod/Drawing/App/FeaturePage.cpp b/src/Mod/Drawing/App/FeaturePage.cpp
index 60c9eff..f9166a9 100644
--- a/src/Mod/Drawing/App/FeaturePage.cpp
+++ b/src/Mod/Drawing/App/FeaturePage.cpp
@@ -211,7 +211,7 @@ App::DocumentObjectExecReturn *FeaturePage::execute(void)
if (count < editText.size()) {
// change values of editable texts
boost::regex e2 ("(<text.*?freecad:editable=\""+what[1].str()+"\".*?<tspan.*?)>(.*?)(</tspan>)");
- boost::re_detail::string_out_iterator<std::string > out(newfragment);
+ std::back_insert_iterator<std::string> out(newfragment);
boost::regex_replace(out, begin, what[0].second, e2, "$1>"+editText[count]+"$3");
}
count++;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment