[DRE-commits] [ruby-nokogiri] 03/04: Skip one test that is incompatible with libxml2 currently in Debian
Antonio Terceiro
terceiro at moszumanska.debian.org
Mon Nov 14 15:51:51 UTC 2016
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository ruby-nokogiri.
commit 64d08fcbb0a5be518337889db27a69893f3ae8e8
Author: Antonio Terceiro <terceiro at debian.org>
Date: Mon Nov 14 12:23:45 2016 -0200
Skip one test that is incompatible with libxml2 currently in Debian
Closes: #842910
---
debian/changelog | 3 ++
...-warning-about-the-version-of-libxml-used.patch | 26 ++++++++++
.../0002-deactivate-reader_blocking-test.patch | 24 +++++++++
... 0003-Remove-dependency-on-mini_portile2.patch} | 58 ++++++++++++----------
.../patches/0004-Always-use-system-libraries.patch | 22 ++++++++
...est-incompatible-with-libxml2-from-Debian.patch | 20 ++++++++
.../patches/deactivate_test_reader_blocking.patch | 18 -------
debian/patches/no-require-rubygems.patch | 16 ------
debian/patches/remove-annoying-warning.patch | 21 --------
debian/patches/series | 9 ++--
debian/patches/skip-some-tests.patch | 35 -------------
11 files changed, 131 insertions(+), 121 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b0501e8..e0d1d99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ ruby-nokogiri (1.6.8.1-1) UNRELEASED; urgency=medium
* New upstream release
* Add myself to Uploaders:
+ * Rework patche stack to use gbp-pq
+ * Skip one test that is incompatible with libxml2 currently in Debian
+ (Closes: #842910)
-- Antonio Terceiro <terceiro at debian.org> Fri, 01 Jul 2016 08:06:08 -0300
diff --git a/debian/patches/0001-Remove-warning-about-the-version-of-libxml-used.patch b/debian/patches/0001-Remove-warning-about-the-version-of-libxml-used.patch
new file mode 100644
index 0000000..35915a6
--- /dev/null
+++ b/debian/patches/0001-Remove-warning-about-the-version-of-libxml-used.patch
@@ -0,0 +1,26 @@
+From: Ryan Niebur <ryanryan52 at gmail.com>
+Date: Mon, 14 Nov 2016 11:56:39 -0200
+Subject: Remove warning about the version of libxml used
+
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=546843
+---
+ lib/nokogiri/version.rb | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/lib/nokogiri/version.rb b/lib/nokogiri/version.rb
+index ba84a31..73b0313 100644
+--- a/lib/nokogiri/version.rb
++++ b/lib/nokogiri/version.rb
+@@ -36,11 +36,7 @@ module Nokogiri
+ def warnings
+ return [] unless libxml2?
+
+- if compiled_parser_version != loaded_parser_version
+- ["Nokogiri was built against LibXML version #{compiled_parser_version}, but has dynamically loaded #{loaded_parser_version}"]
+- else
+- []
+- end
++ []
+ end
+
+ def to_hash
diff --git a/debian/patches/0002-deactivate-reader_blocking-test.patch b/debian/patches/0002-deactivate-reader_blocking-test.patch
new file mode 100644
index 0000000..d90c4ed
--- /dev/null
+++ b/debian/patches/0002-deactivate-reader_blocking-test.patch
@@ -0,0 +1,24 @@
+From: =?utf-8?q?C=C3=A9dric_Boutillier?= <boutil at debian.org>
+Date: Mon, 14 Nov 2016 11:58:02 -0200
+Subject: deactivate reader_blocking test
+
+It makes the test suite hang on Debian kFreeBSD ports
+
+https://github.com/sparklemotion/nokogiri/issues/965
+---
+ test/xml/test_reader.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/xml/test_reader.rb b/test/xml/test_reader.rb
+index c310ad3..cf825ed 100644
+--- a/test/xml/test_reader.rb
++++ b/test/xml/test_reader.rb
+@@ -38,7 +38,7 @@ module Nokogiri
+
+ # Issue #831
+ # Make sure that the reader doesn't block reading the entire input
+- def test_reader_blocking
++ def _test_reader_blocking
+ rd, wr = IO.pipe()
+ node_out = nil
+ t = Thread.start do
diff --git a/debian/patches/always_use_system_libraries.patch b/debian/patches/0003-Remove-dependency-on-mini_portile2.patch
similarity index 54%
rename from debian/patches/always_use_system_libraries.patch
rename to debian/patches/0003-Remove-dependency-on-mini_portile2.patch
index 83c2529..f9c06ce 100644
--- a/debian/patches/always_use_system_libraries.patch
+++ b/debian/patches/0003-Remove-dependency-on-mini_portile2.patch
@@ -1,30 +1,34 @@
-Description: always use system libraries and remov the dependency to mini_portile
-Author: Jérémy Bobbio <lunar at debian.org>
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2014-07-25
+From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lunar at debian.org>
+Date: Mon, 14 Nov 2016 12:03:04 -0200
+Subject: Remove dependency on mini_portile2
---- a/ext/nokogiri/extconf.rb
-+++ b/ext/nokogiri/extconf.rb
-@@ -377,7 +377,7 @@ def lib_a(ldflag)
- end
-
- def using_system_libraries?
-- arg_config('--use-system-libraries', !!ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'])
-+ true
- end
-
- #
+We don't really need it in the Debian package
+
+Signed-off-by: Antonio Terceiro <terceiro at debian.org>
+---
+ Rakefile | 6 ------
+ nokogiri.gemspec | 3 ---
+ 2 files changed, 9 deletions(-)
+
+diff --git a/Rakefile b/Rakefile
+index 49de8b0..e9ddfee 100644
--- a/Rakefile
+++ b/Rakefile
-@@ -127,7 +127,6 @@ HOE = Hoe.spec 'nokogiri' do
+@@ -125,12 +125,6 @@ HOE = Hoe.spec 'nokogiri' do
+ ]
+ self.clean_globs += Dir.glob("ports/*").reject { |d| d =~ %r{/archives$} }
- unless java?
- self.extra_deps += [
+- unless java?
+- self.extra_deps += [
- ["mini_portile2", "~> 2.1.0"], # keep version in sync with extconf.rb
- ["pkg-config", "~> 1.1.7"], # keep version in sync with extconf.rb
- ]
- end
+- ]
+- end
+-
+ self.extra_dev_deps += [
+ ["hoe-bundler", "~> 1.2.0"],
+ ["hoe-debugging", "~> 1.2.1"],
+diff --git a/nokogiri.gemspec b/nokogiri.gemspec
+index 3c418ef..8bba7af 100644
--- a/nokogiri.gemspec
+++ b/nokogiri.gemspec
@@ -33,7 +33,6 @@ Gem::Specification.new do |s|
@@ -33,21 +37,21 @@ Last-Update: 2014-07-25
s.add_development_dependency(%q<hoe-git>, ["~> 1.6.0"])
- s.add_runtime_dependency(%q<mini_portile2>, ["~> 2.1.0"])
s.add_development_dependency(%q<minitest>, ["~> 5.8.4"])
- s.add_runtime_dependency(%q<pkg-config>, ["~> 1.1.7"])
s.add_development_dependency(%q<racc>, ["~> 1.4.14"])
-@@ -48,7 +47,6 @@ Gem::Specification.new do |s|
+ s.add_development_dependency(%q<rake>, ["~> 10.5.0"])
+@@ -47,7 +46,6 @@ Gem::Specification.new do |s|
s.add_dependency(%q<hoe-debugging>, ["~> 1.2.1"])
s.add_dependency(%q<hoe-gemspec>, ["~> 1.0.0"])
s.add_dependency(%q<hoe-git>, ["~> 1.6.0"])
- s.add_dependency(%q<mini_portile2>, ["~> 2.1.0"])
s.add_dependency(%q<minitest>, ["~> 5.8.4"])
- s.add_dependency(%q<pkg-config>, ["~> 1.1.7"])
s.add_dependency(%q<racc>, ["~> 1.4.14"])
-@@ -64,7 +62,6 @@ Gem::Specification.new do |s|
+ s.add_dependency(%q<rake>, ["~> 10.5.0"])
+@@ -62,7 +60,6 @@ Gem::Specification.new do |s|
s.add_dependency(%q<hoe-debugging>, ["~> 1.2.1"])
s.add_dependency(%q<hoe-gemspec>, ["~> 1.0.0"])
s.add_dependency(%q<hoe-git>, ["~> 1.6.0"])
- s.add_dependency(%q<mini_portile2>, ["~> 2.1.0"])
s.add_dependency(%q<minitest>, ["~> 5.8.4"])
- s.add_dependency(%q<pkg-config>, ["~> 1.1.7"])
s.add_dependency(%q<racc>, ["~> 1.4.14"])
+ s.add_dependency(%q<rake>, ["~> 10.5.0"])
diff --git a/debian/patches/0004-Always-use-system-libraries.patch b/debian/patches/0004-Always-use-system-libraries.patch
new file mode 100644
index 0000000..8bbfa57
--- /dev/null
+++ b/debian/patches/0004-Always-use-system-libraries.patch
@@ -0,0 +1,22 @@
+From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lunar at debian.org>
+Date: Mon, 14 Nov 2016 12:03:43 -0200
+Subject: Always use system libraries
+
+Signed-off-by: Antonio Terceiro <terceiro at debian.org>
+---
+ ext/nokogiri/extconf.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/nokogiri/extconf.rb b/ext/nokogiri/extconf.rb
+index c6b51a4..1a63cfe 100644
+--- a/ext/nokogiri/extconf.rb
++++ b/ext/nokogiri/extconf.rb
+@@ -378,7 +378,7 @@ def lib_a(ldflag)
+ end
+
+ def using_system_libraries?
+- arg_config('--use-system-libraries', !!ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'])
++ true
+ end
+
+ #
diff --git a/debian/patches/0005-skip-test-incompatible-with-libxml2-from-Debian.patch b/debian/patches/0005-skip-test-incompatible-with-libxml2-from-Debian.patch
new file mode 100644
index 0000000..3104461
--- /dev/null
+++ b/debian/patches/0005-skip-test-incompatible-with-libxml2-from-Debian.patch
@@ -0,0 +1,20 @@
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Mon, 14 Nov 2016 12:21:01 -0200
+Subject: skip test incompatible with libxml2 from Debian
+
+---
+ test/xml/test_node.rb | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/xml/test_node.rb b/test/xml/test_node.rb
+index a8a306a..f9562b2 100644
+--- a/test/xml/test_node.rb
++++ b/test/xml/test_node.rb
+@@ -326,6 +326,7 @@ module Nokogiri
+ end
+
+ def test_document_compare
++ skip('Does not work against the libxml2 in Debian')
+ nodes = @xml.xpath('//employee')
+ assert_equal(-1, (nodes.first <=> @xml))
+ end
diff --git a/debian/patches/deactivate_test_reader_blocking.patch b/debian/patches/deactivate_test_reader_blocking.patch
deleted file mode 100644
index 47e7642..0000000
--- a/debian/patches/deactivate_test_reader_blocking.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: deactivate reader_blocking test, hanging on kFreeBSD ports
-Author: Cédric Boutillier <boutil at debian.org>
-Origin: vendor
-Bug: https://github.com/sparklemotion/nokogiri/issues/965
-Last-Update: 2013-09-03
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/test/xml/test_reader.rb
-+++ b/test/xml/test_reader.rb
-@@ -38,7 +38,7 @@ module Nokogiri
-
- # Issue #831
- # Make sure that the reader doesn't block reading the entire input
-- def test_reader_blocking
-+ def _test_reader_blocking
- rd, wr = IO.pipe()
- node_out = nil
- t = Thread.start do
diff --git a/debian/patches/no-require-rubygems.patch b/debian/patches/no-require-rubygems.patch
deleted file mode 100644
index 2daa551..0000000
--- a/debian/patches/no-require-rubygems.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Remove requirement on rubygems
-Origine: vendor
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: ruby-nokogiri/bin/nokogiri
-===================================================================
---- ruby-nokogiri.orig/bin/nokogiri
-+++ ruby-nokogiri/bin/nokogiri
-@@ -2,7 +2,6 @@
- require 'optparse'
- require 'open-uri'
- require 'uri'
--require 'rubygems'
- require 'nokogiri'
- autoload :IRB, 'irb'
-
diff --git a/debian/patches/remove-annoying-warning.patch b/debian/patches/remove-annoying-warning.patch
deleted file mode 100644
index b00b57d..0000000
--- a/debian/patches/remove-annoying-warning.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Remove annoying warning about the version of libxml used
-Author: Ryan Niebur <ryanryan52 at gmail.com>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=546843
-Forwarded: not-needed
-Index: git/lib/nokogiri/version.rb
-===================================================================
---- git.orig/lib/nokogiri/version.rb 2013-11-03 11:47:24.422149897 +0100
-+++ git/lib/nokogiri/version.rb 2013-11-03 11:48:37.348681267 +0100
-@@ -36,11 +36,7 @@
- def warnings
- return [] unless libxml2?
-
-- if compiled_parser_version != loaded_parser_version
-- ["Nokogiri was built against LibXML version #{compiled_parser_version}, but has dynamically loaded #{loaded_parser_version}"]
-- else
-- []
-- end
-+ []
- end
-
- def to_hash
diff --git a/debian/patches/series b/debian/patches/series
index 360827d..7ca61d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
-remove-annoying-warning.patch
-no-require-rubygems.patch
-deactivate_test_reader_blocking.patch
-always_use_system_libraries.patch
+0001-Remove-warning-about-the-version-of-libxml-used.patch
+0002-deactivate-reader_blocking-test.patch
+0003-Remove-dependency-on-mini_portile2.patch
+0004-Always-use-system-libraries.patch
+0005-skip-test-incompatible-with-libxml2-from-Debian.patch
diff --git a/debian/patches/skip-some-tests.patch b/debian/patches/skip-some-tests.patch
deleted file mode 100644
index 75640d6..0000000
--- a/debian/patches/skip-some-tests.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: skip tests that fail with Debian's libxml2
-Author: Antonio Terceiro <terceiro at debian.org>
-Origin: vendor
-Forwarded: no
-Last-Update: 2015-11-17
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/test/html/test_document.rb
-+++ b/test/html/test_document.rb
-@@ -619,6 +619,7 @@ eohtml
- end
-
- def test_capturing_nonparse_errors_during_document_clone
-+ skip 'Does not work against libxml2 2.9.2 in Debian'
- # see https://github.com/sparklemotion/nokogiri/issues/1196 for background
- original = Nokogiri::HTML.parse("<div id='unique'></div><div id='unique'></div>")
- original_errors = original.errors.dup
-@@ -629,6 +630,7 @@ eohtml
-
- def test_capturing_nonparse_errors_during_node_copy_between_docs
- skip("JRuby HTML parse errors are different than libxml2's") if Nokogiri.jruby?
-+ skip 'Does not work against libxml2 2.9.2 in Debian'
-
- doc1 = Nokogiri::HTML("<div id='unique'>one</div>")
- doc2 = Nokogiri::HTML("<div id='unique'>two</div>")
---- a/test/html/test_document_fragment.rb
-+++ b/test/html/test_document_fragment.rb
-@@ -279,6 +279,7 @@ module Nokogiri
-
- def test_capturing_nonparse_errors_during_node_copy_between_fragments
- skip("JRuby HTML parse errors are different than libxml2's") if Nokogiri.jruby?
-+ skip("Does not work against libxml2 2.9.2 in Debian")
-
- frag1 = Nokogiri::HTML.fragment("<div id='unique'>one</div>")
- frag2 = Nokogiri::HTML.fragment("<div id='unique'>two</div>")
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-nokogiri.git
More information about the Pkg-ruby-extras-commits
mailing list