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_Features_Way.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_Features_Way.h')
| -rw-r--r-- | geography/merkaartor/patches/patch-src_Features_Way.h | 13 |
1 files changed, 13 insertions, 0 deletions
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 + |