debian/changelog

-ossim (2.9.1-2) UNRELEASED; urgency=medium
+ossim (2.9.1-2) unstable; urgency=medium
 
+  * Team upload.
   * Bump Standards-Version to 4.4.1, no changes.
+  * Add upstream patches to fix FTBFS with GEOS 3.8.0.
+    (closes: #942269)
+  * Drop unused override for file-references-package-build-path.
 
- -- Bas Couwenberg <sebastic@debian.org>  Mon, 30 Sep 2019 19:38:11 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Thu, 31 Oct 2019 15:56:16 +0100
 
 ossim (2.9.1-1) unstable; urgency=medium
 

debian/libossim1.lintian-overrides

@@ -4,6 +4,3 @@ no-symbols-control-file usr/lib/libossim.so.*
 # False positive, string not included in source.
 spelling-error-in-binary usr/lib/libossim.so.* PROCES PROCESS
 
-# Source uses __FILE__ macro
-file-references-package-build-path *
-

debian/patches/0001-Added-missing-headers.patch

+From 0498f71e811ff3068ba491929c09aa5137ea0cca Mon Sep 17 00:00:00 2001
+From: Garrett Potts <gpotts@radiantblue.com>
+Date: Thu, 31 Oct 2019 07:08:03 -0400
+Subject: Added missing headers
+
+---
+ src/init/ossimInit.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/src/init/ossimInit.cpp
++++ b/src/init/ossimInit.cpp
+@@ -66,7 +66,9 @@
+ #include <algorithm>
+ #include <mutex>
+ #include <geos_c.h>
+-
++#include <cstdio>
++#include <cstdarg>
++#include <cstddef>
+ using namespace std;
+ 
+ static ossimTrace traceExec = ossimTrace("ossimInit:exec");

debian/patches/0001-Fixed-a-core-dump.patch

+From c0d97536f9ac967941b6ca48a6a7a4dde44f4ee3 Mon Sep 17 00:00:00 2001
+From: Garrett Potts <gpotts@radiantblue.com>
+Date: Thu, 31 Oct 2019 07:42:32 -0400
+Subject: Fixed a core dump
+
+---
+ src/base/ossimPolyArea2d.cpp | 10 ++++---
+ src/init/ossimInit.cpp       | 52 +++---------------------------------
+ 2 files changed, 9 insertions(+), 53 deletions(-)
+
+--- a/src/base/ossimPolyArea2d.cpp
++++ b/src/base/ossimPolyArea2d.cpp
+@@ -100,6 +100,7 @@ public:
+ void ossimPolyArea2dPrivate::setGeometry(const ossimPolygon &exteriorRing,
+                                          const std::vector<ossimPolygon> &interiorRings)
+ {
++
+    deleteGeometry();
+ 
+    if (exteriorRing.getNumberOfVertices() < 1)
+@@ -107,14 +108,15 @@ void ossimPolyArea2dPrivate::setGeometry
+    GEOSGeometryPtr shell = 0;
+    std::vector<GEOSGeometryPtr> holes;
+    const std::vector<ossimDpt> &pts = exteriorRing.getVertexList();
+-   int idx = 0;
+-   int n = (int)pts.size();
++   ossim_int32 idx = 0;
++   ossim_int32 n = (int)pts.size();
+ 
+    bool firstAndLastSame = ((pts[0].x == pts[n - 1].x) && (pts[0].y == pts[n - 1].y));
+    if (n > 0)
+    {
+       GEOSCoordSequence *shellSeq = GEOSCoordSeq_create(
+-          exteriorRing.getNumberOfVertices() + ((firstAndLastSame) ? 0 : 1), 2);
++          n + ((firstAndLastSame) ? 0 : 1), 2);
++
+       //fill the exterior ring
+       for (idx = 0; idx < n; idx++)
+       {
+@@ -123,7 +125,7 @@ void ossimPolyArea2dPrivate::setGeometry
+       //if the original polygon didn't have the first and last point the same, make it so
+       if (!firstAndLastSame)
+       {
+-         GEOSCoordSeq_setXY(shellSeq, idx, pts[0].x, pts[0].y);
++         GEOSCoordSeq_setXY(shellSeq, n, pts[0].x, pts[0].y);
+       }
+       shell = GEOSGeom_createLinearRing(shellSeq);
+       //fill the interior rings
+--- a/src/init/ossimInit.cpp
++++ b/src/init/ossimInit.cpp
+@@ -195,6 +195,8 @@ void ossimInit::initialize(ossimArgument
+       }
+       return;
+    }
++   initGEOS(geosNoticeFunction, geosErrorFunction);
++
+    theInstance->parseEnvOptions(parser);
+    theInstance->parseNotifyOption(parser);
+    theInstance->parsePrefsOptions(parser);
+@@ -253,7 +255,7 @@ void ossimInit::initialize()
+       }
+       return;
+    }
+-   
++
+    int argc = 1;
+    char* argv[1];
+ 
+@@ -261,54 +263,6 @@ void ossimInit::initialize()
+    argv[0][0] = '\0';
+    initialize(argc, argv);
+    delete [] argv[0];
+-
+-#if 0   
+-    static std::mutex m;
+-   std::lock_guard<std::mutex> lock(m);
+-   if(theInitializedFlag)
+-   {
+-      if (traceDebug())
+-      {
+-         ossimNotify(ossimNotifyLevel_DEBUG)
+-            << "DEBUG ossimInit::initialize(): Already initialized, returning......" << std::endl;
+-      }
+-      return;
+-   }
+-
+-   theInstance->theAppName  = "";
+-   theInstance->thePreferences = ossimPreferences::instance();
+-   theInstance->initializeDefaultFactories();
+-   
+-   if ( theElevEnabledFlag )
+-   {
+-      theInstance->initializeElevation();
+-   }
+-
+-   theInstance->initializeLogFile();
+-
+-   //---
+-   // To do:
+-   // We need a mechanism to register factories to the "front" or the
+-   // "back" of factory list so that plugins can override things.  For
+-   // now we will initialize the plugins last...
+-   //---
+-   if(thePluginLoaderEnabledFlag)
+-   {
+-      theInstance->initializePlugins();
+-   }
+-
+-   if (traceDebug())
+-   {
+-      ossimNotify(ossimNotifyLevel_DEBUG)
+-         << "ossim preferences file: "
+-         << theInstance->thePreferences->getPreferencesFilename()
+-         << "\nVersion: " << version()
+-         << "\nossimInit::initialize() leaving..."
+-         << std::endl;
+-   } 
+-   
+-   theInitializedFlag = true;
+-#endif
+ }
+ 
+ void ossimInit::finalize()

debian/patches/series

 spelling-errors.patch
+0001-Added-new-interfaces-to-support-the-geos_c-api.patch
+0001-Added-missing-headers.patch
+0001-Fixed-a-core-dump.patch