[DRE-commits] [ruby-nokogiri] 02/04: refresh always_use_system_libraries.patch and skip_test_reader_entity_reference_without_dtdload.patch

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-nokogiri.

commit 8ae935ac20d7b31662fc94f7c4d429ec305eafd1
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri May 30 16:10:38 2014 +0200

    refresh always_use_system_libraries.patch and skip_test_reader_entity_reference_without_dtdload.patch
---
 debian/patches/always_use_system_libraries.patch   | 65 +++++++++++++---------
 ...t_reader_entity_reference_without_dtdload.patch | 26 ++++-----
 2 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/debian/patches/always_use_system_libraries.patch b/debian/patches/always_use_system_libraries.patch
index ada98cf..8ddcbe0 100644
--- a/debian/patches/always_use_system_libraries.patch
+++ b/debian/patches/always_use_system_libraries.patch
@@ -2,47 +2,58 @@ Description: always use system libraries and remov the dependency to mini_portil
 Author: Jérémy Bobbio <lunar at debian.org>
 Origin: vendor
 Forwarded: not-needed
+Last-Update: 2014-05-30
 
 --- a/Rakefile
 +++ b/Rakefile
-@@ -42,10 +42,6 @@
+@@ -130,16 +130,6 @@
      # GENERATED_TOKENIZER
    ]
  
--  self.extra_deps += [
--    ["mini_portile",    "~> 0.5.0"],
--  ]
+-  unless java?
+-    self.extra_deps += [
+-      # this dependency locked because we're monkey-punching mini_portile.
+-      # for more details, see:
+-      # - https://github.com/sparklemotion/nokogiri/issues/1102
+-      # - https://github.com/luislavena/mini_portile/issues/32
+-      ["mini_portile",    "= 0.6.0"],
+-    ]
+-  end
 -
    self.extra_dev_deps += [
      ["hoe-bundler",     ">= 1.1"],
      ["hoe-debugging",   ">= 1.0.3"],
 --- a/ext/nokogiri/extconf.rb
 +++ b/ext/nokogiri/extconf.rb
-@@ -45,7 +45,7 @@
-   XML2_HEADER_DIRS = [File.join(INCLUDEDIR, "libxml2"), INCLUDEDIR]
+@@ -327,7 +327,7 @@
+ end
  
- else
--  if ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES']
-+  if ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] || true
-     HEADER_DIRS = [
-       # First search /opt/local for macports
-       '/opt/local/include',
+ case
+-when arg_config('--use-system-libraries', !!ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'])
++when arg_config('--use-system-libraries', !!ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES']) || true
+   message! "Building nokogiri using system libraries.\n"
+ 
+   dir_config('zlib')
 --- a/metadata.yml
 +++ b/metadata.yml
-@@ -15,16 +15,6 @@
- date: 2013-12-14 00:00:00 Z
- dependencies: 
- - !ruby/object:Gem::Dependency 
--  version_requirements: &id001 !ruby/object:Gem::Requirement 
--    requirements: 
--    - - ~>
--      - !ruby/object:Gem::Version 
--        version: 0.5.0
--  type: :runtime
+@@ -15,20 +15,6 @@
+ date: 2014-05-14 00:00:00.000000000 Z
+ dependencies:
+ - !ruby/object:Gem::Dependency
 -  name: mini_portile
+-  requirement: !ruby/object:Gem::Requirement
+-    requirements:
+-    - - '='
+-      - !ruby/object:Gem::Version
+-        version: 0.6.0
+-  type: :runtime
 -  prerelease: false
--  requirement: *id001
--- !ruby/object:Gem::Dependency 
-   version_requirements: &id002 !ruby/object:Gem::Requirement 
-     requirements: 
-     - - ~>
+-  version_requirements: !ruby/object:Gem::Requirement
+-    requirements:
+-    - - '='
+-      - !ruby/object:Gem::Version
+-        version: 0.6.0
+-- !ruby/object:Gem::Dependency
+   name: rdoc
+   requirement: !ruby/object:Gem::Requirement
+     requirements:
diff --git a/debian/patches/skip_test_reader_entity_reference_without_dtdload.patch b/debian/patches/skip_test_reader_entity_reference_without_dtdload.patch
index e9f236c..df2c00e 100644
--- a/debian/patches/skip_test_reader_entity_reference_without_dtdload.patch
+++ b/debian/patches/skip_test_reader_entity_reference_without_dtdload.patch
@@ -3,7 +3,7 @@ Description: disable test_reader_entity_reference_without_dtdload
 Origin: vendor
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: no
-Last-Update: 2013-08-16
+Last-Update: 2014-05-30
 
 --- a/test/xml/test_entity_reference.rb
 +++ b/test/xml/test_entity_reference.rb
@@ -13,22 +13,22 @@ Last-Update: 2013-08-16
  
 -      test_relative_and_absolute_path :test_reader_entity_reference_without_dtdload do
 -        html = File.read xml_document
+-        reader = Nokogiri::XML::Reader html, path do |cfg|
+-          cfg.default_xml
+-        end
 -        assert_raises(Nokogiri::XML::SyntaxError) do
--          reader = Nokogiri::XML::Reader html, path do |cfg|
--            cfg.default_xml
--          end
 -          reader.each { |n| n }
 -        end
 -      end
-+    # test_relative_and_absolute_path :test_reader_entity_reference_without_dtdload do
-+    #   html = File.read xml_document
-+    #   assert_raises(Nokogiri::XML::SyntaxError) do
-+    #     reader = Nokogiri::XML::Reader html, path do |cfg|
-+    #       cfg.default_xml
-+    #     end
-+    #     reader.each { |n| n }
-+    #   end
-+    # end
++      #test_relative_and_absolute_path :test_reader_entity_reference_without_dtdload do
++      #  html = File.read xml_document
++      #  reader = Nokogiri::XML::Reader html, path do |cfg|
++      #    cfg.default_xml
++      #  end
++      #  assert_raises(Nokogiri::XML::SyntaxError) do
++      #    reader.each { |n| n }
++      #  end
++      #end
      end
    end
  end

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