diff options
author | joerg <joerg> | 2013-02-26 11:15:18 +0000 |
---|---|---|
committer | joerg <joerg> | 2013-02-26 11:15:18 +0000 |
commit | 103617780708e6ca49ee796bbe81ee7a543d1e46 (patch) | |
tree | 1efce5b9569080f5eb5b1d19193e04939c9671e7 /geography/merkaartor/patches/patch-src_Maps_Coord.h | |
parent | 91f21e7f08d3136f5c84d7f95ca0027c7aedebc9 (diff) | |
download | pkgsrc-103617780708e6ca49ee796bbe81ee7a543d1e46.tar.gz |
Qt4's MOC can't deal with BOOST_JOIN, so disable some includes before it
sees the boost headers. Use C++11 tuple syntax.
Diffstat (limited to 'geography/merkaartor/patches/patch-src_Maps_Coord.h')
-rw-r--r-- | geography/merkaartor/patches/patch-src_Maps_Coord.h | 22 |
1 files changed, 22 insertions, 0 deletions
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) |