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

Update to merkaartor 0.18.2.

Browse Source
This commit is contained in:
landry 2015-07-21 08:36:40 +00:00
parent 670941d686
commit c24a40a423
5 changed files with 13 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
geo/merkaartor/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.19 2015/06/27 06:59:01 landry Exp $
# $OpenBSD: Makefile,v 1.20 2015/07/21 08:36:40 landry Exp $
COMMENT = OpenStreetMap editor
GH_ACCOUNT = openstreetmap
GH_PROJECT = merkaartor
GH_TAGNAME = 0.18.1
GH_TAGNAME = 0.18.2
DISTNAME = ${GH_PROJECT}-${GH_TAGNAME}
SHARED_ONLY = Yes
REVISION = 1
CATEGORIES = geo x11
@ -25,7 +24,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
LIB_DEPENDS = devel/proj geo/gdal
WANTLIB += QtGui QtNetwork QtSvg QtWebKit QtXml c m proj pthread gdal
WANTLIB += stdc++ z ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
WANTLIB += stdc++ z ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype sqlite3
do-configure:
cd ${WRKSRC} && env ${CONFIGURE_ENV} qmake4 PROJ=1 NODEBUG=1 RELEASE=1 \

4
geo/merkaartor/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (merkaartor-0.18.1.tar.gz) = 6fpeMOY5LJIk9z6bt9F7ZsTrbAI2M+sq8M9YuorPaE8=
SIZE (merkaartor-0.18.1.tar.gz) = 6459640
SHA256 (merkaartor-0.18.2.tar.gz) = ngTVVOvE+ZmdDdbQzfTlCjgTXzTe1o9d/YyyleIL9Qg=
SIZE (merkaartor-0.18.2.tar.gz) = 6267866

61
geo/merkaartor/patches/patch-src_ImportExport_ImportExportGdal_cpp
View File

@ -1,61 +0,0 @@
$OpenBSD: patch-src_ImportExport_ImportExportGdal_cpp,v 1.2 2015/06/28 16:13:21 landry Exp $
Adapt for GDAL 2.0 API.
--- src/ImportExport/ImportExportGdal.cpp.orig Mon Jun 11 17:01:23 2012
+++ src/ImportExport/ImportExportGdal.cpp Sun Jun 28 18:12:10 2015
@@ -58,7 +58,7 @@ bool ImportExportGdal::export_(const QList<Feature *>&
OGRRegisterAll();
- poDriver = OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName(pszDriverName);
+ poDriver = reinterpret_cast<OGRSFDriver*> (GetGDALDriverManager()->GetDriverByName(pszDriverName));
if( poDriver == NULL )
{
qDebug( "%s driver not available.", pszDriverName );
@@ -141,7 +141,7 @@ bool ImportExportGdal::export_(const QList<Feature *>&
}
OGRFeature::DestroyFeature( poFeature );
}
- OGRDataSource::DestroyDataSource( poDS );
+ GDALClose((GDALDatasetH) poDS);
return true;
}
@@ -424,7 +424,7 @@ bool ImportExportGdal::import(Layer* aLayer)
OGRDataSource *poDS;
- poDS = OGRSFDriverRegistrar::Open( FileName.toUtf8().constData(), FALSE );
+ poDS = reinterpret_cast<OGRDataSource*>(GDALOpenEx( FileName.toUtf8().constData(), GDAL_OF_VECTOR, NULL, NULL,NULL));
if( poDS == NULL )
{
qDebug( "GDAL Open failed.\n" );
@@ -433,7 +433,7 @@ bool ImportExportGdal::import(Layer* aLayer)
importGDALDataset(poDS, aLayer, M_PREFS->getGdalConfirmProjection());
- OGRDataSource::DestroyDataSource( poDS );
+ GDALClose(( GDALDatasetH) poDS);
return true;
}
@@ -448,7 +448,8 @@ bool ImportExportGdal::import(Layer* aLayer, const QBy
GByte* content = (GByte*)(ba.constData());
/*FILE* f = */VSIFileFromMemBuffer("/vsimem/temp", content, ba.size(), FALSE);
- poDS = OGRSFDriverRegistrar::Open( "/vsimem/temp", FALSE );
+ poDS = reinterpret_cast<OGRDataSource*>(GDALOpenEx("/vsimem/temp", GDAL_OF_VECTOR, NULL, NULL,NULL));
+
if( poDS == NULL )
{
qDebug( "GDAL Open failed.\n" );
@@ -456,7 +457,7 @@ bool ImportExportGdal::import(Layer* aLayer, const QBy
}
importGDALDataset(poDS, aLayer, confirmProjection);
- OGRDataSource::DestroyDataSource( poDS );
+ GDALClose(( GDALDatasetH) poDS);
return true;
}

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

@ -1,17 +1,17 @@
$OpenBSD: patch-src_src_pro,v 1.5 2013/01/10 22:39:07 landry Exp $
$OpenBSD: patch-src_src_pro,v 1.6 2015/07/21 08:36:40 landry Exp $
Properly set translations/plugins paths
--- src/src.pro.orig Mon Jun 11 17:01:23 2012
+++ src/src.pro Thu Jan 10 18:03:39 2013
@@ -145,7 +145,7 @@ unix:!macx {
isEmpty( LIBDIR ) {
--- src/src.pro.orig Sun Jul 19 16:50:09 2015
+++ src/src.pro Tue Jul 21 09:54:35 2015
@@ -142,7 +142,7 @@ unix:!macx {
LIBDIR = $${PREFIX}/lib${LIB_SUFFIX}
}
- DEFINES += PLUGINS_DIR=$${LIBDIR}/merkaartor/plugins
+ DEFINES += PLUGINS_DIR=${TRUEPREFIX}/lib/merkaartor/plugins
target.path = $${PREFIX}/bin
SHARE_DIR = $${PREFIX}/share/merkaartor
@@ -214,7 +214,7 @@ BINTRANSLATIONS += \
@@ -221,7 +221,7 @@ BINTRANSLATIONS += \
translations.path = $${TRANSDIR_MERKAARTOR}
translations.files = $${BINTRANSLATIONS}

5
geo/merkaartor/pkg/PLIST
View File

@ -1,15 +1,12 @@
@comment $OpenBSD: PLIST,v 1.8 2013/01/10 22:39:07 landry Exp $
@comment $OpenBSD: PLIST,v 1.9 2015/07/21 08:36:40 landry Exp $
@bin bin/merkaartor
lib/merkaartor/
lib/merkaartor/plugins/
lib/merkaartor/plugins/background/
lib/merkaartor/plugins/background/libMCadastreFranceBackgroundPlugin.so
lib/merkaartor/plugins/background/libMGdalBackgroundPlugin.so
lib/merkaartor/plugins/background/libMGeoTiffBackgroundPlugin.so
lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.so
lib/merkaartor/plugins/background/libMWalkingPapersBackgroundPlugin.so
lib/merkaartor/plugins/styles/
lib/merkaartor/plugins/styles/libskulpture.so
share/applications/merkaartor.desktop
share/icons/hicolor/48x48/apps/merkaartor.png
share/merkaartor/