From 8dba3a7f2451b96565b1463d226e25db89d199dc Mon Sep 17 00:00:00 2001 From: Richard M. Shaw Date: Apr 07 2016 15:22:48 +0000 Subject: Update to 0.16 prerelease. --- diff --git a/freecad-0.15-boost160.patch b/freecad-0.15-boost160.patch new file mode 100644 index 0000000..444b39d --- /dev/null +++ b/freecad-0.15-boost160.patch @@ -0,0 +1,11 @@ +--- freecad-0.15.4671/src/Mod/Drawing/App/FeaturePage.cpp.orig 2015-04-05 18:25:02.000000000 +0100 ++++ freecad-0.15.4671/src/Mod/Drawing/App/FeaturePage.cpp 2016-01-28 22:47:58.404896737 +0000 +@@ -195,7 +195,7 @@ + if (count < editText.size()) { + // change values of editable texts + boost::regex e2 ("((.*?)()"); +- boost::re_detail::string_out_iterator out(newfragment); ++ std::back_insert_iterator out(newfragment); + boost::regex_replace(out, begin, what[0].second, e2, "$1>"+editText[count]+"$3"); + } + count++; diff --git a/freecad.spec b/freecad.spec index 7d91f2c..356255e 100644 --- a/freecad.spec +++ b/freecad.spec @@ -37,6 +37,8 @@ Patch0: freecad-3rdParty.patch Patch1: freecad-0.14-Xlib_h.patch Patch2: freecad-0.15-zipios.patch Patch3: freecad-0.14-Version_h.patch +# http://www.freecadweb.org/tracker/view.php?id=2347 +Patch4: freecad-0.15-boost160.patch # Utilities BuildRequires: cmake @@ -142,6 +144,7 @@ rm -rf src/CXX #patch1 -p1 -b .Xlib_h %patch2 -p1 -b .zipios %patch3 -p1 +%patch4 -p1 %if ! %{bundled_zipios} rm -rf src/zipios++ @@ -319,6 +322,12 @@ fi * Wed Apr 6 2016 Richard Shaw - 1:0.16-0.1 - Update to 0.16 prerelease. +* Wed Feb 03 2016 Fedora Release Engineering - 1:0.15-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jan 28 2016 Jonathan Wakely 0.15-11 +- Patched and rebuilt for Boost 1.60 + * Mon Jan 4 2016 Richard Shaw - 1:0.15-10 - Fix appdata license, fixes BZ#1294623.