diff options
Diffstat (limited to 'geography/merkaartor/patches')
7 files changed, 144 insertions, 0 deletions
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<boost::tuple<T, T> > + template <int I> + static inline T get(const boost::tuple<T, T>& p) + { +- return p.get<I>(); ++ return get<I>(p); + } + + template <int I> + static inline void set(boost::tuple<T, T>& p, const T& value) + { +- p.get<I>() = value; ++ get<I>(p) = value; + } + }; + +@@ -71,13 +71,13 @@ struct access<boost::tuple<T, T, T> > + template <int I> + static inline T get(const boost::tuple<T, T, T>& p) + { +- return p.get<I>(); ++ return get<I>(p); + } + + template <int I> + static inline void set(boost::tuple<T, T, T>& p, const T& value) + { +- p.get<I>() = value; ++ get<I>(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 <QtCore/QString> + #include <QList> + ++class Feature; ++ ++namespace boost ++{ ++ void intrusive_ptr_add_ref(Feature * p); ++ void intrusive_ptr_release(Feature * p); ++} ++ + #include <boost/intrusive_ptr.hpp> + + #define CAST_FEATURE(x) (dynamic_cast<Feature*>(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 <QtCore/QDateTime> + #include <QtXml> + +-#ifndef _MOBILE ++#if !defined(_MOBILE) && !defined(Q_MOC_RUN) + #include <ggl/ggl.hpp> + #include <ggl/geometries/register/point.hpp> + #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 <ggl/ggl.hpp> + #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 <ggl/ggl.hpp> + #include <ggl/geometries/register/point.hpp> + +@@ -312,7 +312,7 @@ class CoordBox + + Q_DECLARE_METATYPE( CoordBox ); + +-#ifndef _MOBILE ++#if !defined(_MOBILE) && !defined(Q_MOC_RUN) + #include <ggl/geometries/register/box.hpp> + + 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 <QPointF> + +-#ifndef _MOBILE ++#if !defined(_MOBILE) && !defined(Q_MOC_RUN) + + #include "Preferences/MerkaartorPreferences.h" + |