Sun Jan 17 15:17:10 2016 UTC ()
Deal with limitations of Qt4's moc when parsing certain Boost headers.


(joerg)
diff -r1.28 -r1.29 pkgsrc/math/cgal/Makefile
diff -r1.5 -r1.6 pkgsrc/math/cgal/distinfo
diff -r0 -r1.1 pkgsrc/math/cgal/patches/patch-include_CGAL_Qt_GraphicsItem.h
diff -r0 -r1.1 pkgsrc/math/cgal/patches/patch-include_CGAL_Qt_GraphicsViewInput.h
cvs diff -r1.28 -r1.29 pkgsrc/math/cgal/Makefile (expand / switch to unified diff)

--- pkgsrc/math/cgal/Makefile 2015/04/25 14:23:29 1.28
+++ pkgsrc/math/cgal/Makefile 2016/01/17 15:17:09 1.29
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile,v 1.28 2015/04/25 14:23:29 tnn Exp $ 1# $NetBSD: Makefile,v 1.29 2016/01/17 15:17:09 joerg Exp $
2 2
3PKGNAME= cgal-3.9 3PKGNAME= cgal-3.9
4DISTNAME= CGAL-3.9 4DISTNAME= CGAL-3.9
5PKGREVISION= 25 5PKGREVISION= 25
6CATEGORIES= math 6CATEGORIES= math
7MASTER_SITES= https://gforge.inria.fr/frs/download.php/29125/ 7MASTER_SITES= https://gforge.inria.fr/frs/download.php/29125/
8 8
9MAINTAINER= reinoud@NetBSD.org 9MAINTAINER= reinoud@NetBSD.org
10HOMEPAGE= http://www.cgal.org/ 10HOMEPAGE= http://www.cgal.org/
11COMMENT= Computational Geometry Algorithms Library 11COMMENT= Computational Geometry Algorithms Library
12LICENSE= gnu-lgpl-v3 12LICENSE= gnu-lgpl-v3
13 13
14USE_CMAKE= yes 14USE_CMAKE= yes
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16 16
17pre-install: 17pre-install:
18 cd ${WRKSRC} && rm -f include/CGAL/Mesh_2/Do_not_refine_edges.h.orig include/CGAL/config.h.orig 18 find ${WRKSRC} -name \*.orig -exec rm {} \;
19 19
20.include "../../devel/boost-headers/buildlink3.mk" 20.include "../../devel/boost-headers/buildlink3.mk"
21.include "../../devel/boost-libs/buildlink3.mk" 21.include "../../devel/boost-libs/buildlink3.mk"
22.include "../../math/mpfr/buildlink3.mk" 22.include "../../math/mpfr/buildlink3.mk"
23.include "../../x11/qt4-libs/buildlink3.mk" 23.include "../../x11/qt4-libs/buildlink3.mk"
24.include "../../x11/qt4-tools/buildlink3.mk" 24.include "../../x11/qt4-tools/buildlink3.mk"
25.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/math/cgal/distinfo (expand / switch to unified diff)

--- pkgsrc/math/cgal/distinfo 2015/12/16 11:29:47 1.5
+++ pkgsrc/math/cgal/distinfo 2016/01/17 15:17:09 1.6
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1$NetBSD: distinfo,v 1.5 2015/12/16 11:29:47 bouyer Exp $ 1$NetBSD: distinfo,v 1.6 2016/01/17 15:17:09 joerg Exp $
2 2
3SHA1 (CGAL-3.9.tar.gz) = cc99fad7116f221b6301326834f71ff65cebf2eb 3SHA1 (CGAL-3.9.tar.gz) = cc99fad7116f221b6301326834f71ff65cebf2eb
4RMD160 (CGAL-3.9.tar.gz) = 0a5a929ecedeeac3833ec90f802b7f5ac069ad47 4RMD160 (CGAL-3.9.tar.gz) = 0a5a929ecedeeac3833ec90f802b7f5ac069ad47
5SHA512 (CGAL-3.9.tar.gz) = 9b03c08aae470877eb7fb2f16d7091a4ea2c79a643ba075d7b1bd5c056342c10e6fb3eed48a2756d74da48f6b7171f7d041446a0edb57ca212f0bb053912995d 5SHA512 (CGAL-3.9.tar.gz) = 9b03c08aae470877eb7fb2f16d7091a4ea2c79a643ba075d7b1bd5c056342c10e6fb3eed48a2756d74da48f6b7171f7d041446a0edb57ca212f0bb053912995d
6Size (CGAL-3.9.tar.gz) = 14276059 bytes 6Size (CGAL-3.9.tar.gz) = 14276059 bytes
7SHA1 (patch-include_CGAL_Mesh__2_Do__not__refine__edges.h) = 5a66b2ff56d3e20e554ab73829e3c8c735144489 7SHA1 (patch-include_CGAL_Mesh__2_Do__not__refine__edges.h) = 5a66b2ff56d3e20e554ab73829e3c8c735144489
 8SHA1 (patch-include_CGAL_Qt_GraphicsItem.h) = 34f78072a610d7054d9b879aa697b96b7ee62e5a
 9SHA1 (patch-include_CGAL_Qt_GraphicsViewInput.h) = f842396bfb15a264cf86528781fac90c61c58ce9
8SHA1 (patch-include_CGAL_config.h) = ba29667305fc4868a9995048801408e95d75bd41 10SHA1 (patch-include_CGAL_config.h) = ba29667305fc4868a9995048801408e95d75bd41
9SHA1 (patch-manpage-installation) = c664f64ccc9507871c1ada46b983f0d006b13fe6 11SHA1 (patch-manpage-installation) = c664f64ccc9507871c1ada46b983f0d006b13fe6
10SHA1 (patch-src-CMakeLists.txt) = 26e92c17b26bce8f0dd5a97ded689764fd243da0 12SHA1 (patch-src-CMakeLists.txt) = 26e92c17b26bce8f0dd5a97ded689764fd243da0
File Added: pkgsrc/math/cgal/patches/Attic/patch-include_CGAL_Qt_GraphicsItem.h
$NetBSD: patch-include_CGAL_Qt_GraphicsItem.h,v 1.1 2016/01/17 15:17:10 joerg Exp $

qt4's moc can't deal with BOOST_JOIN in newer versions of Boost, so hide
the problematic includes.

--- include/CGAL/Qt/GraphicsItem.h.orig	2016-01-16 15:12:02.000000000 +0000
+++ include/CGAL/Qt/GraphicsItem.h
@@ -24,8 +24,9 @@
 #include <CGAL/auto_link/Qt4.h>
 #include <QObject>
 #include <QGraphicsItem>
+#ifndef Q_MOC_RUN
 #include <CGAL/Object.h>
-
+#endif
 
 
 namespace CGAL {
File Added: pkgsrc/math/cgal/patches/Attic/patch-include_CGAL_Qt_GraphicsViewInput.h
$NetBSD: patch-include_CGAL_Qt_GraphicsViewInput.h,v 1.1 2016/01/17 15:17:10 joerg Exp $

qt4's moc can't deal with BOOST_JOIN in newer versions of Boost, so hide
the problematic includes.

--- include/CGAL/Qt/GraphicsViewInput.h.orig	2016-01-16 15:09:29.000000000 +0000
+++ include/CGAL/Qt/GraphicsViewInput.h
@@ -22,7 +22,9 @@
 #define CGAL_QT_GRAPHICS_VIEW_INPUT_H
 
 #include <CGAL/auto_link/Qt4.h>
+#ifndef Q_MOC_RUN
 #include <CGAL/Object.h>
+#endif
 #include <QObject>
 
 namespace CGAL {