diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-08-28 12:00:19 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-08-28 12:00:19 +0100 |
commit | 7166f3a0a0b7886d340010458d0b130013cb9989 (patch) | |
tree | 3ff502007dde9dba943a004a3bf201ae4e0787bd /dev-ruby/mechanize | |
parent | 345c02ca33341652116ddec6705530223af2de85 (diff) |
gentoo auto-resync : 28:08:2024 - 12:00:19
Diffstat (limited to 'dev-ruby/mechanize')
-rw-r--r-- | dev-ruby/mechanize/Manifest | 2 | ||||
-rw-r--r-- | dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-1.patch | 64 | ||||
-rw-r--r-- | dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-2.patch | 34 |
3 files changed, 0 insertions, 100 deletions
diff --git a/dev-ruby/mechanize/Manifest b/dev-ruby/mechanize/Manifest index 8d9767d8fe6f..164db7006bf4 100644 --- a/dev-ruby/mechanize/Manifest +++ b/dev-ruby/mechanize/Manifest @@ -1,5 +1,3 @@ -AUX mechanize-2.9.1-libxml2-1.patch 2182 BLAKE2B 1b087ba7e2eac784bf3e0396b78d0160282da51a26a03b230c60ecf9c61663e24c60bc33feba391f5ed88ee422a3eff6556a32a9307bf5c190b6d32344684d5e SHA512 af7f4d96a631650b8029f2a2cd6518e166accbaacf45671ecaeb20e8b403199072cc8b7fadb222d7b9dffccfb19857e54180da7216ec89cbeae49718c7013798 -AUX mechanize-2.9.1-libxml2-2.patch 1443 BLAKE2B b993c60071ab9a32555417c12263eaee87ed238125d552c9b8c5d679796701714b0beddf8b6e8d44c979354235e1d56ff9d88c8f4a1aae018806c110eb916c01 SHA512 8721e6628e643544af79feea00aa51f7b165986c3770411c622f650c1ce218a3e6c7194bac66021427de6fa38f3979986acdaa6fe83c7da1a0af4aafd2af1129 DIST mechanize-2.10.0.gem 144384 BLAKE2B 8a317b78c28d85f957cc50e54139305b2e64409b992ad5558385609d28986b33bfcbd947e7be3688524be0b2840a978004f4ea89b5d68fa5c52b2130ece0fc48 SHA512 e97d2b29326a12c2f5a7e2d997997c95a814fc127097bfd0786d2388ffec43a5a5bca05d5c4956fed6833b5aee84913cc2a275f56712a66651d3993ae0a46cb9 DIST mechanize-2.10.1.gem 144384 BLAKE2B 94782fec4f214bdea411385f58da01cdc2060a381d319748c6307913a38c4a8f68626f118e354b96c2cd2039598879904ac2c140fdb2752cb0c3c68acb20af0c SHA512 553768769c49708361ce55c84e8a78aeac05dc9aa872e03f706c18be86b9ce5cfdacf3d41fbd64b8b980fc8962b9e2aa5cc0eef512793b6615281d253393c431 DIST mechanize-2.11.0.gem 144896 BLAKE2B d9b3c9579b6a608257275a0dce871278cfdfb9822130afba25d41be14e5b9ae0f3208893a888ace856c0cd8b67cc7946e6bcc42e76bb3391ef8ec86cb270ea2f SHA512 a51c9b8b72943b88f7ff4cb15e3d2988da00f47758371c9939365ad701acb1823812e23cb5050c4d8e571bfb2c5e381eeaba795f644122b7c1d7c1a938414549 diff --git a/dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-1.patch b/dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-1.patch deleted file mode 100644 index e2b72f2d8adf..000000000000 --- a/dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-1.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 762df0c71705d1c054aca4abd95a638774a47242 Mon Sep 17 00:00:00 2001 -From: Mike Dalessio <mike.dalessio@gmail.com> -Date: Wed, 7 Jun 2023 10:30:37 -0400 -Subject: [PATCH] test: work around libxml2 encoding changes - -versions 2.11.0..2.11.4 do not recover from encoding errors. upcoming -release will change the encoding of the resulting doc as a result of -recovery changes in libxml2. - -See https://gitlab.gnome.org/GNOME/libxml2/-/issues/543 for more -context. ---- - test/test_mechanize_page_link.rb | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/test/test_mechanize_page_link.rb b/test/test_mechanize_page_link.rb -index 5e77dcc0..988328cc 100644 ---- a/test/test_mechanize_page_link.rb -+++ b/test/test_mechanize_page_link.rb -@@ -1,5 +1,7 @@ - # coding: utf-8 - -+puts "Nokogiri::VERSION_INFO: #{Nokogiri::VERSION_INFO}" -+ - require 'mechanize/test_case' - - class TestMechanizePageLink < Mechanize::TestCase -@@ -111,11 +113,15 @@ def test_encoding_charset_after_title - def test_encoding_charset_after_title_bad - skip_if_nkf_dependency - -+ # https://gitlab.gnome.org/GNOME/libxml2/-/issues/543 -+ skip if Nokogiri.uses_libxml?([">= 2.11.0", "<= 2.11.4"]) -+ expected_encoding = Nokogiri.uses_libxml?("< 2.11.0") ? 'UTF-8' : 'Shift_JIS' -+ - page = util_page UTF8 - - assert_equal false, page.encoding_error? - -- assert_equal 'UTF-8', page.encoding -+ assert_equal expected_encoding, page.encoding - end - - def test_encoding_charset_after_title_double_bad -@@ -131,6 +137,10 @@ def test_encoding_charset_after_title_double_bad - def test_encoding_charset_bad - skip_if_nkf_dependency - -+ # https://gitlab.gnome.org/GNOME/libxml2/-/issues/543 -+ skip if Nokogiri.uses_libxml?([">= 2.11.0", "<= 2.11.4"]) -+ expected_encoding = Nokogiri.uses_libxml?("< 2.11.0") ? 'UTF-8' : 'Shift_JIS' -+ - page = util_page "<title>#{UTF8_TITLE}</title>" - page.encodings.replace %w[ - UTF-8 -@@ -139,7 +149,7 @@ def test_encoding_charset_bad - - assert_equal false, page.encoding_error? - -- assert_equal 'UTF-8', page.encoding -+ assert_equal expected_encoding, page.encoding - end - - def test_encoding_meta_charset diff --git a/dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-2.patch b/dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-2.patch deleted file mode 100644 index 3fcd8a270b16..000000000000 --- a/dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-2.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0ba09f46be6f1ce4adb94baca9867ed769f6535a Mon Sep 17 00:00:00 2001 -From: Mike Dalessio <mike.dalessio@gmail.com> -Date: Fri, 11 Aug 2023 09:29:06 -0400 -Subject: [PATCH] test: work around libxml2 encoding changes - -Related to 762df0c7, we're seeing the upstream fixes did not ship in -v2.11.5 so let's change the version test to assume it won't land until -v2.12.0. ---- - test/test_mechanize_page_link.rb | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/test/test_mechanize_page_link.rb b/test/test_mechanize_page_link.rb -index 988328cc..04294420 100644 ---- a/test/test_mechanize_page_link.rb -+++ b/test/test_mechanize_page_link.rb -@@ -114,7 +114,7 @@ def test_encoding_charset_after_title_bad - skip_if_nkf_dependency - - # https://gitlab.gnome.org/GNOME/libxml2/-/issues/543 -- skip if Nokogiri.uses_libxml?([">= 2.11.0", "<= 2.11.4"]) -+ skip if Nokogiri.uses_libxml?([">= 2.11.0", "< 2.12.0"]) - expected_encoding = Nokogiri.uses_libxml?("< 2.11.0") ? 'UTF-8' : 'Shift_JIS' - - page = util_page UTF8 -@@ -138,7 +138,7 @@ def test_encoding_charset_bad - skip_if_nkf_dependency - - # https://gitlab.gnome.org/GNOME/libxml2/-/issues/543 -- skip if Nokogiri.uses_libxml?([">= 2.11.0", "<= 2.11.4"]) -+ skip if Nokogiri.uses_libxml?([">= 2.11.0", "< 2.12.0"]) - expected_encoding = Nokogiri.uses_libxml?("< 2.11.0") ? 'UTF-8' : 'Shift_JIS' - - page = util_page "<title>#{UTF8_TITLE}</title>" |