rtyler
/
pkgsrc-wip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merkaator: Add attempt at 0.18.3 from pkgsrc 0.17.x entry

This commit is contained in:
Greg Troxel 2019-10-28 19:17:29 -04:00
parent d54c7b063f
commit 6003091217
16 changed files with 347 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -2196,6 +2196,7 @@ SUBDIR+= meka-git
SUBDIR+= memdump
SUBDIR+= memgrep
SUBDIR+= menumaker
SUBDIR+= merkaator
SUBDIR+= mes-nyacc
SUBDIR+= mescc-tools
SUBDIR+= meta-tracker

6
merkaartor/DESCR Normal file
View File

@ -0,0 +1,6 @@
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.

55
merkaartor/Makefile Normal file
View File

@ -0,0 +1,55 @@
# $NetBSD: Makefile,v 1.75 2019/08/22 12:23:15 ryoon Exp $
GITHUB_PROJECT= merkaartor
VERSION= 0.18.3
DISTNAME= ${VERSION}
PKGNAME= ${GITHUB_PROJECT}-${DISTNAME}
CATEGORIES= geography
MASTER_SITES= ${MASTER_SITE_GITHUB:=openstreetmap/}
DIST_SUBDIR= ${GITHUB_PROJECT}
MAINTAINER= gdt@NetBSD.org
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"

35
merkaartor/PLIST Normal file
View File

@ -0,0 +1,35 @@
@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

3
merkaartor/TODO Normal file
View File

@ -0,0 +1,3 @@
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.

16
merkaartor/distinfo Normal file
View File

@ -0,0 +1,16 @@
$NetBSD: distinfo,v 1.13 2015/11/03 00:08:43 agc Exp $
SHA1 (merkaartor/0.18.3.tar.gz) = 8af58d66bc5bee5487f04df4e092e0b4783cd672
RMD160 (merkaartor/0.18.3.tar.gz) = 36b840751fdf43c0aa164da39cd76eb4fa2457f3
SHA512 (merkaartor/0.18.3.tar.gz) = b34087e0317c196b59dd1de57778b9293d23e4530bd5734661dc2ce53eef85317f512ee446056e045aa8a06146bd029d6274fa5a6f68128db27795d44f0ef915
Size (merkaartor/0.18.3.tar.gz) = 7104234 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

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

@ -0,0 +1,13 @@
$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
merkaartor/patches/patch-aa Normal file
View File

@ -0,0 +1,61 @@
$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
merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp Normal file
View File

@ -0,0 +1,15 @@
$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
merkaartor/patches/patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp Normal file
View File

@ -0,0 +1,36 @@
$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;
}
};

32
merkaartor/patches/patch-src_Features_Feature.h Normal file
View File

@ -0,0 +1,32 @@
$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
{

13
merkaartor/patches/patch-src_Features_Node.h Normal file
View File

@ -0,0 +1,13 @@
$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
merkaartor/patches/patch-src_Features_Way.h Normal file
View File

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

13
merkaartor/patches/patch-src_ImportExport_ImportCSVDialog.cpp Normal file
View File

@ -0,0 +1,13 @@
$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
merkaartor/patches/patch-src_Maps_Coord.h Normal file
View File

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

13
merkaartor/patches/patch-src_Maps_Projection.h Normal file
View File

@ -0,0 +1,13 @@
$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"