sci-geosciences/merkaartor: Drop old

Gentoo-bug: 454278, 588048

Package-Manager: portage-2.3.0

7 files changed, 0 insertions, 384 deletions

diff --git a/sci-geosciences/merkaartor/files/0.17.2-includes.patch b/sci-geosciences/merkaartor/files/0.17.2-includes.patch
deleted file mode 100644
index 2458aec201f6..000000000000
--- a/sci-geosciences/merkaartor/files/0.17.2-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN merkaartor-0.17.2.old/src/MainWindow.cpp merkaartor-0.17.2/src/MainWindow.cpp
---- merkaartor-0.17.2.old/src/MainWindow.cpp	2011-06-09 22:01:46.624543619 +0200
-+++ merkaartor-0.17.2/src/MainWindow.cpp	2011-06-09 22:02:27.891027716 +0200
-@@ -92,6 +92,7 @@
- #include <QtGui/QFileDialog>
- #include <QtGui/QMessageBox>
- #include <QtGui/QMouseEvent>
-+#include <QtNetwork>
- #include <QInputDialog>
- #include <QClipboard>
- #include <QProgressDialog>
diff --git a/sci-geosciences/merkaartor/files/0.17.2-libproxy.patch b/sci-geosciences/merkaartor/files/0.17.2-libproxy.patch
deleted file mode 100644
index d5fdf70f4735..000000000000
--- a/sci-geosciences/merkaartor/files/0.17.2-libproxy.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN merkaartor-0.17.2.old//src/Preferences/MerkaartorPreferences.h merkaartor-0.17.2/src/Preferences/MerkaartorPreferences.h
---- merkaartor-0.17.2.old//src/Preferences/MerkaartorPreferences.h	2011-06-10 17:26:49.000000000 +0200
-+++ merkaartor-0.17.2/src/Preferences/MerkaartorPreferences.h	2011-06-10 17:29:46.000000000 +0200
-@@ -21,7 +21,7 @@
- #include <QNetworkProxy>
- 
- #ifdef USE_LIBPROXY
--#include <libproxy/proxy.h>
-+#include <proxy.h>
- #endif
- 
- #include "Maps/Coord.h"
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch
deleted file mode 100644
index 52955735e20a..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From e4cda9c42c049577caf126e8849c4b9eba62b31b Mon Sep 17 00:00:00 2001
-From: Nikoli <nikoli@gmx.us>
-Date: Thu, 10 Oct 2013 16:28:02 +0400
-Subject: [PATCH] Support for building with system qtsingleapplication and
- quazip
-
----
- INSTALL     | 1 +
- src/src.pro | 6 +++++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/INSTALL b/INSTALL
-index a828c17..022e8d0 100644
---- a/INSTALL
-+++ b/INSTALL
-@@ -33,6 +33,7 @@ TRANSDIR_MERKAARTOR=<path>	- where will the Merkaartor translations be installed
- TRANSDIR_SYSTEM=<path>		- where your global Qt translation directory is
- NODEBUG=1			- release target
- NOUSEWEBKIT                 	- disable use of WebKit (Yahoo adapter)
-+SYSTEM_QTSA			- use system copy of qtsingleapplication instead of internal
- 
- see http://wiki.openstreetmap.org/wiki/Merkaartor/Compiling for the complete list
- 
-diff --git a/src/src.pro b/src/src.pro
-index f23e05e..ff228b6 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -6,7 +6,11 @@ include (Config.pri)
- #Custom config
- include(Custom.pri)
- 
--include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
-+isEmpty(SYSTEM_QTSA) {
-+  include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
-+} else {
-+  CONFIG += qtsingleapplication
-+}
- include(../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.pri)
- 
- #Qt Version
--- 
-2.0.5
-
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.2-fix-qtgui-include.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.2-fix-qtgui-include.patch
deleted file mode 100644
index 4bbd129db327..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.2-fix-qtgui-include.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/Docks/GeoImageDock.cpp b/src/Docks/GeoImageDock.cpp
-index c05d09f..6afbfa8 100644
---- a/src/Docks/GeoImageDock.cpp
-+++ b/src/Docks/GeoImageDock.cpp
-@@ -12,13 +12,13 @@
- #include <zbar/QZBarImage.h>
- #endif
- 
--#include <QtWidgets/QInputDialog>
--#include <QtWidgets/QMessageBox>
--#include <QtWidgets/QProgressDialog>
-+#include <QtGui/QInputDialog>
-+#include <QtGui/QMessageBox>
-+#include <QtGui/QProgressDialog>
- #include <QtGui/QClipboard>
--#include <QtWidgets/QRadioButton>
--#include <QtWidgets/QTimeEdit>
--#include <QtWidgets/QDialogButtonBox>
-+#include <QtGui/QRadioButton>
-+#include <QtGui/QTimeEdit>
-+#include <QtGui/QDialogButtonBox>
- #include <QFileDialog>
- 
- #include <QNetworkAccessManager>
-diff --git a/src/Docks/GeoImageDock.h b/src/Docks/GeoImageDock.h
-index ab7bbf6..a2606b0 100644
---- a/src/Docks/GeoImageDock.h
-+++ b/src/Docks/GeoImageDock.h
-@@ -4,9 +4,9 @@
- #include "Document.h"
- 
- #include <QtGui/QPainter>
--#include <QtWidgets/QDockWidget>
-+#include <QtGui/QDockWidget>
- #include <QtGui/QMouseEvent>
--#include <QtWidgets/QShortcut>
-+#include <QtGui/QShortcut>
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
- 
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.2-geoimagedock.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.2-geoimagedock.patch
deleted file mode 100644
index 8ca40f873b14..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.2-geoimagedock.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/Docks/GeoImageDock.cpp b/src/Docks/GeoImageDock.cpp
-index c05d09f..5cd3a98 100644
---- a/src/Docks/GeoImageDock.cpp
-+++ b/src/Docks/GeoImageDock.cpp
-@@ -458,7 +458,7 @@ void GeoImageDock::loadImages(QStringList fileNames)
- 
-     Exiv2::Image::AutoPtr image;
-     Exiv2::ExifData exifData;
--    bool positionValid = FALSE;
-+    bool positionValid = false;
- 
-     Layer *theLayer;
-     if (photoLayer == NULL) {
-@@ -894,7 +894,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString & file)
-     double lat = 0.0, lon = 0.0;
-     Exiv2::Image::AutoPtr image;
-     Exiv2::ExifData exifData;
--    bool positionValid = FALSE;
-+    bool positionValid = false;
- 
-     if (!QFile::exists(file)) {
-         return pos;
-diff --git a/src/Docks/GeoImageDock.h b/src/Docks/GeoImageDock.h
-index ab7bbf6..3153219 100644
---- a/src/Docks/GeoImageDock.h
-+++ b/src/Docks/GeoImageDock.h
-@@ -9,6 +9,7 @@
- #include <QtWidgets/QShortcut>
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
-+#include <QDrag>
- 
- class ImageView;
- 
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.2-gpsdata-handling-gpsd-3.12.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.2-gpsdata-handling-gpsd-3.12.patch
deleted file mode 100644
index ee1052c0a0c6..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.2-gpsdata-handling-gpsd-3.12.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3f2209970cca8d9b2b977be3eab7587f72f65fbb Mon Sep 17 00:00:00 2001
-From: Bas Couwenberg <sebastic@xs4all.nl>
-Date: Sun, 1 Nov 2015 16:26:15 +0100
-Subject: [PATCH] Fix gpsdata handling for gpsd >= 3.12 (libgps22 |
- GPSD_API_MAJOR_VERSION 6) #76
-
----
- src/GPS/qgpsdevice.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/GPS/qgpsdevice.cpp b/src/GPS/qgpsdevice.cpp
-index 04889f6..b0c146a 100644
---- a/src/GPS/qgpsdevice.cpp
-+++ b/src/GPS/qgpsdevice.cpp
-@@ -1056,10 +1056,17 @@ void QGPSDDevice::onDataAvailable()
-         satArray[i][0] = satArray[i][1] = satArray[i][2] = 0;
-     for (int i=0; i<num_sat; ++i)
-     {
-+#if GPSD_API_MAJOR_VERSION > 5
-+        int id = gpsdata->skyview[i].PRN;
-+        satArray[id][0] = gpsdata->skyview[i].elevation;
-+        satArray[id][1] = gpsdata->skyview[i].azimuth;
-+        satArray[id][2] = gpsdata->skyview[i].ss;
-+#else
-         int id = gpsdata->PRN[i];
-         satArray[id][0] = gpsdata->elevation[i];
-         satArray[id][1] = gpsdata->azimuth[i];
-         satArray[id][2] = gpsdata->ss[i];
-+#endif
-     }
-     setNumSatellites(num_sat);
- 
diff --git a/sci-geosciences/merkaartor/files/merkaartor-gdal-2-fix.patch b/sci-geosciences/merkaartor/files/merkaartor-gdal-2-fix.patch
deleted file mode 100644
index 4197610c17f0..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-gdal-2-fix.patch
+++ /dev/null
@@ -1,212 +0,0 @@
---- a/src/ImportExport/ImportExportGdal.cpp 2015-06-15 18:48:39.604575423 +0200
-+++ b/src/ImportExport/ImportExportGdal.cpp 2015-06-15 18:48:39.604575423 +0200
-@@ -21,10 +21,13 @@
- #include "ProjectionChooser.h"
- #include "Global.h"
- 
--#include "cpl_vsi.h"
-+#include <cpl_vsi.h>
-+#include <gdal.h>
-+#include <gdal_priv.h>
- 
- #include <QDir>
- 
-+
- bool parseContainer(QDomElement& e, Layer* aLayer);
- 
- ImportExportGdal::ImportExportGdal(Document* doc)
-@@ -55,6 +58,55 @@ bool ImportExportGdal::saveFile(QString)
- bool ImportExportGdal::export_(const QList<Feature *>& featList)
- {
-     const char *pszDriverName = "SQLite";
-+    QString fileName(HOMEDIR + "/test.sqlite");
-+#ifdef GDAL2
-+    GDALDriver *poDriver;
-+    GDALDriverManager *driverManager = GetGDALDriverManager();
-+    GDALAllRegister();
-+    driverManager->AutoLoadDrivers();
-+
-+    poDriver = driverManager->GetDriverByName(pszDriverName);
-+    if( poDriver == NULL )
-+    {
-+        qDebug( "%s driver not available.", pszDriverName );
-+        return false;
-+    }
-+
-+    /* Create create options */
-+    char **createOptions = NULL;
-+    createOptions = CSLSetNameValue( createOptions, "SPATIALITE", "YES" );
-+
-+    /* Open new dataset */
-+    GDALDataset *poDS;
-+
-+    QFile::remove(fileName);
-+    poDS = poDriver->Create( fileName.toUtf8().constData(), 0, 0, 0, GDT_Unknown, createOptions );
-+    if( poDS == NULL )
-+    {
-+        qDebug( "Creation of output file failed." );
-+        return false;
-+    }
-+    poDS->ExecuteSQL("PRAGMA synchronous = OFF", NULL, NULL);
-+
-+    /* Create Spatial reference object */
-+    OGRSpatialReference *poSRS;
-+    poSRS = new OGRSpatialReference();
-+    poSRS->importFromEPSG(4326);
-+
-+    /* Create layer options */
-+    char **layerOptions = NULL;
-+    layerOptions = CSLSetNameValue( layerOptions, "FORMAT", "SPATIALITE" );
-+    layerOptions = CSLSetNameValue( layerOptions, "SPATIAL_INDEX", "YES" );
-+
-+    /* Create layer */
-+    OGRLayer *poLayer;
-+    poLayer = poDS->CreateLayer( "osm", poSRS, wkbUnknown, layerOptions);
-+
-+    /* Free the options */
-+    CSLDestroy( createOptions );
-+    CSLDestroy( layerOptions );
-+#else
-+    /* This is legacy code, and is not tested at all */
-     OGRSFDriver *poDriver;
- 
-     OGRRegisterAll();
-@@ -68,8 +120,8 @@ bool ImportExportGdal::export_(const QList<Feature *>& featList)
- 
-     OGRDataSource *poDS;
- 
--    QFile::remove(QString(HOMEDIR + "/test.sqlite"));
--    poDS = poDriver->CreateDataSource( QString(HOMEDIR + "/test.sqlite").toUtf8().constData(), NULL );
-+    QFile::remove(fileName);
-+    poDS = poDriver->CreateDataSource( fileName.toUtf8().constData(), NULL );
-     if( poDS == NULL )
-     {
-         qDebug( "Creation of output file failed." );
-@@ -89,6 +141,8 @@ bool ImportExportGdal::export_(const QList<Feature *>& featList)
-     OGRLayer *poLayer;
-     poLayer = poDS->CreateLayer( "osm", poSRS, wkbUnknown, papszOptions);
-     CSLDestroy( papszOptions );
-+#endif
-+
- 
-     if( poLayer == NULL )
-     {
-@@ -142,7 +196,11 @@ bool ImportExportGdal::export_(const QList<Feature *>& featList)
-         }
-         OGRFeature::DestroyFeature( poFeature );
-     }
-+#ifdef GDAL2
-+    GDALClose( (GDALDatasetH) poDS );
-+#else
-     OGRDataSource::DestroyDataSource( poDS );
-+#endif
-     return true;
- }
- 
-@@ -264,7 +322,11 @@ Feature* ImportExportGdal::parseGeometry(Layer* aLayer, OGRGeometry *poGeometry)
- 
- // import the  input
- 
--bool ImportExportGdal::importGDALDataset(OGRDataSource* poDS, Layer* aLayer, bool confirmProjection)
-+#ifndef GDAL2
-+#define GDALDataset OGRDataSource
-+#endif
-+bool ImportExportGdal::importGDALDataset(GDALDataset* poDS, Layer* aLayer, bool confirmProjection)
-+#undef GDALDataset
- {
-     int ogrError;
- 
-@@ -422,11 +484,16 @@ bool ImportExportGdal::importGDALDataset(OGRDataSource* poDS, Layer* aLayer, boo
- 
- bool ImportExportGdal::import(Layer* aLayer)
- {
-+#ifdef GDAL2
-+    GDALAllRegister();
-+    GDALDataset *poDS;
-+    poDS = (GDALDataset *) GDALOpen( FileName.toUtf8().constData(), GA_ReadOnly );
-+#else
-     OGRRegisterAll();
--
--    OGRDataSource       *poDS;
--
-+    OGRDataSource *poDS;
-     poDS = OGRSFDriverRegistrar::Open( FileName.toUtf8().constData(), FALSE );
-+#endif
-+
-     if( poDS == NULL )
-     {
-         qDebug( "GDAL Open failed.\n" );
-@@ -435,22 +502,26 @@ bool ImportExportGdal::import(Layer* aLayer)
- 
-     importGDALDataset(poDS, aLayer, M_PREFS->getGdalConfirmProjection());
- 
--    OGRDataSource::DestroyDataSource( poDS );
-+    GDALClose( (GDALDatasetH) poDS );
- 
-     return true;
- }
- 
- bool ImportExportGdal::import(Layer* aLayer, const QByteArray& ba, bool confirmProjection)
- {
--    OGRRegisterAll();
--
--    OGRDataSource       *poDS;
--//    int ogrError;
--
-     GByte* content = (GByte*)(ba.constData());
-     /*FILE* f = */VSIFileFromMemBuffer("/vsimem/temp", content, ba.size(), FALSE);
- 
-+#ifdef GDAL2
-+    GDALAllRegister();
-+    GDALDataset *poDS;
-+    poDS = (GDALDataset *) GDALOpen( "/vsimem/temp", GA_ReadOnly );
-+#else
-+    OGRRegisterAll();
-+    OGRDataSource *poDS;
-     poDS = OGRSFDriverRegistrar::Open( "/vsimem/temp", FALSE );
-+#endif
-+
-     if( poDS == NULL )
-     {
-         qDebug( "GDAL Open failed.\n" );
-@@ -458,7 +529,7 @@ bool ImportExportGdal::import(Layer* aLayer, const QByteArray& ba, bool confirmP
-     }
-     importGDALDataset(poDS, aLayer, confirmProjection);
- 
--    OGRDataSource::DestroyDataSource( poDS );
-+    GDALClose( (GDALDatasetH) poDS );
- 
-     return true;
- }
---- a/src/ImportExport/ImportExportGdal.h 2015-06-15 18:50:42.884995287 +0200
-+++ b/src/ImportExport/ImportExportGdal.h 2015-06-15 18:50:42.884995287 +0200
-@@ -13,7 +13,15 @@
- #define ImportExportGDAL_H
- 
- #include "IImportExport.h"
--#include "ogrsf_frmts.h"
-+
-+#include <ogrsf_frmts.h>
-+#include <gdal.h>
-+#include <gdal_priv.h>
-+#include <gdal_version.h>
-+
-+#if GDAL_VERSION_MAJOR == 2
-+#define GDAL2
-+#endif
- 
- class Projection;
- class Layer;
-@@ -52,7 +60,11 @@ class ImportExportGdal : public IImportExport
-     Node *nodeFor(Layer* aLayer, OGRPoint point);
-     Way *readWay(Layer* aLayer, OGRLineString *poRing);
- 
--    bool importGDALDataset(OGRDataSource *poDs, Layer *aLayer, bool confirmProjection);
-+#ifndef GDAL2
-+#define GDALDataset OGRDataSource
-+#endif
-+    bool importGDALDataset(GDALDataset *poDs, Layer *aLayer, bool confirmProjection);
-+#undef GDALDataset
- 
- private:
-     QHash<OGRPoint, Node*> pointHash;