On Sat, Oct 5, 2024 at 10:03 AM Jeremy Evans <jeremy@openbsd.org> wrote:

> This allows building qtwebkit the current default ports version of
> Ruby.  This is a necessary step to remove Ruby 3.1.
>
> No RDEP on ruby means this is only a build system change, not a
> package change, so no bump is needed.
>
> OKs?
>

Ping.

Thanks,
> Jeremy
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
> diff -u -p -u -p -r1.46 Makefile
> --- Makefile    10 Jul 2024 11:22:19 -0000      1.46
> +++ Makefile    4 Oct 2024 22:56:18 -0000
> @@ -53,7 +53,6 @@ ALL_TARGET =
>
>  MODPY_RUNDEP =         No
>  MODRUBY_RUNDEP =       No
> -MODRUBY_REV =          3.1
>
>  BUILD_DEPENDS =                devel/bison \
>                         devel/gperf \
> Index: patches/patch-Source_JavaScriptCore_offlineasm_parser_rb
> ===================================================================
> RCS file: patches/patch-Source_JavaScriptCore_offlineasm_parser_rb
> diff -N patches/patch-Source_JavaScriptCore_offlineasm_parser_rb
> --- /dev/null   1 Jan 1970 00:00:00 -0000
> +++ patches/patch-Source_JavaScriptCore_offlineasm_parser_rb    4 Oct 2024
> 23:45:34 -0000
> @@ -0,0 +1,28 @@
> +Work with Ruby 3.2+
> +
> +Index: Source/JavaScriptCore/offlineasm/parser.rb
> +--- Source/JavaScriptCore/offlineasm/parser.rb.orig
> ++++ Source/JavaScriptCore/offlineasm/parser.rb
> +@@ -28,6 +28,22 @@ require "pathname"
> + require "registers"
> + require "self_hash"
> +
> ++class Object
> ++  def =~(other)
> ++    false
> ++  end
> ++end
> ++
> ++class String
> ++  def =~(other)
> ++    if other.is_a?(Regexp)
> ++      other =~ self
> ++    else
> ++      super
> ++    end
> ++  end
> ++end
> ++
> + class SourceFile
> +     @@fileNames = []
> +
>
>