diff options
| author | wiedi <wiedi@pkgsrc.org> | 2014-02-08 12:16:12 +0000 |
|---|---|---|
| committer | wiedi <wiedi@pkgsrc.org> | 2014-02-08 12:16:12 +0000 |
| commit | 4eb3d7567aa2326a8a14ea78db0420d998a50e82 (patch) | |
| tree | 3099e3a985fd5820826f0bce5a7153a6e8803ab4 /math | |
| parent | f4a1f2afeb3423c470bbba9ffb68c7460ab7d669 (diff) | |
| download | pkgsrc-4eb3d7567aa2326a8a14ea78db0420d998a50e82.tar.gz | |
add patch to fix building other packages (e.g. openscad) with gcc 4.7 that link cgal
Diffstat (limited to 'math')
| -rw-r--r-- | math/cgal/Makefile | 7 | ||||
| -rw-r--r-- | math/cgal/distinfo | 3 | ||||
| -rw-r--r-- | math/cgal/patches/patch-include_CGAL_Mesh__2_Do__not__refine__edges.h | 15 |
3 files changed, 22 insertions, 3 deletions
diff --git a/math/cgal/Makefile b/math/cgal/Makefile index 5e290a01e26..e941e36d22a 100644 --- a/math/cgal/Makefile +++ b/math/cgal/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2014/01/27 18:41:13 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2014/02/08 12:16:12 wiedi Exp $ PKGNAME= cgal-3.9 DISTNAME= CGAL-3.9 -PKGREVISION= 19 +PKGREVISION= 20 CATEGORIES= math MASTER_SITES= https://gforge.inria.fr/frs/download.php/29125/ @@ -14,6 +14,9 @@ LICENSE= gnu-lgpl-v3 USE_CMAKE= yes USE_LANGUAGES= c c++ +post-patch: + cd ${WRKSRC} && rm -f include/CGAL/Mesh_2/Do_not_refine_edges.h.orig + .include "../../devel/boost-headers/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" .include "../../math/mpfr/buildlink3.mk" diff --git a/math/cgal/distinfo b/math/cgal/distinfo index d9822d85cd5..0b52205da85 100644 --- a/math/cgal/distinfo +++ b/math/cgal/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2012/02/27 12:46:27 reinoud Exp $ +$NetBSD: distinfo,v 1.2 2014/02/08 12:16:12 wiedi Exp $ SHA1 (CGAL-3.9.tar.gz) = cc99fad7116f221b6301326834f71ff65cebf2eb RMD160 (CGAL-3.9.tar.gz) = 0a5a929ecedeeac3833ec90f802b7f5ac069ad47 Size (CGAL-3.9.tar.gz) = 14276059 bytes +SHA1 (patch-include_CGAL_Mesh__2_Do__not__refine__edges.h) = 5a66b2ff56d3e20e554ab73829e3c8c735144489 SHA1 (patch-manpage-installation) = c664f64ccc9507871c1ada46b983f0d006b13fe6 diff --git a/math/cgal/patches/patch-include_CGAL_Mesh__2_Do__not__refine__edges.h b/math/cgal/patches/patch-include_CGAL_Mesh__2_Do__not__refine__edges.h new file mode 100644 index 00000000000..bbd39eba79e --- /dev/null +++ b/math/cgal/patches/patch-include_CGAL_Mesh__2_Do__not__refine__edges.h @@ -0,0 +1,15 @@ +$NetBSD: patch-include_CGAL_Mesh__2_Do__not__refine__edges.h,v 1.1 2014/02/08 12:16:12 wiedi Exp $ + +fix building other packages with gcc 4.7 linking cgal +see also: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673554 +--- include/CGAL/Mesh_2/Do_not_refine_edges.h.orig 2010-05-14 19:00:16.000000000 +0000 ++++ include/CGAL/Mesh_2/Do_not_refine_edges.h +@@ -79,7 +79,7 @@ public: + const Face_handle& fh = eit->first; + const int& i = eit->second; + +- if(fh->is_constrained(i) && !is_locally_conform(this->tr, fh, i, p)) ++ if(fh->is_constrained(i) && !this->is_locally_conform(this->tr, fh, i, p)) + { + return CONFLICT_AND_ELEMENT_SHOULD_BE_DROPPED; + } |