Merge branch f38 into epel9-next

qt5-qtwebkit.spec

@@ -23,10 +23,10 @@
 
 Name:           qt5-%{qt_module}
 Version:        5.212.0
-Release:        0.63.%{?prerel}%{?dist}.1
+Release:        0.75%{?prerel}%{?dist}
 Summary:        Qt5 - QtWebKit components
 
-License:        LGPLv2 and BSD
+License:        LGPL-2.0-only AND BSD-3-Clause
 URL:            https://github.com/qtwebkit/qtwebkit
 Source0:        https://github.com/qtwebkit/qtwebkit/releases/download/%{qt_module}-%{version}%{?prerel_tag}/%{qt_module}-%{version}%{?prerel_tag}.tar.xz
 
@@ -36,6 +36,10 @@ Patch3:         qtwebkit-5.212.0-json.patch
 Patch4:         qtwebkit-bison37.patch
 Patch5:         qt5-qtwebkit-glib-2.68.patch
 Patch6:         qtwebkit-icu68.patch
+# From https://github.com/WebKit/WebKit/commit/c7d19a492d97f9282a546831beb918e03315f6ef
+# Ruby 3.2 removes Object#=~ completely
+Patch7:         webkit-offlineasm-warnings-ruby27.patch
+Patch8:         qtwebkit-cstdint.patch
 
 BuildRequires: make
 BuildRequires:  bison
@@ -253,8 +257,42 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)"
 
 
 %changelog
-* Fri Apr 29 2022 Troy Dawson <tdawson@redhat.com> - 5.212.0-0.63.alpha4.1
+* Wed Apr 12 2023 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.75alpha4
-- Disable debug packages.  It breaks x86_64 on epel9-next.
+- Rebuild (qt5)
+
+* Mon Feb 20 2023 Than Ngo <than@redhat.com> - 5.212.0-0.74alpha4
+- migrated to SPDX license
+- fixed FTBFS
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.73alpha4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jan 06 2023 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.72alpha4
+- Rebuild (qt5)
+
+* Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 5.212.0-0.71alpha4
+- Rebuild for ICU 72
+
+* Mon Oct 31 2022 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.70alpha4
+- Rebuild (qt5)
+
+* Tue Oct 18 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.212.0-0.69.alpha4
+- Patch for offlineasm to support ruby 3.2 wrt Object#=~ removal
+
+* Wed Sep 21 2022 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.68.alpha4
+- Rebuild (qt5)
+
+* Tue Aug 02 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 5.212.0-0.67.alpha4
+- Rebuilt for ICU 71.1
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.66.alpha4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jul 15 2022 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.65.alpha4
+- Rebuild (qt5)
+
+* Thu May 19 2022 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.64.alpha4
+- Rebuild (qt5)
 
 * Tue Mar 08 2022 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.63.alpha4
 - Rebuild (qt5)

qtwebkit-cstdint.patch

@@ -0,0 +1,11 @@
+diff -up qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h.me qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h
+--- qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h.me	2023-02-20 15:40:04.045911245 +0100
++++ qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h	2023-02-20 15:40:39.038549787 +0100
+@@ -16,6 +16,7 @@
+ #include <algorithm>
+ #include <string.h>
+ #include <stdlib.h>
++#include <cstdint>
+ 
+ namespace gl
+ {

webkit-offlineasm-warnings-ruby27.patch

@@ -0,0 +1,46 @@
+From c7d19a492d97f9282a546831beb918e03315f6ef Mon Sep 17 00:00:00 2001
+From: Adrian Perez de Castro <aperez@igalia.com>
+Date: Wed, 15 Jan 2020 22:15:38 +0000
+Subject: [PATCH] Offlineasm warnings with newer Ruby versions
+ https://bugs.webkit.org/show_bug.cgi?id=206233
+
+Reviewed by Yusuke Suzuki.
+
+Avoid a warning about using Object#=~ on Annotation instances, which
+has been deprecated in Ruby 2.7.
+
+* offlineasm/parser.rb: Swap checks to prevent applying the =~ operator
+to Annotation instances, which do not define it.
+
+
+Canonical link: https://commits.webkit.org/219400@main
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254637 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/JavaScriptCore/ChangeLog            | 13 +++++++++++++
+ Source/JavaScriptCore/offlineasm/parser.rb |  6 +++---
+ 2 files changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/Source/JavaScriptCore/offlineasm/parser.rb b/Source/JavaScriptCore/offlineasm/parser.rb
+index 791c81a9868d..f14c873e2dbd 100644
+--- a/Source/JavaScriptCore/offlineasm/parser.rb
++++ b/Source/JavaScriptCore/offlineasm/parser.rb
+@@ -628,9 +628,7 @@ def parseSequence(final, comment)
+         firstCodeOrigin = @tokens[@idx].codeOrigin
+         list = []
+         loop {
+-            if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final)
+-                break
+-            elsif @tokens[@idx].is_a? Annotation
++            if @tokens[@idx].is_a? Annotation
+                 # This is the only place where we can encounter a global
+                 # annotation, and hence need to be able to distinguish between
+                 # them.
+@@ -644,6 +642,8 @@ def parseSequence(final, comment)
+                 list << Instruction.new(codeOrigin, annotationOpcode, [], @tokens[@idx].string)
+                 @annotation = nil
+                 @idx += 2 # Consume the newline as well.
++            elsif (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final)
++                break
+             elsif @tokens[@idx] == "\n"
+                 # ignore
+                 @idx += 1