pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/x11/qt5-qtwebkit



Module Name:    pkgsrc
Committed By:   taca
Date:           Wed May 21 16:47:21 UTC 2025

Modified Files:
        pkgsrc/x11/qt5-qtwebkit: Makefile distinfo
Added Files:
        pkgsrc/x11/qt5-qtwebkit/patches:
            patch-Source_JavaScriptCore_offlineasm_parser.rb

Log Message:
x11/qt5-qtwebkit: remove reference to ruby31

Remove RUBY_VERSIONS_ACCEPTED line by adding patch to
Source/JavaScriptCore/offlineasm/parser.rb, tested on pkgsrc-2025Q1
branch.

Still this package is broken but remove requirement for Ruby 3.1 now.


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 pkgsrc/x11/qt5-qtwebkit/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/x11/qt5-qtwebkit/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_offlineasm_parser.rb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qtwebkit/Makefile
diff -u pkgsrc/x11/qt5-qtwebkit/Makefile:1.133 pkgsrc/x11/qt5-qtwebkit/Makefile:1.134
--- pkgsrc/x11/qt5-qtwebkit/Makefile:1.133      Sun Apr 27 07:32:52 2025
+++ pkgsrc/x11/qt5-qtwebkit/Makefile    Wed May 21 16:47:21 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.133 2025/04/27 07:32:52 wiz Exp $
+# $NetBSD: Makefile,v 1.134 2025/05/21 16:47:21 taca Exp $
 
 QTWKVERSION=   5.212.0-alpha4
 DISTNAME=      qtwebkit-${QTWKVERSION}
@@ -31,9 +31,6 @@ CXXFLAGS+=            -DU_HIDE_DRAFT_API
 
 BROKEN=                "Does not support icu 77"
 
-# Source/JavaScriptCore/offlineasm/parser.rb:587:in `block in parseSequence': undefined method `=~'
-RUBY_VERSIONS_ACCEPTED=                31
-
 CMAKE_CONFIGURE_ARGS+= -DPORT=Qt
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
 CMAKE_CONFIGURE_ARGS+= -DENABLE_API_TESTS=OFF

Index: pkgsrc/x11/qt5-qtwebkit/distinfo
diff -u pkgsrc/x11/qt5-qtwebkit/distinfo:1.36 pkgsrc/x11/qt5-qtwebkit/distinfo:1.37
--- pkgsrc/x11/qt5-qtwebkit/distinfo:1.36       Fri Jan 24 11:54:37 2025
+++ pkgsrc/x11/qt5-qtwebkit/distinfo    Wed May 21 16:47:21 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2025/01/24 11:54:37 wiz Exp $
+$NetBSD: distinfo,v 1.37 2025/05/21 16:47:21 taca Exp $
 
 BLAKE2s (qtwebkit-5.212.0-alpha4.tar.xz) = 20858db08c7d297037d3ced34e441d4b657325c406b475e4e76dd367dc9c500c
 SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
@@ -13,6 +13,7 @@ SHA1 (patch-Source_JavaScriptCore_genera
 SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 2b7dba0d0e87ed96c4d7de6ddb5833209cfe51b5
 SHA1 (patch-Source_JavaScriptCore_jit_ThunkGenerators.cpp) = f0ca56e4b4060c0a8d756289d7c25d1ead6b07be
 SHA1 (patch-Source_JavaScriptCore_jsc.cpp) = 796ce0232f1a833757b2e7ca5c910fac75f783ad
+SHA1 (patch-Source_JavaScriptCore_offlineasm_parser.rb) = b8d51873ed5fa5196987257a44e4d21da090a908
 SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = 94c139413eecb875bba98c7749bba24cfcc16632
 SHA1 (patch-Source_Qt5WebKitConfig.cmake.in) = c8573e02a10064e709bea4dfe053d58d08d048a0
 SHA1 (patch-Source_ThirdParty_ANGLE_src_common_mathutil.h) = 4f7c36cf3770d35650666f9820240f88f25fe843

Added files:

Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_offlineasm_parser.rb
diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_offlineasm_parser.rb:1.1
--- /dev/null   Wed May 21 16:47:22 2025
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_offlineasm_parser.rb    Wed May 21 16:47:21 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_JavaScriptCore_offlineasm_parser.rb,v 1.1 2025/05/21 16:47:21 taca Exp $
+
+Make it work with Ruby 3.2 and later.
+
+--- Source/JavaScriptCore/offlineasm/parser.rb.orig    2025-05-21 16:24:45.640169260 +0000
++++ Source/JavaScriptCore/offlineasm/parser.rb
+@@ -584,7 +584,7 @@ class Parser
+         firstCodeOrigin = @tokens[@idx].codeOrigin
+         list = []
+         loop {
+-            if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final)
++            if (@idx == @tokens.length and not final) or (final and @tokens[@idx].is_a? Token and @tokens[@idx] =~ final)
+                 break
+             elsif @tokens[@idx].is_a? Annotation
+                 # This is the only place where we can encounter a global



Home | Main Index | Thread Index | Old Index