[cdo] 03/11: Add pkgconfig patch to remove @JASPER_LIBS@ refs
Alastair McKinstry
mckinstry at moszumanska.debian.org
Thu Apr 20 10:40:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cdo.
commit d6778e73915fa1767d57c9f9057afce430ac937b
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Mar 22 09:50:51 2017 +0000
Add pkgconfig patch to remove @JASPER_LIBS@ refs
---
debian/patches/eccodes.patch | 20 ++++++++++----------
debian/patches/fix_typos.patch | 24 ++++++++++++------------
debian/patches/hppa_gomp_bug.patch | 11 +++++------
debian/patches/libc-2.23-fixes.patch | 12 ++++++------
debian/patches/pkgconfig.patch | 26 ++++++++++++++++++++++++++
debian/patches/series | 1 +
6 files changed, 60 insertions(+), 34 deletions(-)
diff --git a/debian/patches/eccodes.patch b/debian/patches/eccodes.patch
index cd08cdc..182d34f 100644
--- a/debian/patches/eccodes.patch
+++ b/debian/patches/eccodes.patch
@@ -3,11 +3,11 @@ Description: Build against eccodes lib, not libgrib_api
Last-Updated: 2016-11-30
Forwarded: no
-Index: cdo-1.7.2+dfsg.1/libcdi/m4/acx_options.m4
+Index: cdo-1.8.0+dfsg.1/libcdi/m4/acx_options.m4
===================================================================
---- cdo-1.7.2+dfsg.1.orig/libcdi/m4/acx_options.m4
-+++ cdo-1.7.2+dfsg.1/libcdi/m4/acx_options.m4
-@@ -240,7 +240,7 @@ AC_ARG_WITH([grib_api],
+--- cdo-1.8.0+dfsg.1.orig/libcdi/m4/acx_options.m4
++++ cdo-1.8.0+dfsg.1/libcdi/m4/acx_options.m4
+@@ -166,7 +166,7 @@ AC_ARG_WITH([grib_api],
AC_MSG_RESULT([suppressed])],
[yes],[AC_CHECK_HEADERS([grib_api.h])
AC_SEARCH_LIBS([grib_get_message],
@@ -16,7 +16,7 @@ Index: cdo-1.7.2+dfsg.1/libcdi/m4/acx_options.m4
[AC_DEFINE([HAVE_LIBGRIB_API],[1],[GRIB_API library is present if defined to 1])],
[AC_MSG_ERROR([Could not link to grib_api library])])],
[*],[GRIB_API_ROOT=$with_grib_api
-@@ -249,10 +249,10 @@ AC_ARG_WITH([grib_api],
+@@ -175,10 +175,10 @@ AC_ARG_WITH([grib_api],
CPPFLAGS="-I$GRIB_API_ROOT/include $CPPFLAGS"
AC_CHECK_HEADERS([grib_api.h])
AC_SEARCH_LIBS([grib_get_message],
@@ -29,11 +29,11 @@ Index: cdo-1.7.2+dfsg.1/libcdi/m4/acx_options.m4
GRIB_API_INCLUDE=" -I$GRIB_API_ROOT/include"],
[AC_MSG_ERROR([$GRIB_API_ROOT is not a directory! GRIB_API suppressed])])])],
[AC_MSG_CHECKING([for the GRIB_API library])
-Index: cdo-1.7.2+dfsg.1/m4/acx_options.m4
+Index: cdo-1.8.0+dfsg.1/m4/acx_options.m4
===================================================================
---- cdo-1.7.2+dfsg.1.orig/m4/acx_options.m4
-+++ cdo-1.7.2+dfsg.1/m4/acx_options.m4
-@@ -266,7 +266,7 @@ AC_ARG_WITH([grib_api],
+--- cdo-1.8.0+dfsg.1.orig/m4/acx_options.m4
++++ cdo-1.8.0+dfsg.1/m4/acx_options.m4
+@@ -269,7 +269,7 @@ AC_ARG_WITH([grib_api],
AC_MSG_RESULT([suppressed])],
[yes],[AC_CHECK_HEADERS([grib_api.h])
AC_SEARCH_LIBS([grib_get_message],
@@ -42,7 +42,7 @@ Index: cdo-1.7.2+dfsg.1/m4/acx_options.m4
[AC_DEFINE([HAVE_LIBGRIB_API],[1],[GRIB_API library is present if defined to 1])
ENABLE_GRIBAPI=yes],
[AC_MSG_ERROR([Could not link to grib_api library])])],
-@@ -276,11 +276,11 @@ AC_ARG_WITH([grib_api],
+@@ -279,11 +279,11 @@ AC_ARG_WITH([grib_api],
CPPFLAGS="-I$GRIB_API_ROOT/include $CPPFLAGS"
AC_CHECK_HEADERS([grib_api.h])
AC_SEARCH_LIBS([grib_get_message],
diff --git a/debian/patches/fix_typos.patch b/debian/patches/fix_typos.patch
index 49ce3d0..47796d5 100644
--- a/debian/patches/fix_typos.patch
+++ b/debian/patches/fix_typos.patch
@@ -3,11 +3,11 @@ Description: Fix typos.
Last-Updated: 2015-07-20
Forwarded: no
-Index: cdo-1.6.9+dfsg.1/libcdi/src/grid.c
+Index: cdo-1.8.0+dfsg.1/libcdi/src/grid.c
===================================================================
---- cdo-1.6.9+dfsg.1.orig/libcdi/src/grid.c
-+++ cdo-1.6.9+dfsg.1/libcdi/src/grid.c
-@@ -3456,8 +3456,8 @@ const double *gridInqYvalsPtr(int gridID
+--- cdo-1.8.0+dfsg.1.orig/libcdi/src/grid.c
++++ cdo-1.8.0+dfsg.1/libcdi/src/grid.c
+@@ -3597,8 +3597,8 @@ const double *gridInqYvalsPtr(int gridID
@Item lonParY The East longitude of the meridian which is parallel to the Y-axis.
@Item lat1 First latitude from the pole at which the secant cone cuts the sphere.
@Item lat2 Second latitude at which the secant cone cuts the sphere.
@@ -18,7 +18,7 @@ Index: cdo-1.6.9+dfsg.1/libcdi/src/grid.c
@Item projflag Projection centre flag.
@Item scanflag Scanning mode flag.
-@@ -3503,8 +3503,8 @@ void gridDefLCC(int gridID, double origi
+@@ -3644,8 +3644,8 @@ void gridDefParamLCC(int gridID, double
@Item lonParY The East longitude of the meridian which is parallel to the Y-axis.
@Item lat1 First latitude from the pole at which the secant cone cuts the sphere.
@Item lat2 Second latitude at which the secant cone cuts the sphere.
@@ -29,20 +29,20 @@ Index: cdo-1.6.9+dfsg.1/libcdi/src/grid.c
@Item projflag Projection centre flag.
@Item scanflag Scanning mode flag.
-Index: cdo-1.6.9+dfsg.1/src/operator_help.h
+Index: cdo-1.8.0+dfsg.1/src/operator_help.h
===================================================================
---- cdo-1.6.9+dfsg.1.orig/src/operator_help.h
-+++ cdo-1.6.9+dfsg.1/src/operator_help.h
-@@ -1611,7 +1611,7 @@ static char *ConsecstatHelp[] = {
+--- cdo-1.8.0+dfsg.1.orig/src/operator_help.h
++++ cdo-1.8.0+dfsg.1/src/operator_help.h
+@@ -1764,7 +1764,7 @@ static const char *ConsecstatHelp[] = {
"",
"DESCRIPTION",
- " This module computes periods over all timesteps in ifile where a",
+ " This module computes periods over all timesteps in infile where a",
- " certain property is valid. The propery can be chosen by creating a mask from",
+ " certain property is valid. The property can be chosen by creating a mask from",
" the original data, which is the expected input format for operators of this",
" module. Depending on the operator full information about each period or",
" just its length and ending date are computed.",
-@@ -1623,7 +1623,7 @@ static char *ConsecstatHelp[] = {
+@@ -1776,7 +1776,7 @@ static const char *ConsecstatHelp[] = {
" multiple periods can be found. Timesteps from the input are preserved. Missing",
" values are handled like 0, i.e. finish periods of consecutive timesteps.",
" consects Consecutive Timesteps",
@@ -51,7 +51,7 @@ Index: cdo-1.6.9+dfsg.1/src/operator_help.h
" period together with its last timestep. To be able to perform statistical",
" analysis like min, max or mean, everything else is set to missing value.",
NULL
-@@ -4447,7 +4447,7 @@ static char *HistogramHelp[] = {
+@@ -4855,7 +4855,7 @@ static const char *HistogramHelp[] = {
" is the lower bound and the second value the upper bound of the",
" first bin. The bounds of the second bin are defined by the",
" second and third value, aso.",
diff --git a/debian/patches/hppa_gomp_bug.patch b/debian/patches/hppa_gomp_bug.patch
index 30b8b05..de23815 100644
--- a/debian/patches/hppa_gomp_bug.patch
+++ b/debian/patches/hppa_gomp_bug.patch
@@ -9,11 +9,11 @@ Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790393
Last-Updated: 2016-03-21
Forwarded: no
-Index: cdo-1.7.2+dfsg.1/src/remaplib.c
+Index: cdo-1.8.0+dfsg.1/src/remaplib.c
===================================================================
---- cdo-1.7.2+dfsg.1.orig/src/remaplib.c
-+++ cdo-1.7.2+dfsg.1/src/remaplib.c
-@@ -1570,13 +1570,14 @@ void remap_stat(int remap_order, remapgr
+--- cdo-1.8.0+dfsg.1.orig/src/remaplib.c
++++ cdo-1.8.0+dfsg.1/src/remaplib.c
+@@ -1535,12 +1535,13 @@ void remap_stat(int remap_order, remapgr
/*****************************************************************************/
@@ -21,11 +21,10 @@ Index: cdo-1.7.2+dfsg.1/src/remaplib.c
+void remap_gradients(remapgrid_t grid_arg, const double *restrict array, double *restrict grad_lat,
double *restrict grad_lon, double *restrict grad_latlon)
{
- long nx, ny, grid_size;
long i, j, ip1, im1, jp1, jm1, in, is, ie, iw, ine, inw, ise, isw;
double delew, delns;
double grad_lat_zero, grad_lon_zero;
-+ remapgrid_t grid = grid_arg;
++ remapgrid_t grid = grid_arg; // Needed for HPPA gomp bug
if ( grid.rank != 2 )
cdoAbort("Internal problem (remap_gradients), grid rank = %d!", grid.rank);
diff --git a/debian/patches/libc-2.23-fixes.patch b/debian/patches/libc-2.23-fixes.patch
index 3664de5..b7d8977 100644
--- a/debian/patches/libc-2.23-fixes.patch
+++ b/debian/patches/libc-2.23-fixes.patch
@@ -4,16 +4,16 @@ Forwarded: no
Last-Updated: 2016-03-21
Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=818826
-Index: cdo-1.7.2+dfsg.1/src/EOFs.c
+Index: cdo-1.8.0+dfsg.1/src/EOFs.c
===================================================================
---- cdo-1.7.2+dfsg.1.orig/src/EOFs.c
-+++ cdo-1.7.2+dfsg.1/src/EOFs.c
-@@ -181,7 +181,7 @@ void *EOFs(void * argument)
+--- cdo-1.8.0+dfsg.1.orig/src/EOFs.c
++++ cdo-1.8.0+dfsg.1/src/EOFs.c
+@@ -178,7 +178,7 @@ void *EOFs(void * argument)
+ int calendar = CALENDAR_STANDARD;
juldate_t juldate;
- double sum;
- double missval = 0;
+ double missval = 0.0;
- double xvals, yvals;
typedef struct {
+ bool init;
diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
new file mode 100644
index 0000000..b424ee3
--- /dev/null
+++ b/debian/patches/pkgconfig.patch
@@ -0,0 +1,26 @@
+Description: Remove dodgy inclusion of @JASPER_LIBS@, not present on Debian
+Author: Alastair McKinstry <mckinstry at debian.org>
+Last-Updated: 2017-03-22
+Forwarded: not-needed
+
+Index: cdo-1.8.0+dfsg.1/libcdi/src/pkgconfig/cdi.pc.in
+===================================================================
+--- cdo-1.8.0+dfsg.1.orig/libcdi/src/pkgconfig/cdi.pc.in
++++ cdo-1.8.0+dfsg.1/libcdi/src/pkgconfig/cdi.pc.in
+@@ -4,7 +4,7 @@ libdir=@libdir@
+ includedir=@includedir@
+ cflags=-I at includedir@
+ fcflags=@FPP_INCOPT@@includedir@ @CDI_F90_INTERFACE_FCFLAGS@
+-libs=-L at libdir@ -lcdi @GRIB_API_LIBS@ @JASPER_LIBS@ @NETCDF_LIBS@ @SZLIB_LIBS@ @THREADS_LIBS@
++libs=-L at libdir@ -lcdi @GRIB_API_LIBS@ @NETCDF_LIBS@ @SZLIB_LIBS@ @THREADS_LIBS@
+ threads_libs=@THREADS_LIBS@
+ threads_cflags=@THREADS_INCLUDE@
+ szlib_cflags=@SZLIB_INCLUDE@
+@@ -12,7 +12,6 @@ szlib_libs=@SZLIB_LIBS@
+ netcdf_root=@NETCDF_ROOT@
+ netcdf_cflags=@NETCDF_INCLUDE@
+ netcdf_libs=@NETCDF_LIBS@
+-jasper_libs=@JASPER_LIBS@
+ grib_api_cflags=@GRIB_API_INCLUDE@
+ grib_api_libs=@GRIB_API_LIBS@
+ cdi_build_cc=@CC@
diff --git a/debian/patches/series b/debian/patches/series
index af0aa43..529aad9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ ppc64el.patch
libc-2.23-fixes.patch
hppa_gomp_bug.patch
eccodes.patch
+pkgconfig.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git
More information about the debian-science-commits
mailing list