[CGAL] Add a patch to fix the compilation of an undocumented header with gcc-4.7

[Laurent Rineau]

commit b13f8fb6a68a2e98351a014ae073a85613ea8280
Author: Laurent Rineau <git>
Date:   Thu Jun 14 13:14:25 2012 +0200

    Add a patch to fix the compilation of an undocumented header with gcc-4.7
    
    Fix bug #831847

 CGAL-4.0-gcc47.patch  |   21 +++++++++++++++++++++
 CGAL-boost-1.48.patch |   28 ----------------------------
 CGAL.spec             |   12 +++++++++++-
 3 files changed, 32 insertions(+), 29 deletions(-)
---
diff --git a/CGAL-4.0-gcc47.patch b/CGAL-4.0-gcc47.patch
new file mode 100644
index 0000000..feab2ed
--- /dev/null
+++ b/CGAL-4.0-gcc47.patch
@@ -0,0 +1,21 @@
+------------------------------------------------------------------------
+r69218 | lrineau | 2012-05-21 08:53:58 +0200 (Mon, 21 May 2012) | 2 lines
+Changed paths:
+   M /branches/next/Mesh_2/include/CGAL/Mesh_2/Do_not_refine_edges.h
+
+Bug fix: g++-4.7 (and C++03/11) requires to qualify the call.
+
+------------------------------------------------------------------------
+Index: Mesh_2/include/CGAL/Mesh_2/Do_not_refine_edges.h
+===================================================================
+--- Mesh_2/include/CGAL/Mesh_2/Do_not_refine_edges.h	(revision 69217)
++++ Mesh_2/include/CGAL/Mesh_2/Do_not_refine_edges.h	(revision 69218)
+@@ -80,7 +80,7 @@
+       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;
+       }
diff --git a/CGAL.spec b/CGAL.spec
index cece027..bd627d9 100644
--- a/CGAL.spec
+++ b/CGAL.spec
@@ -13,7 +13,7 @@
 
 Name:           CGAL
 Version:        4.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -22,6 +22,9 @@ URL:            http://www.cgal.org/
 Source0:        https://gforge.inria.fr/frs/download.php/%{gforgedlnumber}/%{name}-%{version}%{alphaname}.tar.xz
 Source10:       CGAL-README.Fedora
 
+# Upstream patch. Taken from CGAL Subversion repository.
+Patch0:         CGAL-4.0-gcc47.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Required devel packages.
@@ -69,6 +72,8 @@ CGAL algorithms.
 %prep
 %setup -q -n %{name}-%{version}%{alphaname}
 
+%patch0 -p1 -b .gcc47
+
 # Fix some file permissions
 chmod a-x demo/Stream_lines_2/CMakeLists.txt
 chmod a-x demo/Alpha_shapes_2/about_Alpha_shapes_2.html
@@ -137,6 +142,11 @@ rm -rf %{buildroot}
 %exclude %{_datadir}/CGAL/*/*/skip_vcproj_auto_generation
 
 %changelog
+* Thu Jun 14 2012 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 4.0-3
+- Add a patch to fix the compilation of an undocumented header with gcc-4.7
+
+  Fix bug #831847
+
 * Wed Mar 14 2012 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 4.0-2
 - New upstream release: CGAL-4.0