Source: metview
Version: 5.3.0-3
Severity: serious
tags: patch
Hello, magics++ changed interpretAsMatrix prototype, and now metview is FTBFS.
The new upstream release has already a fix, but I'm posting a minimal debdiff
here.
Also, new metview changed the METVIEW_EXTRA_INCLUDES variable, so also a change
in rules file is needed now.
diff -Nru metview-5.3.0/debian/changelog metview-5.3.0/debian/changelog
--- metview-5.3.0/debian/changelog 2019-07-18 16:30:29.000000000 +0200
+++ metview-5.3.0/debian/changelog 2019-08-07 17:13:08.000000000 +0200
@@ -1,3 +1,10 @@
+metview (5.3.0-4) unstable; urgency=medium
+
+ * debian/rules: fixup includes directive for terralib
+ * Cherry-pick upstream build fix (Closes: #-1)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Wed, 07 Aug 2019
17:13:08 +0200
+
metview (5.3.0-3) unstable; urgency=medium
* Standards-Version: 4.4.0
diff -Nru metview-5.3.0/debian/patches/fix-build-new-magics.patch
metview-5.3.0/debian/patches/fix-build-new-magics.patch
--- metview-5.3.0/debian/patches/fix-build-new-magics.patch 1970-01-01
01:00:00.000000000 +0100
+++ metview-5.3.0/debian/patches/fix-build-new-magics.patch 2019-08-07
17:13:07.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Cherry-pick upstream fix for the metview build.
+
+Last-Update: 2019-08-07
+
+--- metview-5.3.0.orig/src/Reprojection/ReprojectService.cc
++++ metview-5.3.0/src/Reprojection/ReprojectService.cc
+@@ -57,7 +57,8 @@ ReprojectService::execute()
+
+
+ magics::Matrix *matrix = 0;
+- gribInterpreter.interpretAsMatrix(grib, &matrix);
++ gribInterpreter.interpretAsMatrix(grib);
++ matrix = grib.u();
+ if (!matrix)
+ {
+ MagLog::dev() << "ERROR: interpretAsMatrix failed on file " <<
gribIn_ << "\n";
diff -Nru metview-5.3.0/debian/patches/series
metview-5.3.0/debian/patches/series
--- metview-5.3.0/debian/patches/series 2019-07-18 16:30:29.000000000 +0200
+++ metview-5.3.0/debian/patches/series 2019-08-07 17:12:51.000000000 +0200
@@ -12,3 +12,4 @@
syserrlist.patch
qt5-transition.patch
g++14.patch
+fix-build-new-magics.patch
diff -Nru metview-5.3.0/debian/rules metview-5.3.0/debian/rules
--- metview-5.3.0/debian/rules 2019-07-18 16:30:29.000000000 +0200
+++ metview-5.3.0/debian/rules 2019-08-07 17:13:08.000000000 +0200
@@ -72,7 +72,7 @@
-DMETVIEW_SITE=debian \
-DCMAKE_BUILD_TYPE=Release \
-DMETVIEW_EXTRA_LIBRARIES='terralib -lemosR64 -leccodes
-leckit' \
- -DMETVIEW_EXTRA_INCLUDES='/usr/include/terralib/kernel' \
+ -DMETVIEW_EXTRA_INCLUDE_DIRS='/usr/include/terralib/kernel' \
-DMAGICS_HAVE_METVIEW=True \
diff -Nru metview-5.3.0/debian/changelog metview-5.3.0/debian/changelog
--- metview-5.3.0/debian/changelog 2019-07-18 16:30:29.000000000 +0200
+++ metview-5.3.0/debian/changelog 2019-08-07 17:13:08.000000000 +0200
@@ -1,3 +1,10 @@
+metview (5.3.0-4) unstable; urgency=medium
+
+ * debian/rules: fixup includes directive for terralib
+ * Cherry-pick upstream build fix (Closes: #-1)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Wed, 07 Aug 2019
17:13:08 +0200
+
metview (5.3.0-3) unstable; urgency=medium
* Standards-Version: 4.4.0
diff -Nru metview-5.3.0/debian/patches/fix-build-new-magics.patch
metview-5.3.0/debian/patches/fix-build-new-magics.patch
--- metview-5.3.0/debian/patches/fix-build-new-magics.patch 1970-01-01
01:00:00.000000000 +0100
+++ metview-5.3.0/debian/patches/fix-build-new-magics.patch 2019-08-07
17:13:07.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Cherry-pick upstream fix for the metview build.
+
+Last-Update: 2019-08-07
+
+--- metview-5.3.0.orig/src/Reprojection/ReprojectService.cc
++++ metview-5.3.0/src/Reprojection/ReprojectService.cc
+@@ -57,7 +57,8 @@ ReprojectService::execute()
+
+
+ magics::Matrix *matrix = 0;
+- gribInterpreter.interpretAsMatrix(grib, &matrix);
++ gribInterpreter.interpretAsMatrix(grib);
++ matrix = grib.u();
+ if (!matrix)
+ {
+ MagLog::dev() << "ERROR: interpretAsMatrix failed on file " <<
gribIn_ << "\n";
diff -Nru metview-5.3.0/debian/patches/series
metview-5.3.0/debian/patches/series
--- metview-5.3.0/debian/patches/series 2019-07-18 16:30:29.000000000 +0200
+++ metview-5.3.0/debian/patches/series 2019-08-07 17:12:51.000000000 +0200
@@ -12,3 +12,4 @@
syserrlist.patch
qt5-transition.patch
g++14.patch
+fix-build-new-magics.patch
diff -Nru metview-5.3.0/debian/rules metview-5.3.0/debian/rules
--- metview-5.3.0/debian/rules 2019-07-18 16:30:29.000000000 +0200
+++ metview-5.3.0/debian/rules 2019-08-07 17:13:08.000000000 +0200
@@ -72,7 +72,7 @@
-DMETVIEW_SITE=debian \
-DCMAKE_BUILD_TYPE=Release \
-DMETVIEW_EXTRA_LIBRARIES='terralib -lemosR64 -leccodes
-leckit' \
- -DMETVIEW_EXTRA_INCLUDES='/usr/include/terralib/kernel' \
+ -DMETVIEW_EXTRA_INCLUDE_DIRS='/usr/include/terralib/kernel' \
-DMAGICS_HAVE_METVIEW=True \
-DMAGICS_HAVE_NETCDF=True \
-DMAGICS_PATH=/usr \
