[90821] trunk/dports/gis/cgal

[ryandesign at macports.org]

Revision: 90821
          https://trac.macports.org/changeset/90821
Author:   ryandesign at macports.org
Date:     2012-03-14 20:18:47 -0700 (Wed, 14 Mar 2012)
Log Message:
-----------
cgal: fix build with boost 1.49.0; see #33298

Modified Paths:
--------------
    trunk/dports/gis/cgal/Portfile

Added Paths:
-----------
    trunk/dports/gis/cgal/files/patch-src-config.h.diff

Modified: trunk/dports/gis/cgal/Portfile
===================================================================
--- trunk/dports/gis/cgal/Portfile	2012-03-15 03:13:40 UTC (rev 90820)
+++ trunk/dports/gis/cgal/Portfile	2012-03-15 03:18:47 UTC (rev 90821)
@@ -35,6 +35,8 @@
 					port:zlib \
 					port:gmp
 
+patchfiles              patch-src-config.h.diff
+
 configure.args-append   -DCGAL_INSTALL_CMAKE_DIR="${prefix}/lib/cmake"
 
 # gcc 4.0 is too old to compile CGAL properly; see <http://www.cgal.org/FAQ.html#mac_optimization_bug>
@@ -68,7 +70,7 @@
 	depends_lib-append		port:libQGLViewer \
 							port:ipe
 
-	patchfiles				patch-CMakeLists.txt.diff
+	patchfiles-append       patch-CMakeLists.txt.diff
 
 	configure.args-append	-DWITH_examples=TRUE
 	configure.args-append	-DWITH_demos=TRUE

Added: trunk/dports/gis/cgal/files/patch-src-config.h.diff
===================================================================
--- trunk/dports/gis/cgal/files/patch-src-config.h.diff	                        (rev 0)
+++ trunk/dports/gis/cgal/files/patch-src-config.h.diff	2012-03-15 03:18:47 UTC (rev 90821)
@@ -0,0 +1,18 @@
+--- include/CGAL/config.h.orig	2012-03-14 15:41:38.000000000 +0000
++++ include/CGAL/config.h	2012-03-14 15:37:42.000000000 +0000
+@@ -26,6 +26,15 @@
+ #ifndef CGAL_CONFIG_H
+ #define CGAL_CONFIG_H
+ 
++
++// Workaround to the following bug: 
++//   https://bugreports.qt.nokia.com/browse/QTBUG-22829
++#ifdef Q_MOC_RUN 
++// When Qt moc runs on CGAL files, do not process 
++// <boost/type_traits/has_operator.hpp> 
++#  define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED 
++#endif
++
+ #ifdef CGAL_INCLUDE_WINDOWS_DOT_H
+ // Mimic users including this file which defines min max macros
+ // and other names leading to name clashes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120314/182c8e3c/attachment.html>