[DRE-commits] [ruby-grib] 01/07: Add patch: Use eccodes instead of grib_api

[Youhei SASAKI]

This is an automated email from the git hooks/post-receive script.

uwabami-guest pushed a commit to branch master
in repository ruby-grib.

commit 965591eac476f8c371b60885effa77172d1e7f9d
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Mon Sep 25 00:03:56 2017 +0900

    Add patch: Use eccodes instead of grib_api
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/patches/0002-Fix-NArray-PATH.patch          |  6 ++--
 .../0003-Use-eccodes-instead-of-grib_api.patch     | 32 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/debian/patches/0002-Fix-NArray-PATH.patch b/debian/patches/0002-Fix-NArray-PATH.patch
index 30c33f5..a946632 100644
--- a/debian/patches/0002-Fix-NArray-PATH.patch
+++ b/debian/patches/0002-Fix-NArray-PATH.patch
@@ -5,9 +5,11 @@ Subject: Fix NArray PATH: search NArray from vendorarchdir
 
 Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
 ---
- ext/extconf.rb | 22 ++--------------------
- 1 file changed, 2 insertions(+), 20 deletions(-)
+ ext/extconf.rb | 92 +++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 46 insertions(+), 46 deletions(-)
 
+diff --git a/ext/extconf.rb b/ext/extconf.rb
+index 7609e5e..761f2bd 100644
 --- a/ext/extconf.rb
 +++ b/ext/extconf.rb
 @@ -1,51 +1,51 @@
diff --git a/debian/patches/0003-Use-eccodes-instead-of-grib_api.patch b/debian/patches/0003-Use-eccodes-instead-of-grib_api.patch
new file mode 100644
index 0000000..f545451
--- /dev/null
+++ b/debian/patches/0003-Use-eccodes-instead-of-grib_api.patch
@@ -0,0 +1,32 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Sun, 24 Sep 2017 23:59:38 +0900
+Subject: Use eccodes instead of grib_api
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ ext/extconf.rb | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/ext/extconf.rb
++++ b/ext/extconf.rb
+@@ -54,7 +54,7 @@
+   exit(-1)
+ end
+ 
+-dir_config("grib_api")
+-if have_header("grib_api.h") && have_library("grib_api")
++dir_config("eccodes")
++if have_header("grib_api.h") && have_library("eccodes")
+   create_makefile("numru/grib")
+ end
+--- a/lib/numru/grib/setenv.rb
++++ b/lib/numru/grib/setenv.rb
+@@ -5,7 +5,7 @@
+     ENV[env_name] = "#{gdp}:#{def_path}"
+   else
+     begin
+-      path = `grib_info -d`.strip
++      path = `codes_info -d`.strip
+     rescue
+       $stderr.print <<-EOM
+ The 'grib_info' command cannot be found.
diff --git a/debian/patches/series b/debian/patches/series
index 3f30c73..72a98ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Fix-RSpec-LOAD_PATH.patch
 0002-Fix-NArray-PATH.patch
+0003-Use-eccodes-instead-of-grib_api.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-grib.git