mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-06 22:07:19 +02:00
community/ruby-nokogiri: upgrade to 1.14.3 and enable check
This commit is contained in:
parent
b35ebd1fdd
commit
c13e54de86
@ -4,7 +4,7 @@
|
||||
# TODO: Unbundle gombo-parser.
|
||||
pkgname=ruby-nokogiri
|
||||
_gemname=${pkgname#ruby-}
|
||||
pkgver=1.13.10
|
||||
pkgver=1.14.3
|
||||
pkgrel=0
|
||||
pkgdesc="An HTML, XML, SAX, and Reader parser"
|
||||
url="https://nokogiri.org/"
|
||||
@ -22,12 +22,9 @@ source="https://github.com/sparklemotion/$_gemname/archive/v$pkgver/$_gemname-$p
|
||||
gemspec-fix-deps.patch
|
||||
test-helper-remove-unnecessary-deps.patch
|
||||
shutdown-libxml2-warning.patch
|
||||
test-skip-zip.patch
|
||||
"
|
||||
builddir="$srcdir/$_gemname-$pkgver"
|
||||
# FIXME:
|
||||
# Expected: "<p>foo</p>"
|
||||
# Actual: "<o:p>foo</o:p>"
|
||||
options="!check"
|
||||
|
||||
# secfixes:
|
||||
# 1.13.10-r0:
|
||||
@ -66,7 +63,7 @@ build() {
|
||||
cd dist/gems/$_gemname-$pkgver/
|
||||
rm -rf ext/ patches/
|
||||
rm ./*.md ./*.yml
|
||||
rm lib/*.jar
|
||||
rm -rf lib/nokogiri/jruby/ # TODO: move into subpackage?
|
||||
rm lib/nokogiri/*.so
|
||||
rm lib/nokogiri/css/*.rex lib/nokogiri/css/*.y
|
||||
}
|
||||
@ -95,8 +92,9 @@ package() {
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
c9a4b14cb92c4920872048991c958036d5f09b8e231a6f6408e5d3c5df78b70e206cc12b8ed8aaae012e51f6f87adcbe46273cd1feca082ec17f42114f5a1172 nokogiri-1.13.10.tar.gz
|
||||
ea39462bdf01f576472a8b4e27d8b470ed966c8e72c6f62f7f0554a02a08fa1da7c5e3e5183098584f8733ac814fd5e53da9a0cd507748f5fae3c154594ddcba gemspec-fix-deps.patch
|
||||
23a53b73328fdbf74b80d163cd14ae231edccc71a48a68fcb37ef0e1a57f097503fc4255ef6035fd3e5881d5e38632a80393e8dde709fbf428abc6658e1b2306 test-helper-remove-unnecessary-deps.patch
|
||||
93ebc7118e364eaa97030a10cd6dc5b4312483a432f267d65b6a091b22dd355d0c1a490b336981f1b284059ba3420c73d31254a91531f295a60583db26a0d331 nokogiri-1.14.3.tar.gz
|
||||
06e8f2f719cc5e2a2ee960d729f0aa3916f2613d5569a88cb5581720cb30c73879f4567ad03cebf1ce7f8a7f697a44b383962211c16ec53a835e425e3cf673e7 gemspec-fix-deps.patch
|
||||
e5ff3bd134d7fc9f7cd7e7959e5f76b8e7f352a00a58b4b1b0ddddc91b4748945ae35ce80d3f1da45623e0cde0fbc85abce034745724aeb64c23065f92b51827 test-helper-remove-unnecessary-deps.patch
|
||||
63519d5b314c6fee49c219c8ab6999b340e1e6b1acecfaf3aee3dcc37302be8ff82dbd00484b3570f457d5de3c54529b843e1d382f5b65b9e128548b37c97198 shutdown-libxml2-warning.patch
|
||||
ab9681d88bfa0939134e333db751c2564629667ff7d49a5db93c3f49b88bc08349eae32d3a35c9235bb76b27b259033f949ad1ad5d9cf047b2eb8d2546632b7b test-skip-zip.patch
|
||||
"
|
||||
|
@ -2,14 +2,15 @@ racc and mini_portile2 are needed only to build native extension.
|
||||
|
||||
--- a/nokogiri.gemspec
|
||||
+++ b/nokogiri.gemspec
|
||||
@@ -318,8 +318,8 @@
|
||||
spec.extra_rdoc_files += Dir.glob("README.md")
|
||||
spec.rdoc_options = ["--main", "README.md"]
|
||||
|
||||
- spec.add_runtime_dependency("mini_portile2", "~> 2.8.0") unless java_p # keep version in sync with extconf.rb
|
||||
@@ -335,9 +335,9 @@
|
||||
spec.requirements << "jar xerces, xercesImpl, 2.12.2" # https://search.maven.org/artifact/xerces/xercesImpl
|
||||
spec.requirements << "jar xml-apis, xml-apis, 1.4.01" # https://search.maven.org/artifact/xml-apis/xml-apis
|
||||
else
|
||||
- spec.add_runtime_dependency("mini_portile2", "~> 2.8.0") # keep version in sync with extconf.rb
|
||||
+ spec.add_development_dependency("mini_portile2", "~> 2.8.0") # keep version in sync with extconf.rb
|
||||
end
|
||||
- spec.add_runtime_dependency("racc", "~> 1.4")
|
||||
+ spec.add_development_dependency("mini_portile2", "~> 2.8.0") unless java_p # keep version in sync with extconf.rb
|
||||
+ spec.add_development_dependency("racc", "~> 1.4")
|
||||
|
||||
spec.add_development_dependency("bundler", "~> 2.2")
|
||||
spec.add_development_dependency("hoe-markdown", "~> 1.4")
|
||||
spec.extensions << "ext/nokogiri/extconf.rb"
|
||||
end
|
||||
|
@ -1,22 +1,31 @@
|
||||
--- a/test/helper.rb
|
||||
+++ b/test/helper.rb
|
||||
@@ -16,19 +16,12 @@
|
||||
# make sure we do one final major before the process exits (for valgrind)
|
||||
at_exit { GC.start(full_mark: true) } unless ::RUBY_PLATFORM == "java"
|
||||
@@ -13,21 +13,21 @@
|
||||
# - NOKOGIRI_GC: read more in test/test_memory_leak.rb
|
||||
#
|
||||
|
||||
-require "simplecov"
|
||||
-SimpleCov.start do
|
||||
- add_filter "/test/"
|
||||
-end
|
||||
+#require "simplecov"
|
||||
+#SimpleCov.start do
|
||||
+# add_filter "/test/"
|
||||
+#end
|
||||
|
||||
$VERBOSE = true
|
||||
|
||||
require "minitest/autorun"
|
||||
require "minitest/benchmark"
|
||||
-require "minitest/reporters"
|
||||
NOKOGIRI_MINITEST_REPORTERS_OPTIONS = { color: true, slow_count: 10, detailed_skip: false }
|
||||
NOKOGIRI_MINITEST_REPORTERS_OPTIONS[:fast_fail] = true if ENV["NOKOGIRI_TEST_FAIL_FAST"]
|
||||
-puts "Minitest::Reporters options: #{NOKOGIRI_MINITEST_REPORTERS_OPTIONS}"
|
||||
-Minitest::Reporters.use!(Minitest::Reporters::DefaultReporter.new(NOKOGIRI_MINITEST_REPORTERS_OPTIONS))
|
||||
+#require "minitest/reporters"
|
||||
|
||||
nokogiri_minitest_reporters_options = { color: true, slow_count: 10, detailed_skip: false }
|
||||
nokogiri_minitest_reporters_options[:fast_fail] = true if ENV["NOKOGIRI_TEST_FAIL_FAST"]
|
||||
-puts "Minitest::Reporters options: #{nokogiri_minitest_reporters_options}"
|
||||
-Minitest::Reporters.use!(Minitest::Reporters::DefaultReporter.new(nokogiri_minitest_reporters_options))
|
||||
+#puts "Minitest::Reporters options: #{nokogiri_minitest_reporters_options}"
|
||||
+#Minitest::Reporters.use!(Minitest::Reporters::DefaultReporter.new(nokogiri_minitest_reporters_options))
|
||||
|
||||
require "fileutils"
|
||||
require "tempfile"
|
||||
|
10
community/ruby-nokogiri/test-skip-zip.patch
Normal file
10
community/ruby-nokogiri/test-skip-zip.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- a/test/xml/test_document_encoding.rb
|
||||
+++ b/test/xml/test_document_encoding.rb
|
||||
@@ -90,6 +90,7 @@
|
||||
|
||||
describe "pseudo-IO" do
|
||||
it "serializes correctly with Zip::OutputStream objects" do
|
||||
+ skip "we don't have ruby-zip yet"
|
||||
# https://github.com/sparklemotion/nokogiri/issues/2773
|
||||
require "zip"
|
||||
|
Loading…
Reference in New Issue
Block a user