Attachment #160256 for bug #202597

View | Details | Raw Unified | Return to bug 202597
Collapse All | Expand All

Lines 2-10 Link Here

(-)Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= sfcgal	4	PORTNAME= sfcgal
5	PORTVERSION= 1.0.5	5	PORTVERSION= 1.1.0
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 1
8	CATEGORIES= databases math graphics	7	CATEGORIES= databases math graphics
9		8
10	MAINTAINER= coder@tuxfamily.org	9	MAINTAINER= coder@tuxfamily.org

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (Oslandia-SFCGAL-v1.0.5_GH0.tar.gz) = a9cdaf7334bf28dc71c6338d090c1d1402041c5e320b6c2e3669f7758946a01c	1	SHA256 (Oslandia-SFCGAL-v1.1.0_GH0.tar.gz) = 00e1bde3e1353592700bcc36d62cb31fec3b61c31c0fb93a0c74873bccf7b102
2	SIZE (Oslandia-SFCGAL-v1.0.5_GH0.tar.gz) = 2376514	2	SIZE (Oslandia-SFCGAL-v1.1.0_GH0.tar.gz) = 2393394




--- src/detail/GeometrySet.cpp.orig	2015-08-22 08:16:53.155553000 +0200
+++ src/detail/GeometrySet.cpp	2015-08-22 08:17:16.690542000 +0200
@@ -557,10 +557,10 @@
 
 // compare less than
 struct ComparePoints {
-    bool operator()( const CGAL::Point_2<Kernel>& lhs, const CGAL::Point_2<Kernel>& rhs ) {
+    bool operator()( const CGAL::Point_2<Kernel>& lhs, const CGAL::Point_2<Kernel>& rhs ) const {
         return lhs.x() < rhs.x() || lhs.y() < rhs.y();
     }
-    bool operator()( const CGAL::Point_3<Kernel>& lhs, const CGAL::Point_3<Kernel>& rhs ) {
+    bool operator()( const CGAL::Point_3<Kernel>& lhs, const CGAL::Point_3<Kernel>& rhs ) const {
         return lhs.x() < rhs.x() || lhs.y() < rhs.y() || lhs.z() < rhs.z();
     }
 };




include/SFCGAL/algorithm/convexHull.h
include/SFCGAL/algorithm/covers.h
include/SFCGAL/algorithm/difference.h
include/SFCGAL/algorithm/differencePrimitives.h
include/SFCGAL/algorithm/distance.h
include/SFCGAL/algorithm/distance3d.h
include/SFCGAL/algorithm/extrude.h

include/SFCGAL/algorithm/straightSkeleton.h
include/SFCGAL/algorithm/tesselate.h
include/SFCGAL/algorithm/translate.h
include/SFCGAL/algorithm/union.h
include/SFCGAL/algorithm/volume.h
include/SFCGAL/capi/sfcgal_c.h
include/SFCGAL/config.h
include/SFCGAL/config.h.cmake
include/SFCGAL/detail/ComplexComparator.h
include/SFCGAL/detail/EnvelopeVisitor.h
include/SFCGAL/detail/GeometrySet.h

include/SFCGAL/triangulate/triangulate2DZ.h
include/SFCGAL/triangulate/triangulatePolygon.h
include/SFCGAL/version.h
include/SFCGAL/version.h.cmake
lib/libSFCGAL.so
lib/libSFCGAL.so.1
lib/libSFCGAL.so.1.1.0

Return to bug 202597

Line 0 Link Here

(-)files/patch-src-detail-GeometrySet.cpp (+15 lines)
	1	--- src/detail/GeometrySet.cpp.orig 2015-08-22 08:16:53.155553000 +0200
	2	+++ src/detail/GeometrySet.cpp 2015-08-22 08:17:16.690542000 +0200
	3	@@ -557,10 +557,10 @@
	4
	5	// compare less than
	6	struct ComparePoints {
	7	- bool operator()( const CGAL::Point_2<Kernel>& lhs, const CGAL::Point_2<Kernel>& rhs ) {
	8	+ bool operator()( const CGAL::Point_2<Kernel>& lhs, const CGAL::Point_2<Kernel>& rhs ) const {
	9	return lhs.x() < rhs.x() \|\| lhs.y() < rhs.y();
	10	}
	11	- bool operator()( const CGAL::Point_3<Kernel>& lhs, const CGAL::Point_3<Kernel>& rhs ) {
	12	+ bool operator()( const CGAL::Point_3<Kernel>& lhs, const CGAL::Point_3<Kernel>& rhs ) const {
	13	return lhs.x() < rhs.x() \|\| lhs.y() < rhs.y() \|\| lhs.z() < rhs.z();
	14	}
	15	};

Lines 33-38 Link Here

(-)pkg-plist (-3 / +3 lines)
33	include/SFCGAL/algorithm/convexHull.h	33	include/SFCGAL/algorithm/convexHull.h
34	include/SFCGAL/algorithm/covers.h	34	include/SFCGAL/algorithm/covers.h
35	include/SFCGAL/algorithm/difference.h	35	include/SFCGAL/algorithm/difference.h
		36	include/SFCGAL/algorithm/differencePrimitives.h
36	include/SFCGAL/algorithm/distance.h	37	include/SFCGAL/algorithm/distance.h
37	include/SFCGAL/algorithm/distance3d.h	38	include/SFCGAL/algorithm/distance3d.h
38	include/SFCGAL/algorithm/extrude.h	39	include/SFCGAL/algorithm/extrude.h
Lines 50-59 Link Here
50	include/SFCGAL/algorithm/straightSkeleton.h	51	include/SFCGAL/algorithm/straightSkeleton.h
51	include/SFCGAL/algorithm/tesselate.h	52	include/SFCGAL/algorithm/tesselate.h
52	include/SFCGAL/algorithm/translate.h	53	include/SFCGAL/algorithm/translate.h
		54	include/SFCGAL/algorithm/union.h
53	include/SFCGAL/algorithm/volume.h	55	include/SFCGAL/algorithm/volume.h
54	include/SFCGAL/capi/sfcgal_c.h	56	include/SFCGAL/capi/sfcgal_c.h
55	include/SFCGAL/config.h	57	include/SFCGAL/config.h
56	include/SFCGAL/config.h.cmake
57	include/SFCGAL/detail/ComplexComparator.h	58	include/SFCGAL/detail/ComplexComparator.h
58	include/SFCGAL/detail/EnvelopeVisitor.h	59	include/SFCGAL/detail/EnvelopeVisitor.h
59	include/SFCGAL/detail/GeometrySet.h	60	include/SFCGAL/detail/GeometrySet.h
Lines 103-109 Link Here
103	include/SFCGAL/triangulate/triangulate2DZ.h	104	include/SFCGAL/triangulate/triangulate2DZ.h
104	include/SFCGAL/triangulate/triangulatePolygon.h	105	include/SFCGAL/triangulate/triangulatePolygon.h
105	include/SFCGAL/version.h	106	include/SFCGAL/version.h
106	include/SFCGAL/version.h.cmake
107	lib/libSFCGAL.so	107	lib/libSFCGAL.so
108	lib/libSFCGAL.so.1	108	lib/libSFCGAL.so.1
109	lib/libSFCGAL.so.1.0.5	109	lib/libSFCGAL.so.1.1.0