Split UTF8-CLI patch into ruby-core and ruby/spec

For easier patching of ruby/spec.

Author: larskanis

mingw-w64-ruby-head/0015-Windows-Change-command-line-interface-to-UTF-8.patch

@@ -87,7 +87,7 @@ index f2bf3a08e5..98f424c3d0 100644
    before :each do
 -    @default = @method == :locale ? Encoding.find('locale') : Encoding::UTF_8
 +    @default = if @method == :locale &&
-+        ( platform_is_not(:windows) || ruby_version_is(""..."3.4") )
++        ( platform_is_not(:windows) || ruby_version_is(""..."4.0") )
 +    then
 +      Encoding.find('locale')
 +    else

mingw-w64-ruby40/0015-Windows-Change-command-line-interface-to-UTF-8.patch

@@ -77,52 +77,3 @@ index 61de5cdcbe..e79d4b69da 100644
      }
      else {
          enc = rb_utf8_encoding();
-diff --git a/spec/ruby/language/magic_comment_spec.rb b/spec/ruby/language/magic_comment_spec.rb
-index f2bf3a08e5..98f424c3d0 100644
---- a/spec/ruby/language/magic_comment_spec.rb
-+++ b/spec/ruby/language/magic_comment_spec.rb
-@@ -3,7 +3,13 @@
- # See core/kernel/eval_spec.rb for more magic comments specs for eval()
- describe :magic_comments, shared: true do
-   before :each do
--    @default = @method == :locale ? Encoding.find('locale') : Encoding::UTF_8
-+    @default = if @method == :locale &&
-+        ( platform_is_not(:windows) || ruby_version_is(""..."3.4") )
-+    then
-+      Encoding.find('locale')
-+    else
-+      Encoding::UTF_8
-+    end
-   end
- 
-   it "are optional" do
-diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
-index ac4b5870eb..fac0901fdf 100644
---- a/test/ruby/test_rubyoptions.rb
-+++ b/test/ruby/test_rubyoptions.rb
-@@ -1082,19 +1082,11 @@ def test_command_line_glob_nonascii
- 
-     def test_command_line_progname_nonascii
-       bug10555 = '[ruby-dev:48752] [Bug #10555]'
--      name = expected = nil
--      unless (0x80..0x10000).any? {|c|
--               name = c.chr(Encoding::UTF_8)
--               expected = name.encode("locale") rescue nil
--             }
--        omit "can't make locale name"
--      end
--      name << ".rb"
--      expected << ".rb"
-+      name = "\u{20ac}.rb"
-       with_tmpchdir do |dir|
-         open(name, "w") {|f| f.puts "puts File.basename($0)"}
--        assert_in_out_err([name], "", [expected], [],
--                          bug10555, encoding: "locale")
-+        assert_in_out_err([name], "", [name], [],
-+                          bug10555, encoding: "utf-8")
-       end
-     end
- 
--- 
-2.49.0
-

mingw-w64-ruby40/0016-Windows-Change-command-line-interface-to-UTF-8-specs.patch

@@ -0,0 +1,49 @@
+diff --git a/spec/ruby/language/magic_comment_spec.rb b/spec/ruby/language/magic_comment_spec.rb
+index f2bf3a08e5..98f424c3d0 100644
+--- a/spec/ruby/language/magic_comment_spec.rb
++++ b/spec/ruby/language/magic_comment_spec.rb
+@@ -3,7 +3,13 @@
+ # See core/kernel/eval_spec.rb for more magic comments specs for eval()
+ describe :magic_comments, shared: true do
+   before :each do
+-    @default = @method == :locale ? Encoding.find('locale') : Encoding::UTF_8
++    @default = if @method == :locale &&
++        ( platform_is_not(:windows) || ruby_version_is(""..."4.0") )
++    then
++      Encoding.find('locale')
++    else
++      Encoding::UTF_8
++    end
+   end
+ 
+   it "are optional" do
+diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
+index ac4b5870eb..fac0901fdf 100644
+--- a/test/ruby/test_rubyoptions.rb
++++ b/test/ruby/test_rubyoptions.rb
+@@ -1082,19 +1082,11 @@ def test_command_line_glob_nonascii
+ 
+     def test_command_line_progname_nonascii
+       bug10555 = '[ruby-dev:48752] [Bug #10555]'
+-      name = expected = nil
+-      unless (0x80..0x10000).any? {|c|
+-               name = c.chr(Encoding::UTF_8)
+-               expected = name.encode("locale") rescue nil
+-             }
+-        omit "can't make locale name"
+-      end
+-      name << ".rb"
+-      expected << ".rb"
++      name = "\u{20ac}.rb"
+       with_tmpchdir do |dir|
+         open(name, "w") {|f| f.puts "puts File.basename($0)"}
+-        assert_in_out_err([name], "", [expected], [],
+-                          bug10555, encoding: "locale")
++        assert_in_out_err([name], "", [name], [],
++                          bug10555, encoding: "utf-8")
+       end
+     end
+ 
+-- 
+2.49.0
+

mingw-w64-ruby40/PKGBUILD

@@ -25,6 +25,7 @@ source=("https://cache.ruby-lang.org/pub/ruby/${pkgver2%.*}/${_realname}-${pkgve
         0001-Add-C-ext-win32-dll_directory-as-an-alternative-to-f.patch
         0002-Use-autoconf-2.72.patch
         0015-Windows-Change-command-line-interface-to-UTF-8.patch
+        0016-Windows-Change-command-line-interface-to-UTF-8-specs.patch
         ruby.ico
         rubyw.ico
         placeholder.manifest.xml)
@@ -34,7 +35,8 @@ source=("https://cache.ruby-lang.org/pub/ruby/${pkgver2%.*}/${_realname}-${pkgve
 sha256sums=('a72bacee9de07283ebc19baa4ac243b193129f21aa4e168c7186fb1fe7d07fe1'
             'a50c81ab8c178689485257f8eaa70bd8184b878a798780084668f838912e2832'
             'f26122cca5e289801c0dde1f54643a960246a69691c6c8b9bccb27e536344f69'
-            '576c6dca87493d5543ce1da790aa50c9a4e86aca9ecdec34077e8e3d4b90648f'
+            'ba88fdfb5e643dfc12ca18af10e8cb19cdef420b1a887cdb5b7b5635ab33d7e1'
+            'df87d0a6711911e6bb6376046a8c724953e1cc20b9919f0ea58fdd709b016d21'
             '6c80ba2ca49840e387a08b7fedc6e7acd298ac2ec853155209efb2af20397b22'
             'c30fb04ac0e88ba634daaa811a81ea5a75027646617b895acd14df9518a4a55a'
             'c7a555d4826453efe7e33a2ebf78462b1fa665dffd7e4972143b48b1c9c71375')
@@ -45,6 +47,7 @@ prepare() {
   patch -p1 -i ${srcdir}/0001-Add-C-ext-win32-dll_directory-as-an-alternative-to-f.patch
   patch -p1 -i ${srcdir}/0002-Use-autoconf-2.72.patch
   patch -p1 -i ${srcdir}/0015-Windows-Change-command-line-interface-to-UTF-8.patch
+  patch -p1 -i ${srcdir}/0016-Windows-Change-command-line-interface-to-UTF-8-specs.patch
   autoreconf -fi
 }