[gentoo-commits] repo/gentoo:master commit in: dev-ruby/mechanize/files/

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/mechanize/files/

[Patrice Clement]

commit:     f329429be76f6262fe681e117cdb657503d964f2
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Sep 26 16:19:59 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 12:00:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f329429b

dev-ruby/mechanize: remove unused patch.

Closes: https://github.com/gentoo/gentoo/pull/2417

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../files/mechanize-2.6.0-libxml290.patch          | 34 ----------------------
 1 file changed, 34 deletions(-)

diff --git a/dev-ruby/mechanize/files/mechanize-2.6.0-libxml290.patch b/dev-ruby/mechanize/files/mechanize-2.6.0-libxml290.patch
deleted file mode 100644
index 0b5409f..00000000
--- a/dev-ruby/mechanize/files/mechanize-2.6.0-libxml290.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit 43f3b631484a2c0178e6699584471dedd598eca3
-Author: Lee Jarvis <ljjarvis@gmail.com>
-Date:   Mon May 6 19:39:25 2013 +0100
-
-    Ensure we prefix xpath with // for searching entire document
-    
-    Tests prior to this commit passed because libxml2 was not so
-    strict. Since upgrading to 2.9.0 this issue has been revealed.
-    The former test should have been written with this in mind.
-    
-    Steps to reproduce (on OSX with Homebrew installed):
-    
-      gem uninstall nokogiri
-      brew install libxml2
-      LDFLAGS="-L/usr/local/opt/libxml2/lib" \
-        CPPFLAGS="-I/usr/local/opt/libxml2/include" \
-        gem install nokogiri
-    
-    closes #308
-
-diff --git a/test/test_mechanize_xml_file.rb b/test/test_mechanize_xml_file.rb
-index 58eb67c..bbe486c 100644
---- a/test/test_mechanize_xml_file.rb
-+++ b/test/test_mechanize_xml_file.rb
-@@ -23,7 +23,7 @@ class TestMechanizeXmlFile < Mechanize::TestCase
-   end
- 
-   def test_at
--    assert_equal 'Perl', @xml.at('language[2]').text
-+    assert_equal 'Perl', @xml.at('//language[2]').text
-   end
- 
- end
-\ No newline at end of file

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/mechanize/files/

[Hans de Graaff]

commit:     ab9cd7f7b81120efc3d8573e6517450f4696475a
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 16 07:04:48 2023 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 07:05:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab9cd7f7

dev-ruby/mechanize/files: add missing patches

Closes: https://bugs.gentoo.org/914264
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 .../files/mechanize-2.9.1-libxml2-1.patch          | 64 ++++++++++++++++++++++
 .../files/mechanize-2.9.1-libxml2-2.patch          | 34 ++++++++++++
 2 files changed, 98 insertions(+)

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
new file mode 100644
index 000000000000..e2b72f2d8adf
--- /dev/null
+++ b/dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-1.patch
@@ -0,0 +1,64 @@
+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
new file mode 100644
index 000000000000..3fcd8a270b16
--- /dev/null
+++ b/dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-2.patch
@@ -0,0 +1,34 @@
+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>"

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/mechanize/files/

[Joonas Niilola]

commit:     6a7023023ff7be75e6c58fd3c8110776a0dc717c
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Aug 28 07:12:40 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 07:25:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a702302

dev-ruby/mechanize: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/mechanize-2.9.1-libxml2-1.patch          | 64 ----------------------
 .../files/mechanize-2.9.1-libxml2-2.patch          | 34 ------------
 2 files changed, 98 deletions(-)

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>"