From f907b411f9aa9072e001601c18c48522a8ef23d8 Mon Sep 17 00:00:00 2001 From: gdt Date: Wed, 2 Sep 2020 00:24:26 +0000 Subject: geography/merkaator: Update to 0.18.4 Update originally by Ben Gergely, with modifications by gdt, from PR pkg/55592. pkgsrc changes: - Adjust dependencies to qt5 - Require gcc6, due to gcc5 lossage with -Wno-registers Upstream NEWS: - Support for qt5 - Lots of bugfixes and minor improvements --- geography/merkaartor/Makefile | 31 +++++++---- geography/merkaartor/PLIST | 38 ++++++++++---- geography/merkaartor/distinfo | 21 +++----- ...plication-2.6__1-opensource_src_qtlocalpeer.cpp | 13 ----- geography/merkaartor/patches/patch-aa | 61 ---------------------- ...lgorithms_overlay_get__intersection__points.hpp | 15 ------ ...de_builtin-ggl_ggl_geometries_adapted_tuple.hpp | 36 ------------- .../patches/patch-src_Features_Feature.h | 31 +++-------- .../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 ----- 13 files changed, 60 insertions(+), 260 deletions(-) delete mode 100644 geography/merkaartor/patches/patch-3rdparty_qtsingleapplication-2.6__1-opensource_src_qtlocalpeer.cpp delete mode 100644 geography/merkaartor/patches/patch-aa delete mode 100644 geography/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp delete mode 100644 geography/merkaartor/patches/patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp delete mode 100644 geography/merkaartor/patches/patch-src_Features_Node.h delete mode 100644 geography/merkaartor/patches/patch-src_Features_Way.h delete mode 100644 geography/merkaartor/patches/patch-src_ImportExport_ImportCSVDialog.cpp delete mode 100644 geography/merkaartor/patches/patch-src_Maps_Coord.h delete mode 100644 geography/merkaartor/patches/patch-src_Maps_Projection.h diff --git a/geography/merkaartor/Makefile b/geography/merkaartor/Makefile index 856f434aba7..88ee25a59f7 100644 --- a/geography/merkaartor/Makefile +++ b/geography/merkaartor/Makefile @@ -1,20 +1,22 @@ -# $NetBSD: Makefile,v 1.86 2020/08/17 20:18:53 leot Exp $ +# $NetBSD: Makefile,v 1.87 2020/09/02 00:24:26 gdt Exp $ -DISTNAME= merkaartor-0.17.2 -PKGREVISION= 57 +DISTNAME= merkaartor-0.18.4 CATEGORIES= geography -MASTER_SITES= http://merkaartor.be/attachments/download/253/ -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_GITHUB:=openstreetmap/} +GITHUB_PROJECT= merkaartor +GITHUB_TAG= ${PKGVERSION_NOREV} -MAINTAINER= pkgsrc-users@NetBSD.org +MAINTAINER= gdt@NetBSD.org HOMEPAGE= http://www.merkaartor.be/ COMMENT= OpenStreetMap mapping program +LICENSE= gnu-gpl-v2 USE_LANGUAGES= c c++11 +# gcc 5 complains about -Wno-register. Require new enough rather than patching. +GCC_REQD= 6 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 +CONFIGURE_ARGS= PREFIX=${PREFIX} NODEBUG=1 RELEASE=1 INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} @@ -25,6 +27,7 @@ do-configure: ${QMAKE} ${CONFIGURE_ARGS} Merkaartor.pro && \ ${MAKE} qmake +.include "../../archivers/quazip/buildlink3.mk" .include "../../devel/boost-headers/buildlink3.mk" .include "../../geography/gdal-lib/buildlink3.mk" .include "../../geography/gpsd/buildlink3.mk" @@ -33,8 +36,16 @@ do-configure: .include "../../graphics/tiff/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" -.include "../../x11/qt4-libs/buildlink3.mk" -.include "../../x11/qt4-tools/buildlink3.mk" +.include "../../x11/qt5-qtbase/buildlink3.mk" +.include "../../x11/qt5-qttools/buildlink3.mk" +.include "../../x11/qt5-qtxmlpatterns/buildlink3.mk" +.include "../../x11/qt5-qtsvg/buildlink3.mk" +.include "../../x11/qt5-qtimageformats/buildlink3.mk" +.include "../../x11/qt5-qtwebkit/buildlink3.mk" +.include "../../x11/qt5-qtconnectivity/buildlink3.mk" +.include "../../x11/qt5-qtquickcontrols/buildlink3.mk" +.include "../../x11/qt5-qtdeclarative/buildlink3.mk" +.include "../../x11/qt5-qtserialport/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/geography/merkaartor/PLIST b/geography/merkaartor/PLIST index 87fad68cf73..4cd80231f06 100644 --- a/geography/merkaartor/PLIST +++ b/geography/merkaartor/PLIST @@ -1,15 +1,27 @@ -@comment $NetBSD: PLIST,v 1.6 2011/04/11 20:15:00 drochner Exp $ +@comment $NetBSD: PLIST,v 1.7 2020/09/02 00:24:26 gdt 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 +lib/merkaartor/plugins/background/libMGdalBackgroundPlugin.so +lib/merkaartor/plugins/background/libMGeoTiffBackgroundPlugin.so +lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.so +lib/merkaartor/plugins/background/libMWalkingPapersBackgroundPlugin.so +share/applications/org.merkaartor.merkaartor.desktop +share/icons/hicolor/128x128/apps/merkaartor.png +share/icons/hicolor/16x16/apps/merkaartor.png +share/icons/hicolor/192x192/apps/merkaartor.png +share/icons/hicolor/22x22/apps/merkaartor.png +share/icons/hicolor/24x24/apps/merkaartor.png +share/icons/hicolor/256x256/apps/merkaartor.png +share/icons/hicolor/32x32/apps/merkaartor.png +share/icons/hicolor/36x36/apps/merkaartor.png +share/icons/hicolor/40x40/apps/merkaartor.png +share/icons/hicolor/42x42/apps/merkaartor.png share/icons/hicolor/48x48/apps/merkaartor.png +share/icons/hicolor/512x512/apps/merkaartor.png +share/icons/hicolor/64x64/apps/merkaartor.png +share/icons/hicolor/72x72/apps/merkaartor.png +share/icons/hicolor/80x80/apps/merkaartor.png +share/icons/hicolor/8x8/apps/merkaartor.png +share/icons/hicolor/96x96/apps/merkaartor.png share/merkaartor/BookmarksList.xml share/merkaartor/Projections.xml share/merkaartor/TmsServersList.xml @@ -17,6 +29,8 @@ 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_de_AT.qm +share/merkaartor/translations/merkaartor_en.qm share/merkaartor/translations/merkaartor_es.qm share/merkaartor/translations/merkaartor_et.qm share/merkaartor/translations/merkaartor_fr.qm @@ -32,4 +46,6 @@ 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 +share/merkaartor/translations/merkaartor_vi.qm +share/merkaartor/translations/merkaartor_zh_CN.qm +share/merkaartor/translations/merkaartor_zh_TW.qm diff --git a/geography/merkaartor/distinfo b/geography/merkaartor/distinfo index 65ab7dc2d1e..38714e3888d 100644 --- a/geography/merkaartor/distinfo +++ b/geography/merkaartor/distinfo @@ -1,16 +1,7 @@ -$NetBSD: distinfo,v 1.13 2015/11/03 00:08:43 agc Exp $ +$NetBSD: distinfo,v 1.14 2020/09/02 00:24:26 gdt Exp $ -SHA1 (merkaartor-0.17.2.tar.bz2) = f789141db427bf25bb3b61801fefc98ab0430012 -RMD160 (merkaartor-0.17.2.tar.bz2) = c5c8944872828ba5ada6003cd5821f33899da3cb -SHA512 (merkaartor-0.17.2.tar.bz2) = 3718131d855ad6ea17537c7879a3249f25f6f5aaaf00e2e59df10c5497a628f0877f85129a209d11dc969b5771598f9989cc6ca3a972dab4c3eaef507784d4ed -Size (merkaartor-0.17.2.tar.bz2) = 7138991 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 +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-src_Features_Feature.h) = beb00d5258813de2c95abc51d59e741e3dd925d0 diff --git a/geography/merkaartor/patches/patch-3rdparty_qtsingleapplication-2.6__1-opensource_src_qtlocalpeer.cpp b/geography/merkaartor/patches/patch-3rdparty_qtsingleapplication-2.6__1-opensource_src_qtlocalpeer.cpp deleted file mode 100644 index f2bdd53d5bf..00000000000 --- a/geography/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 - #endif - -+#include -+ - namespace QtLP_Private { - #include "qtlockedfile.cpp" - #if defined(Q_OS_WIN) diff --git a/geography/merkaartor/patches/patch-aa b/geography/merkaartor/patches/patch-aa deleted file mode 100644 index f2efc1a8365..00000000000 --- a/geography/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/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 deleted file mode 100644 index a7dcde790d2..00000000000 --- a/geography/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/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 deleted file mode 100644 index 3edce1b5687..00000000000 --- a/geography/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 > - 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 index 5f509e0b1cf..5f12ade28e9 100644 --- a/geography/merkaartor/patches/patch-src_Features_Feature.h +++ b/geography/merkaartor/patches/patch-src_Features_Feature.h @@ -1,32 +1,13 @@ -$NetBSD: patch-src_Features_Feature.h,v 1.1 2013/02/26 11:15:19 joerg Exp $ +$NetBSD: patch-src_Features_Feature.h,v 1.2 2020/09/02 00:24:26 gdt Exp $ --- src/Features/Feature.h.orig 2011-02-10 12:00:35.000000000 +0000 +++ src/Features/Feature.h -@@ -9,6 +9,14 @@ +@@ -10,6 +10,7 @@ class Feature; + #include #include - -+class Feature; -+ -+namespace boost -+{ -+ void intrusive_ptr_add_ref(Feature * p); -+ void intrusive_ptr_release(Feature * p); -+} -+ - #include ++#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 - { + #define CAST_NODE(x) (dynamic_cast(x)) + diff --git a/geography/merkaartor/patches/patch-src_Features_Node.h b/geography/merkaartor/patches/patch-src_Features_Node.h deleted file mode 100644 index 5c5d1e1ee32..00000000000 --- a/geography/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 - #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 deleted file mode 100644 index 2c9873eb7df..00000000000 --- a/geography/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 - #endif - diff --git a/geography/merkaartor/patches/patch-src_ImportExport_ImportCSVDialog.cpp b/geography/merkaartor/patches/patch-src_ImportExport_ImportCSVDialog.cpp deleted file mode 100644 index f29d3e6e80f..00000000000 --- a/geography/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/geography/merkaartor/patches/patch-src_Maps_Coord.h b/geography/merkaartor/patches/patch-src_Maps_Coord.h deleted file mode 100644 index f2add943158..00000000000 --- a/geography/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 - #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 deleted file mode 100644 index 86f5c542a67..00000000000 --- a/geography/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 - --#ifndef _MOBILE -+#if !defined(_MOBILE) && !defined(Q_MOC_RUN) - - #include "Preferences/MerkaartorPreferences.h" - -- cgit v1.2.3