diff options
| -rw-r--r-- | ham/qradiopredict/qradiopredict-gdal2.patch | 80 | ||||
| -rw-r--r-- | ham/qradiopredict/qradiopredict.SlackBuild | 2 |
2 files changed, 82 insertions, 0 deletions
diff --git a/ham/qradiopredict/qradiopredict-gdal2.patch b/ham/qradiopredict/qradiopredict-gdal2.patch new file mode 100644 index 000000000000..f6b55a939109 --- /dev/null +++ b/ham/qradiopredict/qradiopredict-gdal2.patch @@ -0,0 +1,80 @@ +diff -u -r qradiopredict-0.8.8/QRadioPredict/shpreader.cpp qradiopredict-0.8.8-patched/QRadioPredict/shpreader.cpp +--- qradiopredict-0.8.8/QRadioPredict/shpreader.cpp 2014-02-24 07:56:11.000000000 +0000 ++++ qradiopredict-0.8.8-patched/QRadioPredict/shpreader.cpp 2016-03-20 21:04:43.097658012 +0000 +@@ -104,9 +104,15 @@ + OGRRegisterAll(); + QString file = name; + file.append(".shp"); +- OGRDataSource *poDS; + ++#if GDAL_VERSION_MAJOR < 2 ++ OGRDataSource *poDS; + poDS = OGRSFDriverRegistrar::Open( file.toStdString().c_str(), FALSE ); ++#else ++ GDALDataset *poDS; ++ poDS = (GDALDataset*) OGROpen( file.toStdString().c_str(), FALSE, NULL ); ++#endif ++ + if( poDS == NULL ) + { + qDebug() << "Shapefile opening failed: " << name; +@@ -119,7 +125,11 @@ + if(poLayer == NULL) + { + qDebug() << "Shapefile layer is fubar: " << poLayer->GetName(); ++#if GDAL_VERSION_MAJOR < 2 + OGRDataSource::DestroyDataSource( poDS ); ++#else ++ GDALClose( (GDALDatasetH) poDS ); ++#endif + return QString("None"); + } + +@@ -171,7 +181,11 @@ + qDebug() << "Using GEOS for: " << terrain_type; + delete [] buffer; + OGRFeature::DestroyFeature( poFeature ); ++#if GDAL_VERSION_MAJOR < 2 + OGRDataSource::DestroyDataSource( poDS ); ++#else ++ GDALClose( (GDALDatasetH) poDS ); ++#endif + return terrain_type; + } + delete[] buffer; +@@ -233,7 +247,11 @@ + if(poly) + delete poly; + OGRFeature::DestroyFeature( poFeature ); ++#if GDAL_VERSION_MAJOR < 2 + OGRDataSource::DestroyDataSource( poDS ); ++#else ++ GDALClose( (GDALDatasetH) poDS ); ++#endif + return terrain_type; + } + +@@ -255,7 +273,11 @@ + { + //qDebug() << terrain_type; + OGRFeature::DestroyFeature( poFeature ); ++#if GDAL_VERSION_MAJOR < 2 + OGRDataSource::DestroyDataSource( poDS ); ++#else ++ GDALClose( (GDALDatasetH) poDS ); ++#endif + return terrain_type; + } + */ +@@ -267,7 +289,11 @@ + OGRFeature::DestroyFeature( poFeature ); + } + ++#if GDAL_VERSION_MAJOR < 2 + OGRDataSource::DestroyDataSource( poDS ); ++#else ++ GDALClose( (GDALDatasetH) poDS ); ++#endif + + return QString("None"); + } diff --git a/ham/qradiopredict/qradiopredict.SlackBuild b/ham/qradiopredict/qradiopredict.SlackBuild index 713a0dcc10fb..f95520777cb1 100644 --- a/ham/qradiopredict/qradiopredict.SlackBuild +++ b/ham/qradiopredict/qradiopredict.SlackBuild @@ -66,6 +66,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/qradiopredict-gdal2.patch + mkdir -p build cd build CFLAGS="$SLKCFLAGS" \ |