cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to merkaartor 0.17.0, add dependency on devel/proj, enable

Browse Source 
QtWebKit support. This release adds cadastre-fr and bing maps plugins.
This commit is contained in:
landry 2011-01-10 09:34:24 +00:00
parent 4c3671c4ad
commit 7b17087b7f
11 changed files with 41 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
geo/merkaartor/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.9 2010/11/22 09:20:34 espie Exp $
# $OpenBSD: Makefile,v 1.10 2011/01/10 09:34:24 landry Exp $
COMMENT = OpenStreetMap editor
DISTNAME = merkaartor-0.16.0
REVISION = 2
DISTNAME = merkaartor-0.17.0
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
@ -17,21 +16,21 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
MASTER_SITES = http://merkaartor.be/attachments/download/1/
MASTER_SITES = http://merkaartor.be/attachments/download/192/
NO_REGRESS = Yes
MODULES = devel/gettext x11/qt4
BUILD_DEPENDS = devel/boost
RUN_DEPENDS = devel/desktop-file-utils
LIB_DEPENDS = x11/qt4
LIB_DEPENDS = x11/qt4 devel/proj
WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c expat fontconfig
WANTLIB += freetype glib-2.0 gobject-2.0 gthread-2.0 m png pthread
WANTLIB += stdc++ z QtGui QtNetwork QtSvg QtXml
WANTLIB += stdc++ z QtGui QtNetwork QtSvg QtXml QtWebKit proj
do-configure:
cd ${WRKSRC} && env ${CONFIGURE_ENV} qmake4 NOUSEWEBKIT=1 GDAL=0 NODEBUG=1 \
cd ${WRKSRC} && env ${CONFIGURE_ENV} qmake4 GDAL=0 PROJ=1 NODEBUG=1 \
PREFIX=${WRKINST}${PREFIX} TRANSDIR_MERKAARTOR=${WRKINST}/${PREFIX}/share/merkaartor/translations
pre-build:

10
geo/merkaartor/distinfo
View File

@ -1,5 +1,5 @@
MD5 (merkaartor-0.16.0.tar.bz2) = ZjD7bY2mp5hnvAw6lzJTIQ==
RMD160 (merkaartor-0.16.0.tar.bz2) = qEievBvC3HQ2bKdenUL3V5ESl2c=
SHA1 (merkaartor-0.16.0.tar.bz2) = w90bVQJq2LKiczGlgn4P1izQb+g=
SHA256 (merkaartor-0.16.0.tar.bz2) = pyGwMVYNs3ialdmFjDQUABu31hiyYGxQLEbiyfnbY1A=
SIZE (merkaartor-0.16.0.tar.bz2) = 5795662
MD5 (merkaartor-0.17.0.tar.bz2) = AiVX3ikCM7yHm995TN1A8A==
RMD160 (merkaartor-0.17.0.tar.bz2) = w0K988GcTXbJbGLsmAGz5qUMklQ=
SHA1 (merkaartor-0.17.0.tar.bz2) = vXoWKmusAHPgW0lg2y2UGuQbbn4=
SHA256 (merkaartor-0.17.0.tar.bz2) = Uoe3KvULv4i98kwJo+o7aG4pYD64LxRGraQEwpPfNkI=
SIZE (merkaartor-0.17.0.tar.bz2) = 7138228

31
geo/merkaartor/patches/patch-src_Features_Feature_cpp
View File

@ -1,31 +0,0 @@
$OpenBSD: patch-src_Features_Feature_cpp,v 1.1 2010/07/20 20:59:15 landry Exp $
Make sure that value is negative in the end
--- src/Features/Feature.cpp.orig Tue Jul 20 20:57:05 2010
+++ src/Features/Feature.cpp Tue Jul 20 20:57:40 2010
@@ -264,7 +264,7 @@ void Feature::setId(const QString& id)
const QString& Feature::resetId()
{
- p->Id = QString::number((((qint64)this) * -1));
+ p->Id = QString::number((llabs((qint64)this) * -1));
if (parent())
dynamic_cast<Layer*>(parent())->notifyIdUpdate(p->Id,const_cast<Feature*>(this));
return p->Id;
@@ -274,7 +274,7 @@ const QString& Feature::id() const
{
if (p->Id.isEmpty())
{
- p->Id = QString::number((((qint64)this) * -1));
+ p->Id = QString::number((llabs((qint64)this) * -1));
Layer* L = dynamic_cast<Layer*>(parent());
if (L)
L->notifyIdUpdate(p->Id,const_cast<Feature*>(this));
@@ -293,7 +293,7 @@ qint64 Feature::idToLong() const
p->LongId = s.toLongLong(&ok);
Q_ASSERT(ok);
} else {
- p->LongId = (((qint64)this) * -1);
+ p->LongId = (llabs((quint64)this) * -1);
}
return p->LongId;

10
geo/merkaartor/patches/patch-src_MainWindow_cpp
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_MainWindow_cpp,v 1.1 2010/06/13 10:57:35 landry Exp $
--- src/MainWindow.cpp.orig Sun Jun 6 16:41:25 2010
+++ src/MainWindow.cpp Sun Jun 13 11:05:11 2010
@@ -94,6 +94,7 @@
$OpenBSD: patch-src_MainWindow_cpp,v 1.2 2011/01/10 09:34:24 landry Exp $
--- src/MainWindow.cpp.orig Sun Dec 26 12:09:36 2010
+++ src/MainWindow.cpp Sun Jan 9 10:49:43 2011
@@ -102,6 +102,7 @@
#include <QStyleFactory>
#include <QMenu>
#include <QTcpServer>
+#include <QTcpSocket>
SlippyMapCache* SlippyMapWidget::theSlippyCache = 0;
#include "qttoolbardialog.h"

13
geo/merkaartor/patches/patch-src_Maps_Projection_cpp
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_Maps_Projection_cpp,v 1.3 2010/06/13 10:57:35 landry Exp $
Confuses g++3
--- src/Maps/Projection.cpp.orig Sun Jun 6 16:41:25 2010
+++ src/Maps/Projection.cpp Sat Jun 12 16:44:28 2010
@@ -178,7 +178,7 @@ void Projection::projTransformToWGS84(long point_count
QPointF Projection::projProject(const Coord & Map) const
{
try {
- point_ll_deg in(longitude<>(coordToAng(Map.lon())), latitude<>(coordToAng(Map.lat())));
+ point_ll_deg in = point_ll_deg(longitude<>(coordToAng(Map.lon())), latitude<>(coordToAng(Map.lat())));
point_2d out;
theProj->forward(in, out);

12
geo/merkaartor/patches/patch-src_Preferences_TmsServersList_cpp
View File

@ -1,14 +1,14 @@
$OpenBSD: patch-src_Preferences_TmsServersList_cpp,v 1.2 2010/06/13 10:57:35 landry Exp $
$OpenBSD: patch-src_Preferences_TmsServersList_cpp,v 1.3 2011/01/10 09:34:24 landry Exp $
Confuses g++3
--- src/Preferences/TmsServersList.cpp.orig Sun Jun 6 16:41:25 2010
+++ src/Preferences/TmsServersList.cpp Sat Jun 12 16:46:13 2010
--- src/Preferences/TmsServersList.cpp.orig Sun Dec 26 12:09:36 2010
+++ src/Preferences/TmsServersList.cpp Sun Jan 9 10:59:54 2011
@@ -17,7 +17,8 @@
TmsServer::TmsServer()
{
- TmsServer(QApplication::translate("MerkaartorPreferences","New Server"), "", "", "EPSG:900913", 256, 0, 17);
- TmsServer(QApplication::translate("MerkaartorPreferences","New Server"), "", "", "EPSG:3857", 256, 0, 17, "", "");
+ QString q = QApplication::translate("MerkaartorPreferences","New Server");
+ TmsServer(q, "", "", "EPSG:900913", 256, 0, 17);
+ TmsServer(q, "", "", "EPSG:3857", 256, 0, 17, "", "");
}
TmsServer::TmsServer(QString Name, QString Adress, QString Path, QString Projection, int tileSize, int minZoom, int maxZoom, QString baseUrl, bool Origin, bool Deleted)
TmsServer::TmsServer(QString Name, QString Adress, QString Path, QString Projection, int tileSize, int minZoom, int maxZoom, QString SourceTag, QString LicenseUrl, QString baseUrl, bool Origin, bool Deleted)

12
geo/merkaartor/patches/patch-src_Preferences_WmsServersList_cpp
View File

@ -1,14 +1,14 @@
$OpenBSD: patch-src_Preferences_WmsServersList_cpp,v 1.2 2010/06/13 10:57:35 landry Exp $
$OpenBSD: patch-src_Preferences_WmsServersList_cpp,v 1.3 2011/01/10 09:34:24 landry Exp $
Confuses g++3
--- src/Preferences/WmsServersList.cpp.orig Sun Jun 6 16:41:25 2010
+++ src/Preferences/WmsServersList.cpp Sat Jun 12 16:46:47 2010
--- src/Preferences/WmsServersList.cpp.orig Sun Dec 26 12:09:36 2010
+++ src/Preferences/WmsServersList.cpp Sun Jan 9 11:00:33 2011
@@ -17,7 +17,8 @@
WmsServer::WmsServer()
{
- WmsServer(QApplication::translate("MerkaartorPreferences","New Server"), "", "", "", "", "", "");
- WmsServer(QApplication::translate("MerkaartorPreferences","New Server"), "", "", "", "", "", "", "", "");
+ QString q = QApplication::translate("MerkaartorPreferences","New Server");
+ WmsServer(q, "", "", "", "", "", "");
+ WmsServer(q, "", "", "", "", "", "", "", "");
}
WmsServer::WmsServer(const WmsServer& other)
WmsServer::WmsServer(QString Name, QString Adress, QString Path, QString Layers

42
geo/merkaartor/patches/patch-src_Render_NativeRenderDialog_cpp
View File

@ -1,42 +0,0 @@
$OpenBSD: patch-src_Render_NativeRenderDialog_cpp,v 1.3 2010/06/13 10:57:35 landry Exp $
Confuses g++3
--- src/Render/NativeRenderDialog.cpp.orig Sun Jun 6 16:41:25 2010
+++ src/Render/NativeRenderDialog.cpp Sat Jun 12 16:48:48 2010
@@ -110,13 +110,14 @@ void NativeRenderDialog::render()
MapView* vw = new MapView(NULL);
vw->setDocument(mw->document());
- CoordBox VP(Coord(
+ Coord a = Coord(
angToCoord(sbMinLat->value()),
angToCoord(sbMinLon->value())
- ), Coord(
+ );
+ Coord b = Coord(
angToCoord(sbMaxLat->value()),
- angToCoord(sbMaxLon->value())
- ));
+ angToCoord(sbMaxLon->value()));
+ CoordBox VP(a,b);
Projection aProj;
QRect theR(0, 0, w, h);
@@ -164,13 +165,14 @@ void NativeRenderDialog::render()
void NativeRenderDialog::calcRatio()
{
- CoordBox theB(Coord(
+ Coord a = Coord(
angToCoord(sbMinLat->value()),
angToCoord(sbMinLon->value())
- ), Coord(
+ );
+ Coord b = Coord(
angToCoord(sbMaxLat->value()),
- angToCoord(sbMaxLon->value())
- ));
+ angToCoord(sbMaxLon->value()));
+ CoordBox theB(a,b);
Projection theProj;
//int w = sbPreviewWidth->value();
//int h = sbPreviewHeight->value();

12
geo/merkaartor/patches/patch-src_src_pro
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_src_pro,v 1.3 2010/06/13 10:57:35 landry Exp $
$OpenBSD: patch-src_src_pro,v 1.4 2011/01/10 09:34:24 landry Exp $
Properly set translations/plugins paths
--- src/src.pro.orig Sun Jun 6 16:41:25 2010
+++ src/src.pro Sat Jun 12 16:50:12 2010
@@ -150,7 +150,7 @@ unix {
--- src/src.pro.orig Sun Dec 26 12:09:36 2010
+++ src/src.pro Sun Jan 9 10:49:44 2011
@@ -170,7 +170,7 @@ unix {
isEmpty( LIBDIR ) {
LIBDIR = $${PREFIX}/lib${LIB_SUFFIX}
}
@ -11,7 +11,7 @@ Properly set translations/plugins paths
target.path = $${PREFIX}/bin
SHARE_DIR = $${PREFIX}/share/merkaartor
@@ -179,7 +179,7 @@ win32-msvc* {
@@ -199,7 +199,7 @@ win32-msvc* {
translations.path = $${TRANSDIR_MERKAARTOR}
translations.files = $${BINTRANSLATIONS}
@ -20,7 +20,7 @@ Properly set translations/plugins paths
INSTALLS += translations
count(TRANSDIR_SYSTEM, 1) {
@@ -224,7 +224,7 @@ world_shp.files = $$PWD/../share/world_background.osb
@@ -248,7 +248,7 @@ contains (PROJ, 1) {
macx {
DEFINES += WORLD_SHP=world_background.osb
} else {

4
geo/merkaartor/pkg/PFRAG.shared
View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2010/06/13 10:57:35 landry Exp $
@comment $OpenBSD: PFRAG.shared,v 1.4 2011/01/10 09:34:24 landry Exp $
lib/merkaartor/plugins/background/libMCadastreFranceBackgroundPlugin.so
lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.so
lib/merkaartor/plugins/background/libMWalkingPapersBackgroundPlugin.so
lib/merkaartor/plugins/background/libMYahooBackgroundPlugin.so
lib/merkaartor/plugins/background/libMYahooTiledBackgroundPlugin.so

5
geo/merkaartor/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2010/06/13 10:57:35 landry Exp $
@comment $OpenBSD: PLIST,v 1.4 2011/01/10 09:34:24 landry Exp $
%%SHARED%%
@bin bin/merkaartor
lib/merkaartor/
@ -21,7 +21,10 @@ 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