[DRE-commits] [nanoc] 11/21: Add new patches

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository nanoc.

commit 617c0f387e0f2cdafce5a9963e0b192bed75add9
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Jan 4 23:32:42 2017 +0100

    Add new patches
---
 debian/patches/no_parallel.patch       | 16 ++++++++++++++++
 debian/patches/no_simplecov.patch      | 25 +++++++++++++++++++++++++
 debian/patches/no_w3c_validators.patch | 16 ++++++++++++++++
 debian/patches/require_net_http.patch  | 13 +++++++++++++
 debian/patches/series                  |  6 +++++-
 5 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/debian/patches/no_parallel.patch b/debian/patches/no_parallel.patch
new file mode 100644
index 0000000..e85eb69
--- /dev/null
+++ b/debian/patches/no_parallel.patch
@@ -0,0 +1,16 @@
+Description: remove requirement on parallel gem
+Origin: https://github.com/nanoc/nanoc/pull/1051
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2017-01-04
+
+--- a/lib/nanoc/checking/checks/external_links.rb
++++ b/lib/nanoc/checking/checks/external_links.rb
+@@ -12,8 +12,6 @@
+     identifiers :external_links, :elinks
+ 
+     def run
+-      require 'parallel'
+-
+       # Find all broken external hrefs
+       # TODO: de-duplicate this (duplicated in internal links check)
+       filenames = output_filenames.select { |f| File.extname(f) == '.html' && !excluded_file?(f) }
diff --git a/debian/patches/no_simplecov.patch b/debian/patches/no_simplecov.patch
new file mode 100644
index 0000000..3b97c69
--- /dev/null
+++ b/debian/patches/no_simplecov.patch
@@ -0,0 +1,25 @@
+Description: do not load simplecov in tests
+Author: Cédric Boutillier <boutil at debian.org>
+Forwarded: not needed
+Last-Update: 2017-01-04
+
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,6 +1,3 @@
+-require 'simplecov'
+-SimpleCov.start
+-
+ require 'nanoc'
+ require 'nanoc/cli'
+ require 'nanoc/spec'
+--- a/test/helper.rb
++++ b/test/helper.rb
+@@ -1,8 +1,5 @@
+ $VERBOSE = false
+ 
+-require 'simplecov'
+-SimpleCov.start
+-
+ require 'minitest/autorun'
+ require 'mocha/setup'
+ 
diff --git a/debian/patches/no_w3c_validators.patch b/debian/patches/no_w3c_validators.patch
new file mode 100644
index 0000000..af55ea7
--- /dev/null
+++ b/debian/patches/no_w3c_validators.patch
@@ -0,0 +1,16 @@
+Description: disable test requiring w3c_validators
+Author: Cédric Boutillier <boutil at debian.org>
+Forwarded: no
+Last-Update: 2017-01-04
+
+--- a/test/checking/checks/test_html.rb
++++ b/test/checking/checks/test_html.rb
+@@ -1,7 +1,7 @@
+ require 'helper'
+ 
+ class Nanoc::Checking::Checks::HTMLTest < Nanoc::TestCase
+-  def test_run_ok
++  def _test_run_ok
+     require 'w3c_validators'
+ 
+     if ::W3CValidators::VERSION =~ /\A1\.3|1\.3\.1\z/
diff --git a/debian/patches/require_net_http.patch b/debian/patches/require_net_http.patch
new file mode 100644
index 0000000..769fbbb
--- /dev/null
+++ b/debian/patches/require_net_http.patch
@@ -0,0 +1,13 @@
+Description: add missing requirement on net/http
+Bug: https://github.com/nanoc/nanoc/issues/1050
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2017-01-04
+
+--- a/spec/nanoc/cli/commands/view_spec.rb
++++ b/spec/nanoc/cli/commands/view_spec.rb
+@@ -1,3 +1,5 @@
++require "net/http"
++
+ describe Nanoc::CLI::Commands::View, site: true, stdio: true do
+   describe '#run' do
+     def run_nanoc_cmd(cmd)
diff --git a/debian/patches/series b/debian/patches/series
index ebd927b..d641aa5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,10 @@
 no_privacy_breach.patch
 no_vcr.patch
 #set-load_paths-for-sass-tests.patch
-#filter_out_nil_gemspec.patch
+filter_out_nil_gemspec.patch
+no_w3c_validators.patch
+no_parallel.patch
 encoding.patch
 skip_tests_autopkgtest.patch
+require_net_http.patch
+no_simplecov.patch

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