This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor.
commit e415d782b7f1536aba91f579f8c04881bd32440e Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Thu Sep 24 23:36:51 2015 +0200 Add patches for improved GDAL 2.0 support, and debug build fix. --- debian/changelog | 6 +++ .../0001-Fixed-GDAL-imports-for-GDAL-2.0.patch | 58 ++++++++++++++++++++++ debian/patches/0001-Fixed-debug-build.patch | 22 ++++++++ ...AL-import-to-always-confirm-projection-be.patch | 21 ++++++++ debian/patches/quazip-qt5.patch | 2 +- debian/patches/series | 3 ++ 6 files changed, 111 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2ca700f..d2066ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +merkaartor (0.18.2-1~exp2) UNRELEASED; urgency=medium + + * Add patches for improved GDAL 2.0 support, and debug build fix. + + -- Bas Couwenberg <sebas...@debian.org> Thu, 24 Sep 2015 23:36:05 +0200 + merkaartor (0.18.2-1~exp1) experimental; urgency=medium * New upstream release. diff --git a/debian/patches/0001-Fixed-GDAL-imports-for-GDAL-2.0.patch b/debian/patches/0001-Fixed-GDAL-imports-for-GDAL-2.0.patch new file mode 100644 index 0000000..ad24588 --- /dev/null +++ b/debian/patches/0001-Fixed-GDAL-imports-for-GDAL-2.0.patch @@ -0,0 +1,58 @@ +From b333cd33e487f79ae8cd0c2eea145baf650e793d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krako...@krakonos.org> +Date: Sun, 26 Jul 2015 00:01:07 +0200 +Subject: Fixed GDAL imports for GDAL 2.0. +Origin: https://github.com/openstreetmap/merkaartor/commit/b333cd33e487f79ae8cd0c2eea145baf650e793d + +The GDALOpen is not willing to use vector formats. Replaced by GDALOpenEx. +--- + src/ImportExport/ImportExportGdal.cpp | 7 +++---- + src/MainWindow.cpp | 2 +- + src/common/Document.cpp | 3 --- + 3 files changed, 4 insertions(+), 8 deletions(-) + +--- a/src/ImportExport/ImportExportGdal.cpp ++++ b/src/ImportExport/ImportExportGdal.cpp +@@ -487,16 +487,15 @@ bool ImportExportGdal::import(Layer* aLa + #ifdef GDAL2 + GDALAllRegister(); + GDALDataset *poDS; +- poDS = (GDALDataset *) GDALOpen( FileName.toUtf8().constData(), GA_ReadOnly ); ++ poDS = (GDALDataset *) GDALOpenEx( FileName.toUtf8().constData(), GDAL_OF_VECTOR | GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR, NULL, NULL, NULL ); + #else + OGRRegisterAll(); + OGRDataSource *poDS; + poDS = OGRSFDriverRegistrar::Open( FileName.toUtf8().constData(), FALSE ); + #endif + +- if( poDS == NULL ) +- { +- qDebug( "GDAL Open failed.\n" ); ++ if( poDS == NULL ) { ++ //qDebug() << "GDAL Open failed from file " << FileName.toUtf8().constData(); + return false; + } + +--- a/src/MainWindow.cpp ++++ b/src/MainWindow.cpp +@@ -1739,7 +1739,7 @@ MainWindow::ImportStatus MainWindow::imp + newLayer = new DrawingLayer( baseFileName ); + newLayer->setUploadable(false); + mapDocument->add(newLayer); +- return mapDocument->importGDAL(baseFileName, (DrawingLayer*)newLayer) ? IMPORT_OK : IMPORT_ERROR; ++ return mapDocument->importGDAL(fileName, (DrawingLayer*)newLayer) ? IMPORT_OK : IMPORT_ERROR; + } + } + +--- a/src/common/Document.cpp ++++ b/src/common/Document.cpp +@@ -736,9 +736,6 @@ bool Document::importKML(const QString& + #ifndef _MOBILE + bool Document::importGDAL(const QString& filename, DrawingLayer* NewLayer) + { +- Q_UNUSED(filename) +- Q_UNUSED(NewLayer) +- + ImportExportGdal imp(this); + if (!imp.loadFile(filename)) + return false; diff --git a/debian/patches/0001-Fixed-debug-build.patch b/debian/patches/0001-Fixed-debug-build.patch new file mode 100644 index 0000000..1a50e64 --- /dev/null +++ b/debian/patches/0001-Fixed-debug-build.patch @@ -0,0 +1,22 @@ +From 72c8c2bbc02c1a9dc57943d688f8a5667a9aeec6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krako...@krakonos.org> +Date: Sat, 1 Aug 2015 16:02:41 +0200 +Subject: Fixed debug build. +Origin: https://github.com/openstreetmap/merkaartor/commit/72c8c2bbc02c1a9dc57943d688f8a5667a9aeec6 + +For some reason, CONFIG += debug_and_release in src/src.pro was missing. +--- + src/src.pro | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/src/src.pro ++++ b/src/src.pro +@@ -6,6 +6,8 @@ include (Config.pri) + #Custom config + include(Custom.pri) + ++CONFIG += debug_and_release ++ + isEmpty(SYSTEM_QTSA) { + include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri) + } else { diff --git a/debian/patches/0001-Modified-GDAL-import-to-always-confirm-projection-be.patch b/debian/patches/0001-Modified-GDAL-import-to-always-confirm-projection-be.patch new file mode 100644 index 0000000..e28d639 --- /dev/null +++ b/debian/patches/0001-Modified-GDAL-import-to-always-confirm-projection-be.patch @@ -0,0 +1,21 @@ +From a350968c1a3c11be58a378ee705e381719353106 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krako...@krakonos.org> +Date: Mon, 27 Jul 2015 10:59:14 +0200 +Subject: Modified GDAL import to always confirm projection before import. +Origin: https://github.com/openstreetmap/merkaartor/commit/a350968c1a3c11be58a378ee705e381719353106 + +--- + src/Preferences/MerkaartorPreferences.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/Preferences/MerkaartorPreferences.cpp ++++ b/src/Preferences/MerkaartorPreferences.cpp +@@ -1253,7 +1253,7 @@ M_PARAM_IMPLEMENT_BOOL(AutoSourceTag, ba + /* Data */ + M_PARAM_IMPLEMENT_STRING(OpenStreetBugsUrl, data, "http://openstreetbugs.schokokeks.org/api/0.1/") + M_PARAM_IMPLEMENT_STRING(MapdustUrl, data, "http://www.mapdust.com/feed?lang=en&ft=wrong_turn,bad_routing,oneway_road,blocked_street,missing_street,wrong_roundabout,missing_speedlimit,other&fd=1&minR=&maxR=") +-M_PARAM_IMPLEMENT_BOOL(GdalConfirmProjection, data, false) ++M_PARAM_IMPLEMENT_BOOL(GdalConfirmProjection, data, true) + M_PARAM_IMPLEMENT_BOOL(HasAutoLoadDocument, data, false) + M_PARAM_IMPLEMENT_STRING(AutoLoadDocumentFilename, data, "") + diff --git a/debian/patches/quazip-qt5.patch b/debian/patches/quazip-qt5.patch index 7a27f9a..ebf9541 100644 --- a/debian/patches/quazip-qt5.patch +++ b/debian/patches/quazip-qt5.patch @@ -4,7 +4,7 @@ Bug: https://github.com/openstreetmap/merkaartor/issues/66 --- a/src/src.pro +++ b/src/src.pro -@@ -15,7 +15,7 @@ isEmpty(SYSTEM_QUAZIP) { +@@ -17,7 +17,7 @@ isEmpty(SYSTEM_QUAZIP) { DEFINES += QUAZIP_STATIC include(../3rdparty/quazip-0.7/quazip.pri) } else { diff --git a/debian/patches/series b/debian/patches/series index dd10a96..0dbad92 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,8 @@ +0001-Fixed-GDAL-imports-for-GDAL-2.0.patch 0001-Fixed-version-info-in-tarballs.patch 0001-Fixed-compilation-issues-with-GEOIMAGE-1-and-Qt5.patch +0001-Modified-GDAL-import-to-always-confirm-projection-be.patch +0001-Fixed-debug-build.patch quazip-qt5.patch various-typos.patch hardening-buildflags.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel