From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9326E59CAF for ; Sun, 3 Apr 2016 19:08:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13EC421C0D5; Sun, 3 Apr 2016 19:08:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AD88321C0D5 for ; Sun, 3 Apr 2016 19:08:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C08CB340C72 for ; Sun, 3 Apr 2016 19:08:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D542D80 for ; Sun, 3 Apr 2016 19:08:02 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1459710476.a2909cb627d3c5a393eaf25acd92d2180891bd1f.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/, media-gfx/freecad/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/freecad/files/freecad-0.15.4671-boost-1.60.patch media-gfx/freecad/freecad-0.15.4671.ebuild X-VCS-Directories: media-gfx/freecad/ media-gfx/freecad/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: a2909cb627d3c5a393eaf25acd92d2180891bd1f X-VCS-Branch: master Date: Sun, 3 Apr 2016 19:08:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 89d2b5ef-262c-4613-93b0-b5c82cc4c2d6 X-Archives-Hash: 88e72f9a25646c482cff3fd7db663570 commit: a2909cb627d3c5a393eaf25acd92d2180891bd1f Author: David Seifert gentoo org> AuthorDate: Sun Apr 3 19:07:12 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Apr 3 19:07:56 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2909cb6 media-gfx/freecad: Patch out internal boost::re_detail for boost 1.60 Gentoo-Bug: 578910 Package-Manager: portage-2.2.28 .../freecad/files/freecad-0.15.4671-boost-1.60.patch | 16 ++++++++++++++++ media-gfx/freecad/freecad-0.15.4671.ebuild | 5 +++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/media-gfx/freecad/files/freecad-0.15.4671-boost-1.60.patch b/media-gfx/freecad/files/freecad-0.15.4671-boost-1.60.patch new file mode 100644 index 0000000..4a7dbab --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.15.4671-boost-1.60.patch @@ -0,0 +1,16 @@ +From e0683f4db0fb56f8139f78ca2e500b21ec2a67f0 Mon Sep 17 00:00:00 2001 +From: wmayer +Date: Mon, 28 Dec 2015 13:54:40 +0100 +Subject: [PATCH] + fixes #0002347: freecad fails to build with Boost 1.60.0 + +--- freecad-0.15.4671/src/Mod/Drawing/App/FeaturePage.cpp ++++ freecad-0.15.4671/src/Mod/Drawing/App/FeaturePage.cpp +@@ -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/media-gfx/freecad/freecad-0.15.4671.ebuild b/media-gfx/freecad/freecad-0.15.4671.ebuild index d0e09c6..4c5cb71 100644 --- a/media-gfx/freecad/freecad-0.15.4671.ebuild +++ b/media-gfx/freecad/freecad-0.15.4671.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -61,7 +61,8 @@ src_prepare() { einfo remove bundled libs rm -rf src/3rdParty/{boost,Pivy*} - epatch "${FILESDIR}"/${PN}-0.14.3702-install-paths.patch + epatch "${FILESDIR}"/${PN}-0.14.3702-install-paths.patch \ + "${FILESDIR}"/${P}-boost-1.60.patch #bug 518996 sed -e "/LibDir = /s:'lib':'"$(get_libdir)"':g" \