kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

geography/merkaator: Update to 0.18.4

Browse source 
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
This commit is contained in:
gdt 2020-09-02 00:24:26 +00:00
parent 5852071921
commit b8c34fe0c6
13 changed files with 60 additions and 260 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
geography/merkaartor/Makefile
View file

@ -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"

38
geography/merkaartor/PLIST
View file

@ -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

21
geography/merkaartor/distinfo
View file

@ -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

13
geography/merkaartor/patches/patch-3rdparty_qtsingleapplication-2.6__1-opensource_src_qtlocalpeer.cpp
View file

@ -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)

61
geography/merkaartor/patches/patch-aa
View file

@ -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);

15
geography/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp
View file

@ -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++)
{

36
geography/merkaartor/patches/patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp
View file

@ -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;
}
};

31
geography/merkaartor/patches/patch-src_Features_Feature.h
View file

@ -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 <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>
+#include <QPainterPath>
#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
{
#define CAST_NODE(x) (dynamic_cast<Node*>(x))

13
geography/merkaartor/patches/patch-src_Features_Node.h
View file

@ -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

13
geography/merkaartor/patches/patch-src_Features_Way.h
View file

@ -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

13
geography/merkaartor/patches/patch-src_ImportExport_ImportCSVDialog.cpp
View file

@ -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()));

22
geography/merkaartor/patches/patch-src_Maps_Coord.h
View file

@ -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)

13
geography/merkaartor/patches/patch-src_Maps_Projection.h
View file

@ -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"