pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
merkator: rm (pkgsrc has been updated using this and PR)
Module Name: pkgsrc-wip
Committed By: Greg Troxel <gdt%lexort.com@localhost>
Pushed By: gdt
Date: Fri Sep 25 16:51:44 2020 +0000
Changeset: ac205a0c00188eb7cd3b42ec99f229824f3f5d11
Modified Files:
Makefile
Removed Files:
merkaartor/DESCR
merkaartor/Makefile
merkaartor/PLIST
merkaartor/TODO
merkaartor/distinfo
merkaartor/patches/patch-3rdparty_qtsingleapplication-2.6__1-opensource_src_qtlocalpeer.cpp
merkaartor/patches/patch-aa
merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp
merkaartor/patches/patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp
merkaartor/patches/patch-src_Features_Feature.h
merkaartor/patches/patch-src_Features_Node.h
merkaartor/patches/patch-src_Features_Way.h
merkaartor/patches/patch-src_ImportExport_ImportCSVDialog.cpp
merkaartor/patches/patch-src_Maps_Coord.h
merkaartor/patches/patch-src_Maps_Projection.h
Log Message:
merkator: rm (pkgsrc has been updated using this and PR)
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ac205a0c00188eb7cd3b42ec99f229824f3f5d11
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
merkaartor/DESCR | 6 ---
merkaartor/Makefile | 55 -------------------
merkaartor/PLIST | 35 -------------
merkaartor/TODO | 3 --
merkaartor/distinfo | 16 ------
...plication-2.6__1-opensource_src_qtlocalpeer.cpp | 13 -----
merkaartor/patches/patch-aa | 61 ----------------------
...lgorithms_overlay_get__intersection__points.hpp | 15 ------
...de_builtin-ggl_ggl_geometries_adapted_tuple.hpp | 36 -------------
merkaartor/patches/patch-src_Features_Feature.h | 32 ------------
merkaartor/patches/patch-src_Features_Node.h | 13 -----
merkaartor/patches/patch-src_Features_Way.h | 13 -----
.../patch-src_ImportExport_ImportCSVDialog.cpp | 13 -----
merkaartor/patches/patch-src_Maps_Coord.h | 22 --------
merkaartor/patches/patch-src_Maps_Projection.h | 13 -----
16 files changed, 347 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 48bb22b2a8..a479db243d 100644
--- a/Makefile
+++ b/Makefile
@@ -2151,7 +2151,6 @@ SUBDIR+= meka-git
SUBDIR+= memdump
SUBDIR+= memgrep
SUBDIR+= menumaker
-SUBDIR+= merkaartor
SUBDIR+= mes-nyacc
SUBDIR+= mescc-tools
SUBDIR+= meta-tracker
diff --git a/merkaartor/DESCR b/merkaartor/DESCR
deleted file mode 100644
index c8ee5485ec..0000000000
--- a/merkaartor/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Merkaartor is an OpenStreetMap mapping program. Merkaartor focuses on
-providing a visually pleasing but performant editing environment for free
-geographical data.
-
-This is the current release, from 2016-09. It is no longer maintained
-upstream.
diff --git a/merkaartor/Makefile b/merkaartor/Makefile
deleted file mode 100644
index b84d95629e..0000000000
--- a/merkaartor/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile,v 1.75 2019/08/22 12:23:15 ryoon Exp $
-
-GITHUB_PROJECT= merkaartor
-VERSION= 0.18.4
-DISTNAME= ${VERSION}
-PKGNAME= ${GITHUB_PROJECT}-${DISTNAME}
-CATEGORIES= geography
-MASTER_SITES= ${MASTER_SITE_GITHUB:=openstreetmap/}
-DIST_SUBDIR= ${GITHUB_PROJECT}
-
-MAINTAINER= gdt%NetBSD.org@localhost
-HOMEPAGE= http://www.merkaartor.be/
-COMMENT= Merkaartor is an OpenStreetMap mapping program
-
-# Note that Debian has removed merkaartor because it fails to build
-# with proj 6 and gdal 3.
-
-WRKSRC= ${WRKDIR}/merkaartor-${VERSION}
-
-USE_LANGUAGES= c c++11
-USE_LIBTOOL= yes
-QMAKE= ${QTDIR}/bin/qmake
-CONFIGURE_ARGS= PREFIX=${PREFIX} NODEBUG=1 OSMARENDER=1 PROJ=1 GDAL=1 \
- GEOIMAGE=1 GPSDLIB=1 RELEASE=1
-
-SUBST_CLASSES+= installtarget
-SUBST_MESSAGE.installtarget= Fixing wrong install target
-SUBST_STAGE.installtarget= post-configure
-SUBST_FILES.installtarget= ${WRKSRC}/src/Makefile
-SUBST_SED.installtarget= -e 's:--mode=install cp "$$(QMAKE_TARGET)":--mode=install cp "$$(TARGET)":'
-
-INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
-
-do-configure:
- cd ${WRKSRC} && \
- ${QTDIR}/bin/lrelease src/src.pro
- cd ${WRKSRC} && \
- ${QMAKE} ${CONFIGURE_ARGS} Merkaartor.pro && \
- ${MAKE} qmake
-
-CHECK_PORTABILITY_SKIP+= ci/travis-osx-install.sh
-
-.include "../../devel/boost-headers/buildlink3.mk"
-.include "../../geography/gdal-lib/buildlink3.mk"
-.include "../../geography/gpsd/buildlink3.mk"
-.include "../../geography/proj/buildlink3.mk"
-.include "../../graphics/exiv2/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtwebkit/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/merkaartor/PLIST b/merkaartor/PLIST
deleted file mode 100644
index 87fad68cf7..0000000000
--- a/merkaartor/PLIST
+++ /dev/null
@@ -1,35 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2011/04/11 20:15:00 drochner Exp $
-bin/merkaartor
-lib/merkaartor/plugins/background/libMCadastreFranceBackgroundPlugin.la
-lib/merkaartor/plugins/background/libMGdalBackgroundPlugin.la
-lib/merkaartor/plugins/background/libMGeoTiffBackgroundPlugin.la
-lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.la
-lib/merkaartor/plugins/background/libMWalkingPapersBackgroundPlugin.la
-lib/merkaartor/plugins/background/libMYahooBackgroundPlugin.la
-lib/merkaartor/plugins/background/libMYahooTiledBackgroundPlugin.la
-lib/merkaartor/plugins/styles/libskulpture.la
-share/applications/merkaartor.desktop
-share/icons/hicolor/48x48/apps/merkaartor.png
-share/merkaartor/BookmarksList.xml
-share/merkaartor/Projections.xml
-share/merkaartor/TmsServersList.xml
-share/merkaartor/WmsServersList.xml
-share/merkaartor/translations/merkaartor_ar.qm
-share/merkaartor/translations/merkaartor_cs.qm
-share/merkaartor/translations/merkaartor_de.qm
-share/merkaartor/translations/merkaartor_es.qm
-share/merkaartor/translations/merkaartor_et.qm
-share/merkaartor/translations/merkaartor_fr.qm
-share/merkaartor/translations/merkaartor_hr.qm
-share/merkaartor/translations/merkaartor_hu.qm
-share/merkaartor/translations/merkaartor_it.qm
-share/merkaartor/translations/merkaartor_ja.qm
-share/merkaartor/translations/merkaartor_nl.qm
-share/merkaartor/translations/merkaartor_pl.qm
-share/merkaartor/translations/merkaartor_pt.qm
-share/merkaartor/translations/merkaartor_pt_BR.qm
-share/merkaartor/translations/merkaartor_ru.qm
-share/merkaartor/translations/merkaartor_sk.qm
-share/merkaartor/translations/merkaartor_sv.qm
-share/merkaartor/translations/merkaartor_uk.qm
-share/merkaartor/world_background.osb
diff --git a/merkaartor/TODO b/merkaartor/TODO
deleted file mode 100644
index 8600651418..0000000000
--- a/merkaartor/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-This does not seem to build, and might need webkitwidgtets. It's
-being parked in wip because the update from 0.17 is not entirely
-straightforward.
diff --git a/merkaartor/distinfo b/merkaartor/distinfo
deleted file mode 100644
index d03dcf161e..0000000000
--- a/merkaartor/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 00:08:43 agc Exp $
-
-SHA1 (merkaartor/0.18.4.tar.gz) = 5d2ed7d186fcfd076801a0724e5c65eb2444cad2
-RMD160 (merkaartor/0.18.4.tar.gz) = a4b237ac068bcca545f3a2d1eea5097e8173aaf5
-SHA512 (merkaartor/0.18.4.tar.gz) = 16001688584fd13eb7573159092a21ed0189ae0ce900474bacd5b1e47b8cebb0c4b2bd5b904e13a0029ec01167b68a32a9936914b3f5a1360b389aa31858cf9c
-Size (merkaartor/0.18.4.tar.gz) = 6562065 bytes
-SHA1 (patch-3rdparty_qtsingleapplication-2.6__1-opensource_src_qtlocalpeer.cpp) = 1b3f1328a4bf016935a3ceb04b9339584b6e701d
-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_ImportExport_ImportCSVDialog.cpp) = 3f0c0a03ef46be0bc9d20dfeccee3cd994ed2f57
-SHA1 (patch-src_Maps_Coord.h) = 774d95301d20e11a13c60cfefac6a424fbdfa77d
-SHA1 (patch-src_Maps_Projection.h) = f75dabd1ca64844aaab0255fa3b61d7143bece73
diff --git a/merkaartor/patches/patch-3rdparty_qtsingleapplication-2.6__1-opensource_src_qtlocalpeer.cpp b/merkaartor/patches/patch-3rdparty_qtsingleapplication-2.6__1-opensource_src_qtlocalpeer.cpp
deleted file mode 100644
index f2bdd53d5b..0000000000
--- a/merkaartor/patches/patch-3rdparty_qtsingleapplication-2.6__1-opensource_src_qtlocalpeer.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-3rdparty_qtsingleapplication-2.6__1-opensource_src_qtlocalpeer.cpp,v 1.1 2013/05/25 23:43:25 joerg Exp $
-
---- 3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp.orig 2013-05-25 19:14:26.000000000 +0000
-+++ 3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp
-@@ -59,6 +59,8 @@ static PProcessIdToSessionId pProcessIdT
- #include <time.h>
- #endif
-
-+#include <unistd.h>
-+
- namespace QtLP_Private {
- #include "qtlockedfile.cpp"
- #if defined(Q_OS_WIN)
diff --git a/merkaartor/patches/patch-aa b/merkaartor/patches/patch-aa
deleted file mode 100644
index f2efc1a836..0000000000
--- a/merkaartor/patches/patch-aa
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2011/04/12 17:14:53 drochner Exp $
-
---- src/GPS/qgpsdevice.cpp.orig 2011-02-10 12:00:35.000000000 +0000
-+++ src/GPS/qgpsdevice.cpp
-@@ -959,10 +959,9 @@ void QGPSDDevice::run()
- // exec();
- QEventLoop l;
-
-- Server = new gpsmm();
- errno = 0;
-- gpsdata = Server->open(M_PREFS->getGpsdHost().toAscii().data(),QString::number(M_PREFS->getGpsdPort()).toAscii().data());
-- if (!gpsdata) {
-+ Server = new gpsmm(M_PREFS->getGpsdHost().toAscii().data(),QString::number(M_PREFS->getGpsdPort()).toAscii().data());
-+ if (!Server) {
- #ifndef Q_OS_WIN32
- QString msg( (errno<0) ? gps_errstr(errno) : strerror(errno) );
- #else
-@@ -978,7 +977,7 @@ void QGPSDDevice::run()
-
- forever {
- #if GPSD_API_MAJOR_VERSION > 3
-- if (Server->waiting())
-+ if (Server->waiting(0))
- #endif
- onDataAvailable();
- l.processEvents();
-@@ -994,7 +993,7 @@ void QGPSDDevice::onDataAvailable()
- if (!gpsdata)
- return;
- #else
-- if ( Server->waiting() )
-+ if ( Server->waiting(0) )
- {
- errno = 0;
- gpsdata = Server->read();
-@@ -1026,14 +1025,22 @@ void QGPSDDevice::onDataAvailable()
- setFixStatus(StatusActive);
- setLatitude(gpsdata->fix.latitude);
- setLongitude(gpsdata->fix.longitude);
-+ if (gpsdata->fix.latitude < 0)
-+ setLatCardinal(CardinalSouth);
-+ else
-+ setLatCardinal(CardinalNorth);
-+ if (gpsdata->fix.longitude < 0)
-+ setLongCardinal(CardinalWest);
-+ else
-+ setLongCardinal(CardinalEast);
- double Alt = gpsdata->fix.altitude;
-- if (!__isnan(Alt))
-+ if (!std::isnan(Alt))
- setAltitude(Alt);
- double Speed = gpsdata->fix.speed;
-- if (!__isnan(Speed))
-+ if (!std::isnan(Speed))
- setSpeed(Speed);
- double Heading = gpsdata->fix.track;
-- if (!__isnan(Heading))
-+ if (!std::isnan(Heading))
- setHeading(Heading);
- if (gpsdata->fix.time)
- cur_datetime = QDateTime::fromTime_t(gpsdata->fix.time);
diff --git a/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp b/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp
deleted file mode 100644
index a7dcde790d..0000000000
--- a/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$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/merkaartor/patches/patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp b/merkaartor/patches/patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp
deleted file mode 100644
index 3edce1b568..0000000000
--- a/merkaartor/patches/patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-$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/merkaartor/patches/patch-src_Features_Feature.h b/merkaartor/patches/patch-src_Features_Feature.h
deleted file mode 100644
index 5f509e0b1c..0000000000
--- a/merkaartor/patches/patch-src_Features_Feature.h
+++ /dev/null
@@ -1,32 +0,0 @@
-$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/merkaartor/patches/patch-src_Features_Node.h b/merkaartor/patches/patch-src_Features_Node.h
deleted file mode 100644
index 5c5d1e1ee3..0000000000
--- a/merkaartor/patches/patch-src_Features_Node.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$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/merkaartor/patches/patch-src_Features_Way.h b/merkaartor/patches/patch-src_Features_Way.h
deleted file mode 100644
index 2c9873eb7d..0000000000
--- a/merkaartor/patches/patch-src_Features_Way.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$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/merkaartor/patches/patch-src_ImportExport_ImportCSVDialog.cpp b/merkaartor/patches/patch-src_ImportExport_ImportCSVDialog.cpp
deleted file mode 100644
index f29d3e6e80..0000000000
--- a/merkaartor/patches/patch-src_ImportExport_ImportCSVDialog.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_ImportExport_ImportCSVDialog.cpp,v 1.1 2013/08/27 15:51:27 joerg Exp $
-
---- src/ImportExport/ImportCSVDialog.cpp.orig 2013-08-27 15:03:55.000000000 +0000
-+++ src/ImportExport/ImportCSVDialog.cpp
-@@ -518,7 +518,7 @@ void ImportCSVDialog::on_btSave_clicked(
- if (tDelim == "\t")
- tDelim = "tab";
- root.setAttribute("delimiter", tDelim);
-- root.setAttribute("header", ui->cbHasHeader->isChecked() ? "true" : false);
-+ root.setAttribute("header", ui->cbHasHeader->isChecked() ? "true" : "false");
- root.setAttribute("from", QString::number(ui->sbFrom->value()));
- root.setAttribute("to", QString::number(ui->sbTo->value()));
-
diff --git a/merkaartor/patches/patch-src_Maps_Coord.h b/merkaartor/patches/patch-src_Maps_Coord.h
deleted file mode 100644
index f2add94315..0000000000
--- a/merkaartor/patches/patch-src_Maps_Coord.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$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/merkaartor/patches/patch-src_Maps_Projection.h b/merkaartor/patches/patch-src_Maps_Projection.h
deleted file mode 100644
index 86f5c542a6..0000000000
--- a/merkaartor/patches/patch-src_Maps_Projection.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$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"
-
Home |
Main Index |
Thread Index |
Old Index