[DRE-commits] [ruby-grib] 03/04: Refresh patch

[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 84341419667be284a0e61aabe218080bb93c08ea
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Mon Nov 7 17:14:09 2016 +0900

    Refresh patch
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/patches/0002-Fix-NArray-PATH.patch | 107 ++++++++++++++++++++++++------
 1 file changed, 88 insertions(+), 19 deletions(-)

diff --git a/debian/patches/0002-Fix-NArray-PATH.patch b/debian/patches/0002-Fix-NArray-PATH.patch
index 9cee93d..30c33f5 100644
--- a/debian/patches/0002-Fix-NArray-PATH.patch
+++ b/debian/patches/0002-Fix-NArray-PATH.patch
@@ -8,34 +8,103 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  ext/extconf.rb | 22 ++--------------------
  1 file changed, 2 insertions(+), 20 deletions(-)
 
-diff --git a/ext/extconf.rb b/ext/extconf.rb
-index e8d9ee2..5845ed5 100644
 --- a/ext/extconf.rb
 +++ b/ext/extconf.rb
-@@ -1,24 +1,6 @@
+@@ -1,51 +1,51 @@
  require "mkmf"
--
+ 
+-na_path = RbConfig::CONFIG["sitearchdir"]
 -begin
 -  require "rubygems"
+-  gem = true
+-rescue LoadError
+-  gem = false
+-end
+-if gem
+-  if ( na_type = ENV["NARRAY_TYPE"] )
+-    nas = [na_type]
+-  else
+-    nas = %w(narray numru-narray)
+-  end
 -  if Gem::Specification.respond_to?(:find_by_name)
--    if spec = ( Gem::Specification.find_by_name("numru-narray") || Gem::Specification.find_by_name("narray") )
--      gem_path = spec.full_gem_path
+-    nas.each do |na|
+-      begin
+-        if ( spec = Gem::Specification.find_by_name(na) )
+-          na_type = na
+-          na_path = spec.full_gem_path
+-          case na_type
+-          when "narray"
+-            na_path = File.join(na_path, "src")
+-          when "numru-narray"
+-            na_path = File.join(na_path, "ext", "numru", "narray")
+-          end
+-          break
+-        end
+-      rescue LoadError
+-      end
 -    end
 -  else
--    if (spec = (Gem.source_index.find_name("numru-narray") || Gem.source_index.find_name("narray")) ).any?
--      gem_path = spec.full_gem_path
+-    nas.each do |na|
+-      if ( spec = Gem.source_index.find_name(na) ).any?
+-        na_type = na
+-        na_path = spec[0].full_gem_path
+-        case na_type
+-        when "narray"
+-          na_path = File.join(na_path, "src")
+-        when "numru-narray"
+-          na_path = File.join(na_path, "ext", "numru", "narray")
+-        end
+-        break
+-      end
 -    end
 -  end
--  gem_path = File.join(gem_path, "ext", "numru", "narray")
--rescue LoadError
--  dir_config("narray", RbConfig::CONFIG["sitearchdir"])
--end
--
--unless find_header("narray.h", gem_path)
--  find_header("narray.h", File.join(gem_path,"src"))
 -end
-+dir_config("narray", RbConfig::CONFIG["vendorarchdir"])
-+find_header("narray.h", RbConfig::CONFIG["vendorarchdir"])
++na_path = RbConfig::CONFIG["vendorarchdir"]
++# begin
++#   require "rubygems"
++#   gem = true
++# rescue LoadError
++#   gem = false
++# end
++# if gem
++#   if ( na_type = ENV["NARRAY_TYPE"] )
++#     nas = [na_type]
++#   else
++#     nas = %w(narray numru-narray)
++#   end
++#   if Gem::Specification.respond_to?(:find_by_name)
++#     nas.each do |na|
++#       begin
++#         if ( spec = Gem::Specification.find_by_name(na) )
++#           na_type = na
++#           na_path = spec.full_gem_path
++#           case na_type
++#           when "narray"
++#             na_path = File.join(na_path, "src")
++#           when "numru-narray"
++#             na_path = File.join(na_path, "ext", "numru", "narray")
++#           end
++#           break
++#         end
++#       rescue LoadError
++#       end
++#     end
++#   else
++#     nas.each do |na|
++#       if ( spec = Gem.source_index.find_name(na) ).any?
++#         na_type = na
++#         na_path = spec[0].full_gem_path
++#         case na_type
++#         when "narray"
++#           na_path = File.join(na_path, "src")
++#         when "numru-narray"
++#           na_path = File.join(na_path, "ext", "numru", "narray")
++#         end
++#         break
++#       end
++#     end
++#   end
++# end
  
- dir_config("grib_api")
- if have_header("grib_api.h") && have_library("grib_api")
+ dir_config("narray", na_path, na_path)
+ unless have_header("narray.h")

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