[magics] 05/23: Update patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Jun 24 09:33:10 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository magics.
commit 94497074d8b815e12391ec671fce068b09480b9f
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri May 15 14:45:28 2015 +0100
Update patches
---
debian/changelog | 1 +
debian/patches/cve-2010-3393.patch | 10 +--
debian/patches/dynamic_link.patch | 21 ------
debian/patches/enable_static.patch | 18 -----
debian/patches/fix-headers.patch | 39 +++-------
debian/patches/gcc-4.7.patch | 52 ++++++-------
debian/patches/magics-config.patch | 122 +++++++++++++-----------------
debian/patches/metview_fixes.patch | 2 +-
debian/patches/series | 2 -
debian/patches/terralib.patch | 150 ++++---------------------------------
debian/rules | 18 ++---
11 files changed, 116 insertions(+), 319 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3daa2b0..869e9d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ magics++ (2.24.4-1) UNRELEASED; urgency=medium
* New upstream release.
* Standards-Version: 3.9.6
+ * Move to cmake-based build. Update patches
-- Alastair McKinstry <mckinstry at debian.org> Wed, 29 Apr 2015 08:09:32 +0100
diff --git a/debian/patches/cve-2010-3393.patch b/debian/patches/cve-2010-3393.patch
index 9d0465a..7e96143 100644
--- a/debian/patches/cve-2010-3393.patch
+++ b/debian/patches/cve-2010-3393.patch
@@ -8,11 +8,11 @@ Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aalto at cante.net>
---
-Index: magics++-2.18.1/magics-config.in
+Index: magics++-2.24.4/magics-config.in
===================================================================
---- magics++-2.18.1.orig/magics-config.in 2012-10-15 12:23:32.000000000 +0100
-+++ magics++-2.18.1/magics-config.in 2012-10-31 15:38:22.000000000 +0000
-@@ -76,6 +76,7 @@
+--- magics++-2.24.4.orig/magics-config.in
++++ magics++-2.24.4/magics-config.in
+@@ -76,6 +76,7 @@ if test -h ${prefix}; then
fi
fi
@@ -20,7 +20,7 @@ Index: magics++-2.18.1/magics-config.in
if test $# -eq 0; then
usage 1 1>&2
fi
-@@ -132,7 +133,7 @@
+@@ -135,7 +136,7 @@ while test $# -gt 0; do
echo ""
echo " export MAGPLUS_HOME=${prefix}"
echo " export PATH=${prefix}/bin:\$PATH"
diff --git a/debian/patches/dynamic_link.patch b/debian/patches/dynamic_link.patch
deleted file mode 100644
index eb7d270..0000000
--- a/debian/patches/dynamic_link.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Link libMagPlus.so.3.0.0 against extra libraries that are provided
- in dynamic form by Debian.
-Author: Alastair McKinstry <mckinstry at debian.org>
-Last-Updated: 2010-07-23
-Forwarded: no
-
-Index: magics++-2.18.1/configure.ac
-===================================================================
---- magics++-2.18.1.orig/configure.ac 2012-10-15 12:23:25.000000000 +0100
-+++ magics++-2.18.1/configure.ac 2012-10-31 15:38:08.000000000 +0000
-@@ -724,7 +724,9 @@
- fi
- AC_SUBST(proj4)
-
--
-+# Add dynamic libs needed by Debian
-+LIBS="$CAIRO_LIBS $LIBS -lemosR64 -lgrib_api -lterralib -lstdc++ -lm $NETCDF_LIBS"
-+LDFLAGS="$CAIRO_LDFLAGS $LDFLAGS -Wl,--as-needed"
-
- ############################################
- #
diff --git a/debian/patches/enable_static.patch b/debian/patches/enable_static.patch
deleted file mode 100644
index 6b1325d..0000000
--- a/debian/patches/enable_static.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Enable building static libs
-Last-Updated: 2011-06-16
-Forwarded: not-needed
-
-Index: magics++-2.18.1/configure.ac
-===================================================================
---- magics++-2.18.1.orig/configure.ac 2012-10-31 15:38:30.000000000 +0000
-+++ magics++-2.18.1/configure.ac 2012-10-31 15:38:38.000000000 +0000
-@@ -55,7 +55,7 @@
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-
--AC_DISABLE_STATIC # TEMPORARY !!!!
-+#AC_DISABLE_STATIC # TEMPORARY !!!!
- AC_AIX
- LT_INIT
- #AC_PROG_CC([xlc_r icc aCC gcc cc CC])
diff --git a/debian/patches/fix-headers.patch b/debian/patches/fix-headers.patch
index 7979cac..ed7d3b3 100644
--- a/debian/patches/fix-headers.patch
+++ b/debian/patches/fix-headers.patch
@@ -1,12 +1,12 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Point headers to terralib shipped with Debian, not local version
-Last-Updated: 2014-02-23
+Last-Updated: 2015-05-14
Forwarded: not-needed
-Index: magics++-2.18.15/src/common/SatelliteProjection.h
+Index: magics++-2.24.4/src/common/SatelliteProjection.h
===================================================================
---- magics++-2.18.15.orig/src/common/SatelliteProjection.h 2013-05-22 06:15:56.000000000 +0100
-+++ magics++-2.18.15/src/common/SatelliteProjection.h 2014-02-23 20:51:59.291168537 +0000
+--- magics++-2.24.4.orig/src/common/SatelliteProjection.h
++++ magics++-2.24.4/src/common/SatelliteProjection.h
@@ -34,7 +34,7 @@
#include "Transformation.h"
@@ -16,11 +16,11 @@ Index: magics++-2.18.15/src/common/SatelliteProjection.h
namespace magics {
-Index: magics++-2.18.15/src/common/Transformation.h
+Index: magics++-2.24.4/src/common/Transformation.h
===================================================================
---- magics++-2.18.15.orig/src/common/Transformation.h 2013-05-22 06:15:56.000000000 +0100
-+++ magics++-2.18.15/src/common/Transformation.h 2014-02-23 20:51:12.678048756 +0000
-@@ -62,7 +62,7 @@
+--- magics++-2.24.4.orig/src/common/Transformation.h
++++ magics++-2.24.4/src/common/Transformation.h
+@@ -62,7 +62,7 @@ Currently Magics++ supports following pr
#include "UserPoint.h"
#include "MagTranslator.h"
#include "Factory.h"
@@ -28,25 +28,4 @@ Index: magics++-2.18.15/src/common/Transformation.h
+#include <terralib/kernel/TeProjection.h>
#include "BasicGraphicsObject.h"
#include "SceneVisitor.h"
-
-Index: magics++-2.18.15/src/visualisers/ImagePlotting.cc
-===================================================================
---- magics++-2.18.15.orig/src/visualisers/ImagePlotting.cc 2014-02-23 19:31:05.000000000 +0000
-+++ magics++-2.18.15/src/visualisers/ImagePlotting.cc 2014-02-23 20:58:39.176774941 +0000
-@@ -32,11 +32,11 @@
-
-
- #include "LookupTableMode.h"
--#include "TeDataTypes.h"
--#include "TeRasterParams.h"
--#include "TeDecoderMemory.h"
--#include "TeRasterRemap.h"
--#include "TeProjection.h"
-+#include <terralib/kernel/TeDataTypes.h>
-+#include <terralib/kernel/TeRasterParams.h>
-+#include <terralib/kernel/TeDecoderMemory.h>
-+#include <terralib/kernel/TeRasterRemap.h>
-+#include <terralib/kernel/TeProjection.h>
- #include "LegendVisitor.h"
- #include "RasterData.h"
-
+ #include "CustomisedPoint.h"
diff --git a/debian/patches/gcc-4.7.patch b/debian/patches/gcc-4.7.patch
index e76b7a9..d1396e2 100644
--- a/debian/patches/gcc-4.7.patch
+++ b/debian/patches/gcc-4.7.patch
@@ -1,16 +1,16 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Fixes needed for compilation with gcc-4.7
Forwarded: no
-Last-Updaged: 2012-05-22
+Last-Updaged: 2015-05-14
Bug-Origin: http://bugs.debian.org/673885.
-Index: magics++-2.18.1/src/visualisers/IsoPlot.cc
+Index: magics++-2.24.4/src/visualisers/IsoPlot.cc
===================================================================
---- magics++-2.18.1.orig/src/visualisers/IsoPlot.cc 2012-10-15 12:23:37.000000000 +0100
-+++ magics++-2.18.1/src/visualisers/IsoPlot.cc 2012-10-31 15:46:02.000000000 +0000
-@@ -456,36 +456,36 @@
+--- magics++-2.24.4.orig/src/visualisers/IsoPlot.cc
++++ magics++-2.24.4/src/visualisers/IsoPlot.cc
+@@ -483,36 +483,36 @@ void CellBox::split()
RangeType def = cell->range();
-
+
if ( def != multipleRange ) {
- push_back(cell);
+ this->push_back(cell);
@@ -55,14 +55,14 @@ Index: magics++-2.18.1/src/visualisers/IsoPlot.cc
return;
}
}
-@@ -1302,12 +1302,12 @@
+@@ -1337,12 +1337,12 @@ void IsoPlot::isoline(MatrixHandler& dat
*/
void IsoPlot::operator()(MatrixHandler& data, BasicGraphicsObjectContainer& parent)
{
- prepare(data);
+ this->prepare(data);
if ( legend_only_ ) return;
-
+
{
Timer timer("contouring", "Time spent in contouring");
- isoline(data, parent);
@@ -70,20 +70,20 @@ Index: magics++-2.18.1/src/visualisers/IsoPlot.cc
}
#ifdef ISOPLOT_DEBUG
-@@ -1352,7 +1352,7 @@
+@@ -1411,7 +1411,7 @@ void IsoPlot::isoline(MatrixHandler& dat
void NoIsoPlot::operator()(MatrixHandler& data, BasicGraphicsObjectContainer& parent)
{
- // Create the isolines...
-- if ( !prepare(data) ) {
-+ if ( !this->prepare(data) ) {
+ // Create the isolines...
+- if ( !prepare(data) ) {
++ if ( !this->prepare(data) ) {
if ( legend_only_ ) return;
(*shading_)(data, parent);
- // do not send the isolines...
-Index: magics++-2.18.1/src/visualisers/Filter.cc
+ // do not send the isolines...
+Index: magics++-2.24.4/src/visualisers/Filter.cc
===================================================================
---- magics++-2.18.1.orig/src/visualisers/Filter.cc 2012-10-15 12:23:37.000000000 +0100
-+++ magics++-2.18.1/src/visualisers/Filter.cc 2012-10-31 15:41:45.000000000 +0000
-@@ -202,7 +202,7 @@
+--- magics++-2.24.4.orig/src/visualisers/Filter.cc
++++ magics++-2.24.4/src/visualisers/Filter.cc
+@@ -202,7 +202,7 @@ bool MinMaxFilter::Process()
{
// MagLog::debug() << "Min " << lin+fcr+1 << " " << col+fcc+1 << " " << val << "\n";
lo = lo+1;
@@ -92,7 +92,7 @@ Index: magics++-2.18.1/src/visualisers/Filter.cc
this->back().low(true);
this->back().high(false);
}
-@@ -233,7 +233,7 @@
+@@ -233,7 +233,7 @@ bool MinMaxFilter::Process()
{
// MagLog::debug() << "Max " << lin+fcr+1 << " " << col+fcc+1 << " " << val << "\n";
hi = hi+1;
@@ -101,11 +101,11 @@ Index: magics++-2.18.1/src/visualisers/Filter.cc
this->back().high(true);
this->back().low(false);
}
-Index: magics++-2.18.1/src/visualisers/Bar.cc
+Index: magics++-2.24.4/src/visualisers/Bar.cc
===================================================================
---- magics++-2.18.1.orig/src/visualisers/Bar.cc 2012-10-15 12:23:37.000000000 +0100
-+++ magics++-2.18.1/src/visualisers/Bar.cc 2012-10-31 15:44:17.000000000 +0000
-@@ -98,13 +98,13 @@
+--- magics++-2.24.4.orig/src/visualisers/Bar.cc
++++ magics++-2.24.4/src/visualisers/Bar.cc
+@@ -98,13 +98,13 @@ void Bar::operator()(Data& data, BasicGr
vector<string>::iterator annotation = annotation_.begin();
@@ -124,11 +124,11 @@ Index: magics++-2.18.1/src/visualisers/Bar.cc
map<string, Renderer>::iterator renderer = renderers_.find(lowerCase(bar_style_) );
-Index: magics++-2.18.1/src/decoders/MapGenDecoder.cc
+Index: magics++-2.24.4/src/decoders/MapGenDecoder.cc
===================================================================
---- magics++-2.18.1.orig/src/decoders/MapGenDecoder.cc 2012-10-15 12:23:36.000000000 +0100
-+++ magics++-2.18.1/src/decoders/MapGenDecoder.cc 2012-10-31 15:47:05.000000000 +0000
-@@ -73,11 +73,11 @@
+--- magics++-2.24.4.orig/src/decoders/MapGenDecoder.cc
++++ magics++-2.24.4/src/decoders/MapGenDecoder.cc
+@@ -73,11 +73,11 @@ void MapGenDecoder::decode()
continue;
if ( strncmp(line,"# -b", 4) == 0 )
if ( record_ < 0 ) {
diff --git a/debian/patches/magics-config.patch b/debian/patches/magics-config.patch
index 257863e..df46fc8 100644
--- a/debian/patches/magics-config.patch
+++ b/debian/patches/magics-config.patch
@@ -1,29 +1,30 @@
Description: Make magics-config inherit from pkg-config, for Multi-arch support.
Author: Alastair McKinstry <mckinstry at debian.org>
Bug-Origin: http://bugs.debian.org/674472
-Last-Updated: 2012-06-08
+Last-Updated: 2015-05-14
Forwarded: no
-Index: magics++-2.18.1/magics-config.in
+Index: magics++-2.24.4/magics-config.in
===================================================================
---- magics++-2.18.1.orig/magics-config.in 2012-10-31 15:38:22.000000000 +0000
-+++ magics++-2.18.1/magics-config.in 2012-10-31 15:47:28.000000000 +0000
-@@ -2,17 +2,21 @@
+--- magics++-2.24.4.orig/magics-config.in
++++ magics++-2.24.4/magics-config.in
+@@ -2,18 +2,22 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
+-libdir=@CMAKE_INSTALL_PREFIX@/lib
+libdir=`pkg-config --variable=libdir magics`
- includedir=@includedir@
--F77="@F77@"
--CC="@CC@"
--CXX="@CXX@"
--CXXFLAGS="@CXXFLAGS@"
+ includedir=@CMAKE_INSTALL_PREFIX@/include/magics
+-F77="@CMAKE_Fortran_COMPILER@"
+-CC="@CMAKE_C_COMPILER@"
+-CXX="@CMAKE_CXX_COMPILER@"
+-CXXFLAGS="@CMAKE_CXX_FLAGS@"
-AXX="@AXX@"
--SHLIB_EXT="@SHLIB_EXT@"
--FFLAGS="@FFLAGS@"
+-SHLIB_EXT="@CMAKE_SHARED_LIBRARY_SUFFIX@"
+-FFLAGS="@CMAKE_Fortran_FLAGS@"
-CPPLIBS="@CPPLIBS@"
--py_dir="@PYTHON_SITE_PKG@"
+-py_dir="@PYTHON_SITE_PACKAGES@"
+ suffix=""
+F77=`pkg-config --variable=F77 magics`
+CC=`pkg-config --variable=CC magics`
+CXX=`pkg-config --variable=CXX magics`
@@ -37,10 +38,19 @@ Index: magics++-2.18.1/magics-config.in
+MAGICS_3RDPARTY_LIBS=`pkg-config --variable=MAGICS_3RDPARTY_LIBS magics`
+MAGICS_3RDPARTY_INCLUDE=`pkg-config --variable=MAGICS_3RDPARTY_INCLUDE magics`
+py_dir=`pkg-config --variable=py_dir magics`
- suffix=""
-
- #
-@@ -230,7 +234,7 @@
+
+ #
+ # add --print-config
+@@ -210,7 +214,7 @@ while test $# -gt 0; do
+ echo ""#"NO DOUBLE FLAG in g77"
+ ;;
+ # Portland pgf90
+- pgf90 | pgf77 )
++ gf90 | pgf77 )
+ FXX="-tp amd64 ${FXX}"
+ ;;
+ esac
+@@ -239,7 +243,7 @@ if test "$echo_cxxflags" = "yes"; then
if test "$includedir" != "/usr/include" ; then
my_cxxflags="-I${includedir}"
fi
@@ -49,34 +59,34 @@ Index: magics++-2.18.1/magics-config.in
fi
if test "$echo_libs" = "yes"; then
-@@ -240,7 +244,7 @@
- my_libs="${libdir}/libMagPlus.a"
+@@ -250,7 +254,7 @@ if test -f ${libdir}/libMagPlus at CMAKE_SH
fi
-- my_libs="${my_libs} @LDFLAGS@ @MAGICS_3RDPARTY_LIBS@ @FLIBS@"
-+ my_libs="${my_libs} ${LDFLAGS} ${MAGICS_3RDPARTY_LIBS} ${FLIBS}"
+
+- my_libs="${my_libs} @MAGICS_EXTRA_LIBS@"
++ my_libs="${my_libs} ${MAGICS_EXTRA_LIBS}"
if test "$echo_clibs" = "yes"; then
my_libs="${my_libs} $CPPLIBS"
-@@ -258,7 +262,7 @@
+@@ -270,7 +274,7 @@ fi
if test "$echo_static" = "yes"; then
if test -f ${libdir}/libMagPlus.a ; then
-- static="${precision} ${libdir}/libMagPlus.a -L${libdir} @LDFLAGS@ @MAGICS_3RDPARTY_LIBS@ $CPPLIBS"
-+ static="${precision} ${libdir}/libMagPlus.a -L${libdir} ${LDFLAGS} ${MAGICS_3RDPARTY_LIBS} $CPPLIBS"
+- static="${precision_static} ${libdir}/libMagPlus.a -L${libdir} @LDFLAGS@ @MAGICS_EXTRA_LIBS@ @MAGICS_RPATH@ $CPPLIBS"
++ static="${precision_static} ${libdir}/libMagPlus.a -L${libdir} ${LDFLAGS} ${MAGICS_EXTRA_LIBS} $CPPLIBS"
+ precision=${precision_static}
echo ${static}
else
- echo "magics-config: NO STATIC LIBRARY available"
-@@ -267,7 +271,7 @@
+@@ -282,7 +286,7 @@ fi
if test "$echo_shared" = "yes"; then
- if test -f ${libdir}/libMagPlus.${SHLIB_EXT} ; then
-- shared="${precision} -L${libdir} -lMagPlus @LDFLAGS@ @MAGICS_3RDPARTY_LIBS@ $CPPLIBS"
-+ shared="${precision} -L${libdir} -lMagPlus ${LDFLAGS} ${MAGICS_3RDPARTY_LIBS} $CPPLIBS"
+ if test -f ${libdir}/libMagPlus at CMAKE_SHARED_LIBRARY_SUFFIX@ ; then
+- shared=" ${precision_shared} -L${libdir} -lMagPlus @LDFLAGS@ @MAGICS_RPATH@ $CPPLIBS"
++ shared=" ${precision_shared} -L${libdir} -lMagPlus ${LDFLAGS} $CPPLIBS"
echo ${shared}
+ precision=${precision_shared}
else
- echo "magics-config: NO SHARED LIBRARY"
-@@ -275,7 +279,7 @@
+@@ -291,7 +295,7 @@ if test "$echo_shared" = "yes"; then
fi
if test "$echo_flibs" = "yes"; then
@@ -85,47 +95,23 @@ Index: magics++-2.18.1/magics-config.in
fi
if test "$compile" = "yes"; then
-@@ -289,8 +293,8 @@
+@@ -304,8 +308,8 @@ if test "$compile" = "yes"; then
if test ${name} != ${f77_file} ; then
out="-o $name " ### avoid overriding source file
fi
-- echo "$F77 ${out}$f77_file ${FFLAGS} ${precision} -L${libdir} -lMagPlus @LDFLAGS@ @MAGICS_3RDPARTY_LIBS@ $CPPLIBS"
-- $F77 ${out}$f77_file ${FFLAGS} ${precision} -L${libdir} -Wl,-rpath,${libdir} -lMagPlus @LDFLAGS@ @MAGICS_3RDPARTY_LIBS@ $CPPLIBS
-+ echo "$F77 ${out}$f77_file ${FFLAGS} ${precision} -L${libdir} -lMagPlus ${LDFLAGS} ${MAGICS_3RDPARTY_LIBS} $CPPLIBS"
-+ $F77 ${out}$f77_file ${FFLAGS} ${precision} -L${libdir} -Wl,-rpath,${libdir} -lMagPlus ${LDFLAGS} ${MAGICS_3RDPARTY_LIBS} $CPPLIBS
+- echo "$F77 ${out}$f77_file ${FFLAGS} ${precision} -L${libdir} -lMagPlus @LDFLAGS@ @MAGICS_EXTRA_LIBS@ $CPPLIBS"
+- $F77 ${out}$f77_file ${FFLAGS} ${precision} -L${libdir} -Wl,-rpath,${libdir} -lMagPlus @LDFLAGS@ @MAGICS_EXTRA_LIBS@ $CPPLIBS
++ echo "$F77 ${out}$f77_file ${FFLAGS} ${precision} -L${libdir} -lMagPlus ${LDFLAGS} ${MAGICS_EXTRA_LIBS} $CPPLIBS"
++ $F77 ${out}$f77_file ${FFLAGS} ${precision} -L${libdir} -lMagPlus ${LDFLAGS} ${MAGICS_EXTRA_LIBS} $CPPLIBS
fi
if test "$compileC" = "yes"; then
-@@ -304,6 +308,6 @@
+@@ -319,6 +323,6 @@ if test "$compileC" = "yes"; then
if test ${name} != ${c_file} ; then
out="-o $name " ### avoid overriding source file
fi
-- echo "$CC ${out}$c_file ${CFLAGS} -L${libdir} -lMagPlus @LDFLAGS@ @MAGICS_3RDPARTY_LIBS@ $CPPLIBS @FLIBS@"
-- $CC ${out}$c_file ${CFLAGS} -I${includedir} -L${libdir} -Wl,-rpath,${libdir} -lMagPlus @LDFLAGS@ @MAGICS_3RDPARTY_LIBS@ $CPPLIBS @FLIBS@
-+ echo "$CC ${out}$c_file ${CFLAGS} -L${libdir} -lMagPlus ${LDFLAGS} ${MAGICS_3RDPARTY_LIBS} $CPPLIBS ${FLIBS}"
-+ $CC ${out}$c_file ${CFLAGS} -I${includedir} -L${libdir} -Wl,-rpath,${libdir} -lMagPlus ${LDFLAGS} ${MAGICS_3RDPARTY_LIBS} $CPPLIBS ${FLIBS}
+- echo "$CC ${out}$c_file ${CFLAGS} -L${libdir} -lMagPlus @LDFLAGS@ @MAGICS_EXTRA_LIBS@ $CPPLIBS @FLIBS@"
+- $CC ${out}$c_file ${CFLAGS} -I${includedir} -L${libdir} -Wl,-rpath,${libdir} -lMagPlus @LDFLAGS@ @MAGICS_EXTRA_LIBS@ $CPPLIBS @FLIBS@
++ echo "$CC ${out}$c_file ${CFLAGS} -L${libdir} -lMagPlus ${LDFLAGS} ${MAGICS_EXTRA_LIBS} $CPPLIBS ${FLIBS}"
++ $CC ${out}$c_file ${CFLAGS} -I${includedir} -L${libdir} -lMagPlus ${LDFLAGS} ${MAGICS_EXTRA_LIBS} $CPPLIBS ${FLIBS}
fi
-Index: magics++-2.18.1/src/magics.pc.in
-===================================================================
---- magics++-2.18.1.orig/src/magics.pc.in 2012-10-15 12:23:36.000000000 +0100
-+++ magics++-2.18.1/src/magics.pc.in 2012-10-31 15:47:28.000000000 +0000
-@@ -2,6 +2,19 @@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
-+F77="@F77@"
-+CC="@CC@"
-+CXX="@CXX@"
-+CXXFLAGS="@CXXFLAGS@"
-+AXX="@AXX@"
-+SHLIB_EXT="@SHLIB_EXT@"
-+FFLAGS="@FFLAGS@"
-+CPPLIBS="@CPPLIBS@"
-+LDFLAGS="@LDFLAGS@"
-+FLIBS="@FLIBS@"
-+MAGICS_3RDPARTY_LIBS="@MAGICS_3RDPARTY_LIBS@"
-+MAGICS_3RDPARTY_INCLUDE="@MAGICS_3RDPARTY_INCLUDE@"
-+py_dir="@PYTHON_SITE_PKG@"
-
- Name: Magics
- Description: Multi-platform meteorological graphics library
diff --git a/debian/patches/metview_fixes.patch b/debian/patches/metview_fixes.patch
index 41a35ca..fe53b59 100644
--- a/debian/patches/metview_fixes.patch
+++ b/debian/patches/metview_fixes.patch
@@ -1,6 +1,6 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Link MagPlusQt.so against libdrivers, libMagPlus to resolve symbols
-Last-Updated: 2013-12-14
+Last-Updated: 2015-05-14
Forwarded: not-needed
Index: magics++-2.18.15/src/drivers/Makefile.am
diff --git a/debian/patches/series b/debian/patches/series
index e77c9a6..b48eae8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,6 @@
# metview_fixes.patch
-dynamic_link.patch
cve-2010-3393.patch
terralib.patch
-enable_static.patch
gcc-4.7.patch
magics-config.patch
fix-headers.patch
diff --git a/debian/patches/terralib.patch b/debian/patches/terralib.patch
index 1b1551f..5b53e2f 100644
--- a/debian/patches/terralib.patch
+++ b/debian/patches/terralib.patch
@@ -1,141 +1,19 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Add Debians libterralib, rather than built-in version
-Last-Updated: 2011-07-08
+Last-Updated: 2015-05-14
Forwarded: not-needed
-Index: magics++-2.18.1/configure.ac
+Index: magics++-2.24.4/CMakeLists.txt
===================================================================
---- magics++-2.18.1.orig/configure.ac 2012-10-31 15:38:08.000000000 +0000
-+++ magics++-2.18.1/configure.ac 2012-10-31 15:38:30.000000000 +0000
-@@ -990,7 +990,7 @@
-
-
- MAGICS_3RDPARTY_INCLUDE="$CPPFLAGS"
--MAGICS_3RDPARTY_LIBS="$LIBS $GRIBAPI_LIBS $MAGICS_3RDPARTY_LIBS $NETCDF_LIBS"
-+MAGICS_3RDPARTY_LIBS="$LIBS $GRIBAPI_LIBS $MAGICS_3RDPARTY_LIBS $NETCDF_LIBS -lterralib"
- LIBS="$LIBS $NETCDF_LIBS"
-
- AC_SUBST(MAGICS_3RDPARTY_INCLUDE)
-@@ -1031,7 +1031,6 @@
- src/drivers/Makefile
- src/oda/Makefile
- src/visualisers/Makefile
-- src/terralib/Makefile
- src/MvObs/Makefile
- src/libTable/Makefile
- src/libMagWrapper/Makefile
-Index: magics++-2.18.1/src/visualisers/ImagePlotting.cc
-===================================================================
---- magics++-2.18.1.orig/src/visualisers/ImagePlotting.cc 2012-10-15 12:23:37.000000000 +0100
-+++ magics++-2.18.1/src/visualisers/ImagePlotting.cc 2012-10-31 15:38:30.000000000 +0000
-@@ -124,7 +124,8 @@
- parin.nlines_ = rdin.getRows();
- parin.resx_ = abs(rdin.getXResolution());
- parin.resy_ = abs(rdin.getYResolution());
-- parin.decName("MEM");
-+ //parin.decName("MEM");
-+ parin.decoderIdentifier_ = "MEM";
-
- parin.projection(&rdin.getProjection());
- UserPoint ll = rdin.getLowerLeftCorner();
-@@ -136,7 +137,8 @@
-
- // Copy input image to the raster structure
- TeRaster rastin(parin);
-- rastin.params().decName("MEM");
-+ // rastin.params().decName("MEM");
-+ rastin.params().decoderIdentifier_ = "MEM";
- bool ok = rastin.init(parin);
- for (i = 0; i < parin.nlines_; i++)
- for (j = 0; j < parin.ncols_; j++)
-@@ -164,7 +166,8 @@
- double res = (maxX-minX)/double(nnx-1);
-
- parout.boundingBoxResolution(minX,minY,maxX,maxY,res,res, TeBox::TeLOWERLEFT);
-- parout.decName("MEM");
-+ // parout.decName("MEM");
-+ parout.decoderIdentifier_ = "MEM";
- parout.nBands(1);
- parout.setDummy(0);
- parout.setDataType(TeUNSIGNEDSHORT); // see note 2 above
-@@ -172,7 +175,8 @@
-
- // Initialise raster structure
- TeRaster rastout(parout);
-- rastout.params().decName("MEM");
-+ // rastout.params().decName("MEM");
-+ rastout.params().decoderIdentifier_ = "MEM";
- ok = rastout.init(parout);
-
- // Reproject input data
-@@ -230,10 +234,12 @@
- UserPoint ur = rdin.getUpperRightCorner();
- parin.boundingBoxResolution(ll.x(),ll.y(),ur.x(),ur.y(), parin.resx_, parin.resy_);
- parin.nBands(1);
-- parin.setDataType(TeUNSIGNEDSHORT);
-+ // parin.setDataType(TeUNSIGNEDSHORT);
- //parin.compressionType_ = TeNoCompression;
-+ parin.dataType_[0] = TeUNSIGNEDSHORT;
- parin.setCompressionMode(TeRasterParams::TeNoCompression);
-- parin.decName("MEM");
-+ // parin.decName("MEM");
-+ parin.decoderIdentifier_ = "MEM";
-
- // Copy input image to the raster structure
- TeRaster rastin(parin);
-@@ -247,7 +253,8 @@
- TeRasterParams parout;
- TeProjection& projout = const_cast<Transformation * >(&transformation)->getProjection();
- parout.projection(&projout);
-- parout.decName("MEM");
-+ // parout.decName("MEM");
-+ parout.decoderIdentifier_ = "MEM";
-
- double minX = transformation.getMinPCX();
- double maxX = transformation.getMaxPCX();
-Index: magics++-2.18.1/src/Makefile.am
-===================================================================
---- magics++-2.18.1.orig/src/Makefile.am 2012-10-15 12:23:34.000000000 +0100
-+++ magics++-2.18.1/src/Makefile.am 2012-10-31 15:38:30.000000000 +0000
-@@ -8,8 +8,8 @@
- endif
-
- #if MAGICS_TERRALIB
--MAG_TERRALIB_DIR = terralib
--terralib_lib = terralib/libterralib.la
-+MAG_TERRALIB_DIR =
-+terralib_lib =
- #endif
-
- if MAGICS_JSON
-@@ -163,16 +163,8 @@
- EXTRA_DIST = boost
-
- if MAGICS_RASTER
--sharettfdir = $(datadir)/magics/ttf
--sharettf_DATA = $(top_srcdir)/share/magics/ttf/DejaVuSans-BoldOblique.ttf \
-- $(top_srcdir)/share/magics/ttf/DejaVuSans.ttf \
-- $(top_srcdir)/share/magics/ttf/DejaVuSerif-Oblique.ttf \
-- $(top_srcdir)/share/magics/ttf/DejaVuSans-Bold.ttf \
-- $(top_srcdir)/share/magics/ttf/DejaVuSerif-BoldOblique.ttf \
-- $(top_srcdir)/share/magics/ttf/DejaVuSerif.ttf \
-- $(top_srcdir)/share/magics/ttf/DejaVuSans-Oblique.ttf \
-- $(top_srcdir)/share/magics/ttf/DejaVuSerif-Bold.ttf \
-- $(top_srcdir)/share/magics/ttf/LICENSE-dejavu-ttf-2.15
-+sharettfdir =
-+sharettf_DATA =
- endif
-
- shareefidir = $(datadir)/magics/efi
-Index: magics++-2.18.1/configure
-===================================================================
---- magics++-2.18.1.orig/configure 2012-10-15 12:24:22.000000000 +0100
-+++ magics++-2.18.1/configure 2012-10-31 15:38:30.000000000 +0000
-@@ -22843,7 +22843,6 @@
- "src/drivers/Makefile") CONFIG_FILES="$CONFIG_FILES src/drivers/Makefile" ;;
- "src/oda/Makefile") CONFIG_FILES="$CONFIG_FILES src/oda/Makefile" ;;
- "src/visualisers/Makefile") CONFIG_FILES="$CONFIG_FILES src/visualisers/Makefile" ;;
-- "src/terralib/Makefile") CONFIG_FILES="$CONFIG_FILES src/terralib/Makefile" ;;
- "src/MvObs/Makefile") CONFIG_FILES="$CONFIG_FILES src/MvObs/Makefile" ;;
- "src/libTable/Makefile") CONFIG_FILES="$CONFIG_FILES src/libTable/Makefile" ;;
- "src/libMagWrapper/Makefile") CONFIG_FILES="$CONFIG_FILES src/libMagWrapper/Makefile" ;;
+--- magics++-2.24.4.orig/CMakeLists.txt
++++ magics++-2.24.4/CMakeLists.txt
+@@ -262,9 +262,6 @@ set( MAGICS_INCLUDE_DIRS
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/drivers/MgQ
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/eckit_readers
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/decoders
+- ${CMAKE_CURRENT_SOURCE_DIR}/src/terralib
+- ${CMAKE_CURRENT_SOURCE_DIR}/src/terralib/kernel
+- ${CMAKE_CURRENT_SOURCE_DIR}/src/terralib/utils
+ ${Boost_INCLUDE_DIRS} )
+
+ if( MAGICS_ODB )
diff --git a/debian/rules b/debian/rules
index 87f797a..b09463e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,9 +16,6 @@ CFLAGS += -fPIC
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-# Don't use emoslib on mips
-WITH_EMOSLIB:= --with-emos-libraries=/usr/lib --enable-bufr
-
override_dh_auto_clean:
find . -type l -exec rm {} \;
find . \( -name '*.pyc' -o -name '*.o' -o -name '*.a' \) -exec rm {} \;
@@ -29,12 +26,6 @@ override_dh_auto_clean:
rm -rf share/magics/ttf src/terralib
$(MAKE) -k distclean || echo "Already distcleaned"
-#override_dh_autoreconf:
-# # remove out of date files
-# rm -f conf/config.guess conf/config.sub
-# libtoolize -c -f
-# dh_autoreconf --as-needed
-
override_dh_auto_configure:
# link for font for tesing.
mkdir -p share/fonts/truetype/ttf-dejavu/
@@ -45,9 +36,12 @@ override_dh_auto_configure:
# to find libraries _it_ created. And it makes stuff in the install step. bah.
# autoreconf -if
dh_auto_configure -- \
- --enable-metview \
- --enable-static --enable-cairo $(WITH_EMOSLIB) \
- --enable-python --enable-opengl \
+ -DENABLE_METVIEW=ON \
+ -DENABLE_STATIC_LIBRARY=ON \
+ -DENABLE_CAIRO=ON -DENABLE_GEOTIFF=ON \
+ -DENABLE_BUFR=ON \
+ -DMAGICS_SITE='debian' \
+ -DENABLE_PYTHON=ON \
LDFLAGS="$(LDFLAGS) -L$(shell pwd)/src/.libs -Wl,--as-needed" LIBS=" -lX11 -lpng12 -lz" \
MAGPLUS_HOME=$(shell pwd)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git
More information about the debian-science-commits
mailing list