From 103617780708e6ca49ee796bbe81ee7a543d1e46 Mon Sep 17 00:00:00 2001 From: joerg Date: Tue, 26 Feb 2013 11:15:18 +0000 Subject: Qt4's MOC can't deal with BOOST_JOIN, so disable some includes before it sees the boost headers. Use C++11 tuple syntax. --- geography/merkaartor/Makefile | 7 ++++- geography/merkaartor/distinfo | 9 +++++- ...lgorithms_overlay_get__intersection__points.hpp | 15 +++++++++ ...de_builtin-ggl_ggl_geometries_adapted_tuple.hpp | 36 ++++++++++++++++++++++ .../patches/patch-src_Features_Feature.h | 32 +++++++++++++++++++ .../merkaartor/patches/patch-src_Features_Node.h | 13 ++++++++ .../merkaartor/patches/patch-src_Features_Way.h | 13 ++++++++ .../merkaartor/patches/patch-src_Maps_Coord.h | 22 +++++++++++++ .../merkaartor/patches/patch-src_Maps_Projection.h | 13 ++++++++ 9 files changed, 158 insertions(+), 2 deletions(-) create mode 100644 geography/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp create mode 100644 geography/merkaartor/patches/patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp create mode 100644 geography/merkaartor/patches/patch-src_Features_Feature.h create mode 100644 geography/merkaartor/patches/patch-src_Features_Node.h create mode 100644 geography/merkaartor/patches/patch-src_Features_Way.h create mode 100644 geography/merkaartor/patches/patch-src_Maps_Coord.h create mode 100644 geography/merkaartor/patches/patch-src_Maps_Projection.h (limited to 'geography/merkaartor') diff --git a/geography/merkaartor/Makefile b/geography/merkaartor/Makefile index e72e96c53e1..607c7e06e2b 100644 --- a/geography/merkaartor/Makefile +++ b/geography/merkaartor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2013/02/16 11:21:33 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2013/02/26 11:15:18 joerg Exp $ # DISTNAME= merkaartor-0.17.2 @@ -32,6 +32,11 @@ do-configure: ${QMAKE} ${CONFIGURE_ARGS} Merkaartor.pro && \ ${MAKE} qmake +.include "../../mk/compiler.mk" +.if !empty(PKGSRC_COMPILER:Mclang) +_WRAP_EXTRA_ARGS.CXX+= -std=c++11 +.endif + .include "../../devel/boost-headers/buildlink3.mk" .include "../../geography/gdal-lib/buildlink3.mk" .include "../../geography/gpsd/buildlink3.mk" diff --git a/geography/merkaartor/distinfo b/geography/merkaartor/distinfo index 0ab0a0f40f3..d39d519ca6e 100644 --- a/geography/merkaartor/distinfo +++ b/geography/merkaartor/distinfo @@ -1,6 +1,13 @@ -$NetBSD: distinfo,v 1.9 2011/04/12 17:14:53 drochner Exp $ +$NetBSD: distinfo,v 1.10 2013/02/26 11:15:19 joerg Exp $ SHA1 (merkaartor-0.17.2.tar.bz2) = f789141db427bf25bb3b61801fefc98ab0430012 RMD160 (merkaartor-0.17.2.tar.bz2) = c5c8944872828ba5ada6003cd5821f33899da3cb Size (merkaartor-0.17.2.tar.bz2) = 7138991 bytes SHA1 (patch-aa) = bd8ac239c841f47260925a2749063849d67c839f +SHA1 (patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp) = 4ac08df56c12c5a453548f3df53f85d4741c28b6 +SHA1 (patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp) = 1c6537cf877417cf1b05b33174c2358af313f7ad +SHA1 (patch-src_Features_Feature.h) = 1d31698414dd0da41377b776b4d6d40510413a1c +SHA1 (patch-src_Features_Node.h) = 2a63be6047878b8fd31a88ef039e9ca4d050b715 +SHA1 (patch-src_Features_Way.h) = 17de3e44e62124e4244a0b33f1a9f6198b89e375 +SHA1 (patch-src_Maps_Coord.h) = 774d95301d20e11a13c60cfefac6a424fbdfa77d +SHA1 (patch-src_Maps_Projection.h) = f75dabd1ca64844aaab0255fa3b61d7143bece73 diff --git a/geography/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp b/geography/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp new file mode 100644 index 00000000000..a7dcde790d2 --- /dev/null +++ b/geography/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp @@ -0,0 +1,15 @@ +$NetBSD: patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp,v 1.1 2013/02/26 11:15:19 joerg Exp $ + +--- include/builtin-ggl/ggl/algorithms/overlay/get_intersection_points.hpp.orig 2011-02-10 12:00:35.000000000 +0000 ++++ include/builtin-ggl/ggl/algorithms/overlay/get_intersection_points.hpp +@@ -94,8 +94,8 @@ struct relate + > + >::relate(s1, s2); + +- ip_type& is = result.get<0>(); +- policies::relate::direction_type & dir = result.get<1>(); ++ ip_type& is = get<0>(result); ++ policies::relate::direction_type & dir = get<1>(result); + + for (int i = 0; i < is.count; i++) + { diff --git a/geography/merkaartor/patches/patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp b/geography/merkaartor/patches/patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp new file mode 100644 index 00000000000..3edce1b5687 --- /dev/null +++ b/geography/merkaartor/patches/patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp @@ -0,0 +1,36 @@ +$NetBSD: patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp,v 1.1 2013/02/26 11:15:19 joerg Exp $ + +--- include/builtin-ggl/ggl/geometries/adapted/tuple.hpp.orig 2011-02-10 12:00:35.000000000 +0000 ++++ include/builtin-ggl/ggl/geometries/adapted/tuple.hpp +@@ -39,13 +39,13 @@ struct access > + template + static inline T get(const boost::tuple& p) + { +- return p.get(); ++ return get(p); + } + + template + static inline void set(boost::tuple& p, const T& value) + { +- p.get() = value; ++ get(p) = value; + } + }; + +@@ -71,13 +71,13 @@ struct access > + template + static inline T get(const boost::tuple& p) + { +- return p.get(); ++ return get(p); + } + + template + static inline void set(boost::tuple& p, const T& value) + { +- p.get() = value; ++ get(p) = value; + } + }; + diff --git a/geography/merkaartor/patches/patch-src_Features_Feature.h b/geography/merkaartor/patches/patch-src_Features_Feature.h new file mode 100644 index 00000000000..5f509e0b1cf --- /dev/null +++ b/geography/merkaartor/patches/patch-src_Features_Feature.h @@ -0,0 +1,32 @@ +$NetBSD: patch-src_Features_Feature.h,v 1.1 2013/02/26 11:15:19 joerg Exp $ + +--- src/Features/Feature.h.orig 2011-02-10 12:00:35.000000000 +0000 ++++ src/Features/Feature.h +@@ -9,6 +9,14 @@ + #include + #include + ++class Feature; ++ ++namespace boost ++{ ++ void intrusive_ptr_add_ref(Feature * p); ++ void intrusive_ptr_release(Feature * p); ++} ++ + #include + + #define CAST_FEATURE(x) (dynamic_cast(x)) +@@ -79,12 +87,6 @@ class RenderPriority + int theLayer; + }; + +-namespace boost +-{ +- void intrusive_ptr_add_ref(Feature * p); +- void intrusive_ptr_release(Feature * p); +-} +- + /// Used to store objects of the map + class Feature : public IFeature + { diff --git a/geography/merkaartor/patches/patch-src_Features_Node.h b/geography/merkaartor/patches/patch-src_Features_Node.h new file mode 100644 index 00000000000..5c5d1e1ee32 --- /dev/null +++ b/geography/merkaartor/patches/patch-src_Features_Node.h @@ -0,0 +1,13 @@ +$NetBSD: patch-src_Features_Node.h,v 1.1 2013/02/26 11:15:19 joerg Exp $ + +--- src/Features/Node.h.orig 2013-02-25 22:41:59.000000000 +0000 ++++ src/Features/Node.h +@@ -12,7 +12,7 @@ + #include + #include + +-#ifndef _MOBILE ++#if !defined(_MOBILE) && !defined(Q_MOC_RUN) + #include + #include + #endif diff --git a/geography/merkaartor/patches/patch-src_Features_Way.h b/geography/merkaartor/patches/patch-src_Features_Way.h new file mode 100644 index 00000000000..2c9873eb7df --- /dev/null +++ b/geography/merkaartor/patches/patch-src_Features_Way.h @@ -0,0 +1,13 @@ +$NetBSD: patch-src_Features_Way.h,v 1.1 2013/02/26 11:15:19 joerg Exp $ + +--- src/Features/Way.h.orig 2013-02-25 22:42:09.000000000 +0000 ++++ src/Features/Way.h +@@ -8,7 +8,7 @@ + #include "Layer.h" + #include "OsbLayer.h" + +-#ifndef _MOBILE ++#if !defined(_MOBILE) && !defined(Q_MOC_RUN) + #include + #endif + diff --git a/geography/merkaartor/patches/patch-src_Maps_Coord.h b/geography/merkaartor/patches/patch-src_Maps_Coord.h new file mode 100644 index 00000000000..f2add943158 --- /dev/null +++ b/geography/merkaartor/patches/patch-src_Maps_Coord.h @@ -0,0 +1,22 @@ +$NetBSD: patch-src_Maps_Coord.h,v 1.1 2013/02/26 11:15:19 joerg Exp $ + +--- src/Maps/Coord.h.orig 2013-02-25 22:20:17.000000000 +0000 ++++ src/Maps/Coord.h +@@ -127,7 +127,7 @@ class Coord + uint qHash(const Coord &c); + + +-#ifndef _MOBILE ++#if !defined(_MOBILE) && !defined(Q_MOC_RUN) + #include + #include + +@@ -312,7 +312,7 @@ class CoordBox + + Q_DECLARE_METATYPE( CoordBox ); + +-#ifndef _MOBILE ++#if !defined(_MOBILE) && !defined(Q_MOC_RUN) + #include + + GEOMETRY_REGISTER_BOX(CoordBox, Coord, BottomLeft, TopRight) diff --git a/geography/merkaartor/patches/patch-src_Maps_Projection.h b/geography/merkaartor/patches/patch-src_Maps_Projection.h new file mode 100644 index 00000000000..86f5c542a67 --- /dev/null +++ b/geography/merkaartor/patches/patch-src_Maps_Projection.h @@ -0,0 +1,13 @@ +$NetBSD: patch-src_Maps_Projection.h,v 1.1 2013/02/26 11:15:19 joerg Exp $ + +--- src/Maps/Projection.h.orig 2013-02-25 22:35:30.000000000 +0000 ++++ src/Maps/Projection.h +@@ -6,7 +6,7 @@ + + #include + +-#ifndef _MOBILE ++#if !defined(_MOBILE) && !defined(Q_MOC_RUN) + + #include "Preferences/MerkaartorPreferences.h" + -- cgit v1.2.3