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

Update to merkaartor 0.16.0.

Browse Source
This commit is contained in:
landry 2010-06-13 10:57:35 +00:00
parent dffa7f04e8
commit cca26b6314
14 changed files with 121 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
geo/merkaartor/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2010/04/21 15:06:16 landry Exp $
# $OpenBSD: Makefile,v 1.3 2010/06/13 10:57:35 landry Exp $
COMMENT = OpenStreetMap editor
DISTNAME = merkaartor-0.15.3
DISTNAME = merkaartor-0.16.0
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11

10
geo/merkaartor/distinfo
View File

@ -1,5 +1,5 @@
MD5 (merkaartor-0.15.3.tar.bz2) = FghQ0pIjOLUItM3Qh5uO4w==
RMD160 (merkaartor-0.15.3.tar.bz2) = RJ/RF4hDmrCUv6Q6utBWAF41fiA=
SHA1 (merkaartor-0.15.3.tar.bz2) = EVWDsgZcHrh9/J2kMbR6FDChRNE=
SHA256 (merkaartor-0.15.3.tar.bz2) = n9lxbVPCQL8CW1j4vz5OtffJ//95j/e7Dr8nqBMnHaw=
SIZE (merkaartor-0.15.3.tar.bz2) = 5665663
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

12
geo/merkaartor/patches/patch-3rdparty_qtsingleapplication-2_6_1-opensource_src_qtlocalpeer_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-3rdparty_qtsingleapplication-2_6_1-opensource_src_qtlocalpeer_cpp,v 1.1 2010/06/13 10:57:35 landry Exp $
--- 3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp.orig Sat Jun 12 16:52:09 2010
+++ 3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp Sat Jun 12 16:52:33 2010
@@ -57,6 +57,8 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0
#endif
#if defined(Q_OS_UNIX)
#include <time.h>
+#include <sys/types.h>
+#include <unistd.h>
#endif
namespace QtLP_Private {

11
geo/merkaartor/patches/patch-src_MainWindow_cpp Normal file
View File

@ -0,0 +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 @@
#include <QStyleFactory>
#include <QMenu>
#include <QTcpServer>
+#include <QTcpSocket>
SlippyMapCache* SlippyMapWidget::theSlippyCache = 0;

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

@ -1,13 +1,13 @@
$OpenBSD: patch-src_Maps_Coord_cpp,v 1.2 2010/04/21 15:06:16 landry Exp $
$OpenBSD: patch-src_Maps_Coord_cpp,v 1.3 2010/06/13 10:57:35 landry Exp $
Confuses g++3
--- src/Maps/Coord.cpp.orig Mon Sep 21 13:02:53 2009
+++ src/Maps/Coord.cpp Wed Apr 21 09:53:42 2010
--- src/Maps/Coord.cpp.orig Sun Jun 6 16:41:25 2010
+++ src/Maps/Coord.cpp Sat Jun 12 16:43:50 2010
@@ -23,7 +23,7 @@ double angle(Coord p1)
void rotate(Coord & p1,double angle)
{
- Coord p1p(int(sin(angle)*p1.lon()+cos(angle)*p1.lat()),int(cos(angle)*p1.lon()-sin(angle)*p1.lat()));
+ Coord p1p = Coord(int(sin(angle) * p1.lon() + cos(angle) * p1.lat()),int(cos(angle) * p1.lon() - sin(angle) * p1.lat()));
p1=p1p;
- Coord p1p(sin(angle)*p1.lon()+cos(angle)*p1.lat(),cos(angle)*p1.lon()-sin(angle)*p1.lat());
+ Coord p1p = Coord(sin(angle)*p1.lon()+cos(angle)*p1.lat(),cos(angle)*p1.lon()-sin(angle)*p1.lat());
p1=p1p;
}

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

@ -1,13 +1,13 @@
$OpenBSD: patch-src_Maps_Projection_cpp,v 1.2 2010/04/21 15:06:16 landry Exp $
$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 Tue Jan 26 11:20:32 2010
+++ src/Maps/Projection.cpp Wed Apr 21 09:53:42 2010
@@ -74,7 +74,7 @@ void Projection::projTransformToWGS84(long point_count
--- 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<>(intToAng(Map.lon())), latitude<>(intToAng(Map.lat())));
+ point_ll_deg in = point_ll_deg(longitude<>(intToAng(Map.lon())), latitude<>(intToAng(Map.lat())));
point_2d out;
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);
theProj->forward(in, out);

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

@ -1,14 +1,14 @@
$OpenBSD: patch-src_Preferences_BookmarksList_cpp,v 1.1.1.1 2009/12/27 17:46:07 landry Exp $
$OpenBSD: patch-src_Preferences_BookmarksList_cpp,v 1.2 2010/06/13 10:57:35 landry Exp $
Confuses g++3
--- src/Preferences/BookmarksList.cpp.orig Wed Dec 23 23:09:09 2009
+++ src/Preferences/BookmarksList.cpp Wed Dec 23 23:09:28 2009
--- src/Preferences/BookmarksList.cpp.orig Sun Jun 6 16:41:25 2010
+++ src/Preferences/BookmarksList.cpp Sun Jun 13 11:20:39 2010
@@ -17,7 +17,8 @@
Bookmark::Bookmark()
{
- Bookmark(QApplication::translate("MerkaartorPreferences","New Bookmark"), CoordBox());
+ QString q = QApplication::translate("MerkaartorPreferences","New Bookmark");
+ Bookmark(q, CoordBox());
- Bookmark(QApplication::translate("MerkaartorPreferences","New Bookmark"), CoordBox());
+ QString q = QApplication::translate("MerkaartorPreferences","New Bookmark");
+ Bookmark(q, CoordBox());
}
Bookmark::Bookmark(QString aName, CoordBox aCoord, bool Deleted)

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

@ -1,14 +1,14 @@
$OpenBSD: patch-src_Preferences_TmsServersList_cpp,v 1.1.1.1 2009/12/27 17:46:07 landry Exp $
$OpenBSD: patch-src_Preferences_TmsServersList_cpp,v 1.2 2010/06/13 10:57:35 landry Exp $
Confuses g++3
--- src/Preferences/TmsServersList.cpp.orig Wed Dec 23 23:07:58 2009
+++ src/Preferences/TmsServersList.cpp Wed Dec 23 23:08:17 2009
--- src/Preferences/TmsServersList.cpp.orig Sun Jun 6 16:41:25 2010
+++ src/Preferences/TmsServersList.cpp Sat Jun 12 16:46:13 2010
@@ -17,7 +17,8 @@
TmsServer::TmsServer()
{
- TmsServer(QApplication::translate("MerkaartorPreferences","New Server"), "", "", 256, 0, 17);
+ QString q = QApplication::translate("MerkaartorPreferences","New Server");
+ TmsServer(q, "", "", 256, 0, 17);
- TmsServer(QApplication::translate("MerkaartorPreferences","New Server"), "", "", "EPSG:900913", 256, 0, 17);
+ QString q = QApplication::translate("MerkaartorPreferences","New Server");
+ TmsServer(q, "", "", "EPSG:900913", 256, 0, 17);
}
TmsServer::TmsServer(QString Name, QString Adress, QString Path, int tileSize, int minZoom, int maxZoom, bool Deleted)
TmsServer::TmsServer(QString Name, QString Adress, QString Path, QString Projection, int tileSize, int minZoom, int maxZoom, 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.1.1.1 2009/12/27 17:46:07 landry Exp $
$OpenBSD: patch-src_Preferences_WmsServersList_cpp,v 1.2 2010/06/13 10:57:35 landry Exp $
Confuses g++3
--- src/Preferences/WmsServersList.cpp.orig Wed Dec 23 23:06:22 2009
+++ src/Preferences/WmsServersList.cpp Wed Dec 23 23:07:09 2009
--- src/Preferences/WmsServersList.cpp.orig Sun Jun 6 16:41:25 2010
+++ src/Preferences/WmsServersList.cpp Sat Jun 12 16:46:47 2010
@@ -17,7 +17,8 @@
WmsServer::WmsServer()
{
- WmsServer(QApplication::translate("MerkaartorPreferences","New Server"), "", "", "", "", "", "");
+ QString q = QApplication::translate("MerkaartorPreferences","New Server");
+ WmsServer(q, "", "", "", "", "", "");
- WmsServer(QApplication::translate("MerkaartorPreferences","New Server"), "", "", "", "", "", "");
+ QString q = QApplication::translate("MerkaartorPreferences","New Server");
+ WmsServer(q, "", "", "", "", "", "");
}
WmsServer::WmsServer(const WmsServer& other)

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

@ -1,42 +1,42 @@
$OpenBSD: patch-src_Render_NativeRenderDialog_cpp,v 1.2 2010/04/21 15:06:16 landry Exp $
$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 Thu Feb 25 13:34:54 2010
+++ src/Render/NativeRenderDialog.cpp Wed Apr 21 09:53:42 2010
@@ -104,13 +104,14 @@ void NativeRenderDialog::render()
MapView* vw = new MapView(NULL);
vw->setDocument(mw->document());
--- 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(
angToInt(sbMinLat->value()),
angToInt(sbMinLon->value())
- ), Coord(
+ );
+ Coord b = Coord(
angToInt(sbMaxLat->value()),
- angToInt(sbMaxLon->value())
- ));
+ angToInt(sbMaxLon->value()));
+ CoordBox VP(a,b);
- 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);
@@ -158,13 +159,14 @@ void NativeRenderDialog::render()
Projection aProj;
QRect theR(0, 0, w, h);
@@ -164,13 +165,14 @@ void NativeRenderDialog::render()
void NativeRenderDialog::calcRatio()
{
- CoordBox theB(Coord(
+ Coord a = Coord(
angToInt(sbMinLat->value()),
angToInt(sbMinLon->value())
- ), Coord(
+ );
+ Coord b = Coord(
angToInt(sbMaxLat->value()),
- angToInt(sbMaxLon->value())
- ));
+ angToInt(sbMaxLon->value()));
+ CoordBox theB(a,b);
Projection theProj;
//int w = sbPreviewWidth->value();
//int h = sbPreviewHeight->value();
- 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();

16
geo/merkaartor/patches/patch-src_Tools_RegionMapWidget_cpp
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-src_Tools_RegionMapWidget_cpp,v 1.1.1.1 2009/12/27 17:46:07 landry Exp $
$OpenBSD: patch-src_Tools_RegionMapWidget_cpp,v 1.2 2010/06/13 10:57:35 landry Exp $
Confuses g++3
--- src/Tools/RegionMapWidget.cpp.orig Wed Dec 23 23:18:09 2009
+++ src/Tools/RegionMapWidget.cpp Wed Dec 23 23:18:43 2009
--- src/Tools/RegionMapWidget.cpp.orig Sun Jun 6 16:41:25 2010
+++ src/Tools/RegionMapWidget.cpp Sat Jun 12 16:49:28 2010
@@ -114,7 +114,7 @@ void RegionMapWidget::mouseReleaseEvent(QMouseEvent* e
CoordBox v = CoordBox(Coord(R.y(), R.x()), Coord(R.y()+R.height(), R.x()+R.width()));
QPointF P = ev->pos();
CoordBox v = CoordBox(Coord(R.y(), R.x()), Coord(R.y()+R.height(), R.x()+R.width()));
QPointF P = ev->pos();
- Coord Pt(int(((height()-P.y()) / height() * v.latDiff()) + v.bottomLeft().lat()), int((P.x() / width() * v.lonDiff()) + v.bottomLeft().lon()));
+ Coord Pt = Coord(int(((height()-P.y()) / height() * v.latDiff()) + v.bottomLeft().lat()), int((P.x() / width() * v.lonDiff()) + v.bottomLeft().lon()));
int x = int(((qint64)Pt.lon()) / REGION_WIDTH);
x = (x < 0) ? x-1 :x;
int y = int(((qint64)Pt.lat()) / REGION_WIDTH);
int x = int(((qint64)Pt.lon()) / REGION_WIDTH);
x = (x < 0) ? x-1 :x;
int y = int(((qint64)Pt.lat()) / REGION_WIDTH);

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

@ -1,8 +1,8 @@
$OpenBSD: patch-src_src_pro,v 1.2 2010/04/21 15:06:16 landry Exp $
$OpenBSD: patch-src_src_pro,v 1.3 2010/06/13 10:57:35 landry Exp $
Properly set translations/plugins paths
--- src/src.pro.orig Sun Mar 7 16:54:00 2010
+++ src/src.pro Wed Apr 21 14:01:52 2010
@@ -131,7 +131,7 @@ unix {
--- 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 {
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
@@ -160,7 +160,7 @@ win32-msvc* {
@@ -179,7 +179,7 @@ win32-msvc* {
translations.path = $${TRANSDIR_MERKAARTOR}
translations.files = $${BINTRANSLATIONS}
@ -20,12 +20,12 @@ Properly set translations/plugins paths
INSTALLS += translations
count(TRANSDIR_SYSTEM, 1) {
@@ -205,7 +205,7 @@ world_shp.files = $$PWD/../share/world_background.osb
@@ -224,7 +224,7 @@ world_shp.files = $$PWD/../share/world_background.osb
macx {
DEFINES += WORLD_SHP=world_background.osb
DEFINES += WORLD_SHP=world_background.osb
} else {
- DEFINES += WORLD_SHP=$$world_shp.path/world_background.osb
+ DEFINES += WORLD_SHP=${TRUEPREFIX}/share/merkaartor/world_background.osb
- DEFINES += WORLD_SHP=$$world_shp.path/world_background.osb
+ DEFINES += WORLD_SHP=${TRUEPREFIX}/share/merkaartor/world_background.osb
}
INSTALLS += world_shp

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

@ -1,4 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2010/04/21 15:06:16 landry Exp $
@comment $OpenBSD: PFRAG.shared,v 1.3 2010/06/13 10:57:35 landry Exp $
lib/merkaartor/plugins/background/libMWalkingPapersBackgroundPlugin.so
lib/merkaartor/plugins/background/libMYahooBackgroundPlugin.so
lib/merkaartor/plugins/background/libMYahooTiledBackgroundPlugin.so
lib/merkaartor/plugins/styles/libskulpture.so

3
geo/merkaartor/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2010/04/21 15:06:16 landry Exp $
@comment $OpenBSD: PLIST,v 1.3 2010/06/13 10:57:35 landry Exp $
%%SHARED%%
@bin bin/merkaartor
lib/merkaartor/
@ -27,6 +27,7 @@ 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