Compare commits

..

No commits in common. 'i10ce' and 'i9f' have entirely different histories.
i10ce ... i9f

2
.gitignore vendored

@ -1 +1 @@
SOURCES/webkitgtk-2.46.5.tar.xz SOURCES/webkitgtk-2.44.3.tar.xz

@ -1 +1 @@
98f9cbfd8e801d74d0d2b69c3bdd59b017cf05fe SOURCES/webkitgtk-2.46.5.tar.xz c9bcb2097d8f774b2c64ca650a4f8a6365ff54f6 SOURCES/webkitgtk-2.44.3.tar.xz

@ -0,0 +1,48 @@
From 9140ce712aa87091613874d802787ab476be0e39 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Wed, 14 Aug 2024 14:58:05 -0500
Subject: [PATCH] Revert "Cherry-pick 272448.770@safari-7618-branch
(6d311cd7fefc). https://bugs.webkit.org/show_bug.cgi?id=271175"
https://bugs.webkit.org/show_bug.cgi?id=278113
This reverts commit 279c9d7963182cc35cf4e0bfebe87df2d83eaef8.
This broke wasm, and I don't know how to fix it.
Canonical link: https://commits.webkit.org/274313.373@webkitglib/2.44
---
.../stress/many-calls-results-on-stack.js | 39 -------------------
Source/JavaScriptCore/wasm/WasmBBQJIT.cpp | 19 ---------
2 files changed, 58 deletions(-)
delete mode 100644 JSTests/wasm/stress/many-calls-results-on-stack.js
diff --git a/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp b/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp
index 9049865e8ce7..3f142cf5e90f 100644
--- a/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp
+++ b/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp
@@ -3958,25 +3958,6 @@ void BBQJIT::returnValuesFromCall(Vector<Value, N>& results, const FunctionSigna
ASSERT(m_validFPRs.contains(returnLocation.asFPR(), Width::Width128));
m_fprSet.add(returnLocation.asFPR(), Width::Width128);
}
- } else {
- ASSERT(returnLocation.isStackArgument());
- // FIXME: Ideally, we would leave these values where they are but a subsequent call could clobber them before they are used.
- // That said, stack results are very rare so this isn't too painful.
- // Even if we did leave them where they are, we'd need to flush them to their canonical location at the next branch otherwise
- // we could have something like (assume no result regs for simplicity):
- // call (result i32 i32) $foo
- // if (result i32) // Stack: i32(StackArgument:8) i32(StackArgument:0)
- // // Stack: i32(StackArgument:8)
- // else
- // call (result i32 i32) $bar // Stack: i32(StackArgument:8) we have to flush the stack argument to make room for the result of bar
- // drop // Stack: i32(Stack:X) i32(StackArgument:8) i32(StackArgument:0)
- // drop // Stack: i32(Stack:X) i32(StackArgument:8)
- // end
- // return // Stack i32(*Conflicting locations*)
-
- Location canonicalLocation = canonicalSlot(result);
- emitMoveMemory(result.type(), returnLocation, canonicalLocation);
- returnLocation = canonicalLocation;
}
}
bind(result, returnLocation);

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEAToBJ6ycZbNP+mJSbBAJtpOXU5MFAma7BpQACgkQbBAJtpOX
U5PeIxAAhv6cl4WsiFyPuNQdzik1GdxtSuFxpBW9SokOxFPn4zW/sMIkke20q1et
RhGwKskkuOEgavV/2grC07d8peFbsse6zTeerZECRaB+Saj7ZOWoZQoDbCTxWjzi
yoxsziwIJA4LDdhqxV8TRSCl3bLy+uFQkUfNX1JJot9bMze+9lUjxJ/hAglCUjP8
WIJdQ1mE+cJguBHJMfdZbDINLywRjesaLXAvTCmpnn3mn0GXMbCQM+W+GCybwhMB
1dl8eFEfcvAhUe85mHJNW3WmYRzvquTMuFuLzU8b1U1/6+LQc+IOXAZEpkP9ztSn
VItLwPnHJ/4g5KY+gUonMxZ1LMhTwiu/ga41Yez0sZftkC6tgIPIldaTY/tjeNLh
C5GnMSyRTJ7d2ywLJSdzCIGkwhOJ7oHArGxbpzCWft3rrU8SbvQd3dGOMip1iniN
ewdMyoqZQgzN51BRUklhjoBCaUkcVbgYr6qfLZiU42kR4RWgrTx/s//naCM4peQe
8vGeRlF9zpsGw3ivCJBNjqk9SrqcPQ2i52lgKs28DkVy13duuQwKEMa+/Tv7eH60
wNdKSRjeA81DLZkuyX5yJOEJ1pru1HiS4sdP112dPb1HajVhOehZJc7a8b9ohOH5
go2lIxnJjZOXRHM/JwtTcLKsnfna1m6yzNGdOHNcLKPJodHcpXY=
=jHOh
-----END PGP SIGNATURE-----

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEAToBJ6ycZbNP+mJSbBAJtpOXU5MFAmdil6QACgkQbBAJtpOX
U5Nthg//RtCZwZ0GMb77nKhX+4lkb3aEghkx0Lug4akvISFIVZavgK3VWPHObV+T
rA0OqDnlTWEDGkOCLvlmSBk0y9wpT5kdqr2vSNhcPPaZtE2dYLbSirWurkPVpq5u
bsLlkp6Yf6/MGEt3sSbH9OVIfu++hkMrx136wuKe9NU/gP0NTiNz5T3Yn9OvtcaF
g2FX2tAgiBXhXPvKGAWz4HiQBEEjhTtksxhQkC3gHkGXINpPTxH3wj2Tn0gJOb1u
FBLZoEFKD0eklspl0Z0PyWReyn/WvEHTy41kCRENWACekZZUM4DS5fPW3lrEY5iu
260NfK1cQ/T+RcBj3/btm0852PgWdUH81lQjKI0iDTdgvjEQQqkgC8LH4w2GW/V8
TpkT/dghgqrVmlL2ZDrDcFurcieaOEkATqavuUzAWmsLQrh/+4HF1Djoz5yDakhT
gogjkzV53Nj8e2atDoMA+vMLXYIXM0hRQ/MGyJF2lfMzTEgkfGtMfOTwMvFaLhGr
PcwGMWDH2W6glQj3/gdJwr0tn4nHsLpxL60i/aaP3yHbncj/tkqY9rhA76kHVj1M
Z7uSwspFG6J3ZtYT9kv1MbNeODdOw0q2erZhE5BpDMJuJ4m1qbsE3TqiED5C6jSg
IMpYfteEZ4CSQYMmzFl8LrHU71lRyjeTfsJTA0CvHBBGLHsoz4o=
=uvXQ
-----END PGP SIGNATURE-----

@ -1,8 +1,8 @@
## START: Set by rpmautospec ## START: Set by rpmautospec
## (rpmautospec version 0.7.3) ## (rpmautospec version 0.6.5)
## RPMAUTOSPEC: autorelease, autochangelog ## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: %define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 1; release_number = 2;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1); print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
@ -15,50 +15,28 @@
mkdir -p _license_files ; \ mkdir -p _license_files ; \
cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
# No libmanette in RHEL
%if !0%{?rhel}
%global with_gamepad 1
%endif
%global _lto_cflags %{nil}
# Build documentation by default (use `rpmbuild --without docs` to override it). # Build documentation by default (use `rpmbuild --without docs` to override it).
# This is used by Coverity. Coverity injects custom compiler warnings, but # This is used by Coverity. Coverity injects custom compiler warnings, but
# any warning during WebKit docs build is fatal! # any warning during WebKit docs build is fatal!
%bcond_without docs %bcond_without docs
# Clang is preferred: https://skia.org/docs/user/build/#supported-and-preferred-compilers # https://fedoraproject.org/wiki/Changes/Remove_webkit2gtk-4.0_API_Version
%global toolchain clang # ELN (RHEL 10) no longer needs 4.0
%global api40 0
# We run out of memory if building with LTO enabled on i686.
%ifarch %{ix86}
%global _lto_cflags %{nil}
%endif
Name: webkitgtk Name: webkitgtk
Version: 2.46.5 Version: 2.44.3
Release: %autorelease Release: %autorelease.inferit
Summary: GTK web content engine library Summary: GTK web content engine library
# Source/bmalloc/bmalloc/*.h is BSD-2-Clause License: LGPLv2
# Source/bmalloc/bmalloc/CryptoRandom.cpp is ISC
# Source/bmalloc/bmalloc/valgrind.h is is bzip2-1.0.6
# Source/bmalloc/libpas/src/test/RedBlackTreeTests.cpp is BSD-3-Clause
# Source/JavaScriptCore/config.h is LGPL-2.0-or-later
# Source/JavaScriptCore/b3/B3ComputeDivisionMagic.h is NCSA
# Source/JavaScriptCore/disassembler/zydis/* is MIT
# Source/JavaScriptCore/runtime/JSDateMath.h is MPL 1.1/GPL 2.0/LGPL 2.1
# Source/JavaScriptCore/runtime/MathCommon.cpp is SunPro
# Source/JavaScriptCore/ucd/CaseFolding.txt is Unicode-TOU
# Source/ThirdParty/ANGLE/include/CL/cl_d3d10.h is Apache-2.0
# Source/ThirdParty/ANGLE/include/GLES/gl.h is MIT-Khronos (not on list see https://github.com/spdx/license-list-XML/issues/2017)
# Source/ThirdParty/ANGLE/src/compiler/preprocessor/preprocessor_tab_autogen.cpp is GPL-3.0-or-later WITH Bison-exception-2.2
# Source/ThirdParty/ANGLE/tools/flex-bison/third_party/m4sugar/m4sugar.m4 is GPL-3.0-only WITH Autoconf-exception-3.0
# Source/ThirdParty/pdfjs/web/images/annotation-paperclip.svg is MPL-2.0i
# Source/ThirdParty/pdfjs/web/standard_fonts/LICENSE_LIBERATION is OFL-1.1
# Source/ThirdParty/xdgmime/ is AFL-2.0 GPL-2.0-or-later
# Source/WebCore/dom/PseudoElement.h is BSD-Source-Code
# Source/WebCore/dom/SecurityContext.cpp is BSD-2-Clause-Views
# Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp is LGPL-2.1-or-later
# Source/WTF/LICENSE-libc++.txt is NCSA OR MIT
# Source/WTF/LICENSE-LLVM.txt is Apache-2.0 WITH LLVM-exception
# Source/WTF/icu/LICENSE is ICU
# Source/WTF/wtf/Markable.h is BSL-1.0
# The license tag and above comment is up to date as of WebKitGTK 2.42.2.
License: LGPL-2.1-only AND BSD-2-Clause AND BSD-3-Clause AND ISC AND bzip2-1.0.6 AND NCSA AND MIT AND GPL-2.0-only AND MPL-1.1 AND SunPro AND Unicode-TOU AND Apache-2.0 AND GPL-3.0-or-later WITH Bison-exception-2.2 AND GPL-3.0-only WITH Autoconf-exception-3.0 AND MPL-2.0 AND OFL-1.1 AND (AFL-2.0 GPL-2.0-or-later) AND BSD-Source-Code AND BSD-2-Clause-Views AND LGPL-2.1-or-later AND (NCSA OR MIT) AND Apache-2.0 WITH LLVM-exception AND ICU AND BSL-1.0
URL: https://www.webkitgtk.org/ URL: https://www.webkitgtk.org/
Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
@ -67,10 +45,19 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
# $ gpg --export --export-options export-minimal 013A0127AC9C65B34FFA62526C1009B693975393 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg # $ gpg --export --export-options export-minimal 013A0127AC9C65B34FFA62526C1009B693975393 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
Source2: webkitgtk-keys.gpg Source2: webkitgtk-keys.gpg
# https://bugs.webkit.org/show_bug.cgi?id=278113
Patch0: fix-wasm.patch
ExcludeArch: %{ix86}
BuildRequires: bison BuildRequires: bison
BuildRequires: bubblewrap BuildRequires: bubblewrap
BuildRequires: clang
BuildRequires: cmake # We need cmake new version cmake and macro %%limit_build
# to avoid missing debuginfo files
BuildRequires: cmake >= 3.28
BuildRequires: epel-rpm-macros >= 9-14.el9.inferit
BuildRequires: flex BuildRequires: flex
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: gettext BuildRequires: gettext
@ -82,10 +69,10 @@ BuildRequires: hyphen-devel
BuildRequires: libatomic BuildRequires: libatomic
BuildRequires: ninja-build BuildRequires: ninja-build
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: perl(bigint)
BuildRequires: perl(English) BuildRequires: perl(English)
BuildRequires: perl(FindBin) BuildRequires: perl(FindBin)
BuildRequires: perl(JSON::PP) BuildRequires: perl(JSON::PP)
BuildRequires: perl(bigint)
BuildRequires: python3 BuildRequires: python3
BuildRequires: ruby BuildRequires: ruby
BuildRequires: rubygems BuildRequires: rubygems
@ -120,13 +107,18 @@ BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libseccomp)
BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libsecret-1)
%if %{with api40}
BuildRequires: pkgconfig(libsoup-2.4)
%endif
BuildRequires: pkgconfig(libsoup-3.0) BuildRequires: pkgconfig(libsoup-3.0)
BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(libtasn1) BuildRequires: pkgconfig(libtasn1)
BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libwebp) = 1.2.0
BuildRequires: pkgconfig(libwoff2dec) BuildRequires: pkgconfig(libwoff2dec)
BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(libxslt)
%if 0%{?with_gamepad}
BuildRequires: pkgconfig(manette-0.2) BuildRequires: pkgconfig(manette-0.2)
%endif
BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(upower-glib)
BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-client)
@ -154,7 +146,6 @@ Recommends: gstreamer1-plugins-good
Recommends: xdg-desktop-portal-gtk Recommends: xdg-desktop-portal-gtk
Provides: bundled(angle) Provides: bundled(angle)
Provides: bundled(pdfjs) Provides: bundled(pdfjs)
Provides: bundled(skia)
Provides: bundled(xdgmime) Provides: bundled(xdgmime)
Obsoletes: webkit2gtk5.0 < %{version}-%{release} Obsoletes: webkit2gtk5.0 < %{version}-%{release}
@ -174,13 +165,35 @@ Recommends: gstreamer1-plugins-good
Recommends: xdg-desktop-portal-gtk Recommends: xdg-desktop-portal-gtk
Provides: bundled(angle) Provides: bundled(angle)
Provides: bundled(pdfjs) Provides: bundled(pdfjs)
Provides: bundled(skia)
Provides: bundled(xdgmime) Provides: bundled(xdgmime)
%description -n webkit2gtk4.1 %description -n webkit2gtk4.1
WebKitGTK is the port of the WebKit web rendering engine to the WebKitGTK is the port of the WebKit web rendering engine to the
GTK platform. This package contains WebKitGTK for GTK 3 and libsoup 3. GTK platform. This package contains WebKitGTK for GTK 3 and libsoup 3.
%if %{with api40}
%package -n webkit2gtk4.0
Summary: WebKitGTK for GTK 3 and libsoup 2
Requires: javascriptcoregtk4.0%{?_isa} = %{version}-%{release}
Requires: bubblewrap
Requires: xdg-dbus-proxy
Recommends: geoclue2
Recommends: gstreamer1-plugins-bad-free
Recommends: gstreamer1-plugins-good
Recommends: xdg-desktop-portal-gtk
Provides: bundled(angle)
Provides: bundled(pdfjs)
Provides: bundled(xdgmime)
Obsoletes: webkitgtk4 < %{version}-%{release}
Provides: webkitgtk4 = %{version}-%{release}
Obsoletes: webkit2gtk3 < %{version}-%{release}
Provides: webkit2gtk3 = %{version}-%{release}
%description -n webkit2gtk4.0
WebKitGTK is the port of the WebKit web rendering engine to the
GTK platform. This package contains WebKitGTK for GTK 3 and libsoup 2.
%endif
%package -n webkitgtk6.0-devel %package -n webkitgtk6.0-devel
Summary: Development files for webkitgtk6.0 Summary: Development files for webkitgtk6.0
Requires: webkitgtk6.0%{?_isa} = %{version}-%{release} Requires: webkitgtk6.0%{?_isa} = %{version}-%{release}
@ -202,6 +215,22 @@ Requires: javascriptcoregtk4.1-devel%{?_isa} = %{version}-%{release}
The webkit2gtk4.1-devel package contains libraries, build data, and header The webkit2gtk4.1-devel package contains libraries, build data, and header
files for developing applications that use webkit2gtk4.1. files for developing applications that use webkit2gtk4.1.
%if %{with api40}
%package -n webkit2gtk4.0-devel
Summary: Development files for webkit2gtk4.0
Requires: webkit2gtk4.0%{?_isa} = %{version}-%{release}
Requires: javascriptcoregtk4.0%{?_isa} = %{version}-%{release}
Requires: javascriptcoregtk4.0-devel%{?_isa} = %{version}-%{release}
Obsoletes: webkitgtk4-devel < %{version}-%{release}
Provides: webkitgtk4-devel = %{version}-%{release}
Obsoletes: webkit2gtk3-devel < %{version}-%{release}
Provides: webkit2gtk3-devel = %{version}-%{release}
%description -n webkit2gtk4.0-devel
The webkit2gtk4.0-devel package contains libraries, build data, and header
files for developing applications that use webkit2gtk4.0.
%endif
%if %{with docs} %if %{with docs}
%package -n webkitgtk6.0-doc %package -n webkitgtk6.0-doc
Summary: Documentation files for webkit2gtk5.0 Summary: Documentation files for webkit2gtk5.0
@ -210,15 +239,6 @@ Requires: webkitgtk6.0 = %{version}-%{release}
Obsoletes: webkit2gtk5.0-doc < %{version}-%{release} Obsoletes: webkit2gtk5.0-doc < %{version}-%{release}
Recommends: gi-docgen-fonts Recommends: gi-docgen-fonts
# Documentation/jsc-glib-4.1/fzy.js is MIT
# Documentation/jsc-glib-4.1/*.js and *css is Apache-2.0 OR GPL-3.0-or-later
# Documentation/jsc-glib-4.1/*html is BSD, LGPL-2.1
# Documentation/webkit2gtk-4.1/*html is BSD, LGPL-2.1
# Documentation/webkit2gtk-web-extension-4.1/*html is BSD, LGPL-2.1
# Documentation/webkit2gtk-web-extension-4.1/solarized* is MIT
# Documentation/webkit2gtk-web-extension-4.1/style.css is Apache-2.0 OR GPL-3.0-or-later
License: MIT AND LGPL-2.1-only AND BSD-3-Clause AND (Apache-2.0 OR GPL-3.0-or-later)
%description -n webkitgtk6.0-doc %description -n webkitgtk6.0-doc
This package contains developer documentation for webkitgtk6.0. This package contains developer documentation for webkitgtk6.0.
@ -228,17 +248,23 @@ BuildArch: noarch
Requires: webkit2gtk4.1 = %{version}-%{release} Requires: webkit2gtk4.1 = %{version}-%{release}
Recommends: gi-docgen-fonts Recommends: gi-docgen-fonts
# Documentation/jsc-glib-4.1/fzy.js is MIT
# Documentation/jsc-glib-4.1/*.js and *css is Apache-2.0 OR GPL-3.0-or-later
# Documentation/jsc-glib-4.1/*html is BSD, LGPL-2.1
# Documentation/webkit2gtk-4.1/*html is BSD, LGPL-2.1
# Documentation/webkit2gtk-web-extension-4.1/*html is BSD, LGPL-2.1
# Documentation/webkit2gtk-web-extension-4.1/solarized* is MIT
# Documentation/webkit2gtk-web-extension-4.1/style.css is Apache-2.0 OR GPL-3.0-or-later
License: MIT AND LGPL-2.1-only AND BSD-3-Clause AND (Apache-2.0 OR GPL-3.0-or-later)
%description -n webkit2gtk4.1-doc %description -n webkit2gtk4.1-doc
This package contains developer documentation for webkit2gtk4.1. This package contains developer documentation for webkit2gtk4.1.
%if %{with api40}
%package -n webkit2gtk4.0-doc
Summary: Documentation files for webkit2gtk4.0
BuildArch: noarch
Requires: webkit2gtk4.0 = %{version}-%{release}
Obsoletes: webkitgtk4-doc < %{version}-%{release}
Provides: webkitgtk4-doc = %{version}-%{release}
Obsoletes: webkit2gtk3-doc < %{version}-%{release}
Provides: webkit2gtk3-doc = %{version}-%{release}
Recommends: gi-docgen-fonts
%description -n webkit2gtk4.0-doc
This package contains developer documentation for webkit2gtk4.0.
%endif
%endif %endif
%package -n javascriptcoregtk6.0 %package -n javascriptcoregtk6.0
@ -255,6 +281,18 @@ Obsoletes: webkit2gtk4.1-jsc < %{version}-%{release}
%description -n javascriptcoregtk4.1 %description -n javascriptcoregtk4.1
This package contains the JavaScript engine from webkit2gtk4.1. This package contains the JavaScript engine from webkit2gtk4.1.
%if %{with api40}
%package -n javascriptcoregtk4.0
Summary: JavaScript engine from webkit2gtk4.0
Obsoletes: webkitgtk4-jsc < %{version}-%{release}
Provides: webkitgtk4-jsc = %{version}-%{release}
Obsoletes: webkit2gtk3-jsc < %{version}-%{release}
Provides: webkit2gtk3-jsc = %{version}-%{release}
%description -n javascriptcoregtk4.0
This package contains the JavaScript engine from webkit2gtk4.0.
%endif
%package -n javascriptcoregtk6.0-devel %package -n javascriptcoregtk6.0-devel
Summary: Development files for JavaScript engine from webkitgtk6.0 Summary: Development files for JavaScript engine from webkitgtk6.0
Requires: javascriptcoregtk6.0%{?_isa} = %{version}-%{release} Requires: javascriptcoregtk6.0%{?_isa} = %{version}-%{release}
@ -273,6 +311,20 @@ Obsoletes: webkit2gtk4.1-jsc-devel < %{version}-%{release}
The javascriptcoregtk4.1-devel package contains libraries, build data, and header The javascriptcoregtk4.1-devel package contains libraries, build data, and header
files for developing applications that use JavaScript engine from webkit2gtk-4.1. files for developing applications that use JavaScript engine from webkit2gtk-4.1.
%if %{with api40}
%package -n javascriptcoregtk4.0-devel
Summary: Development files for JavaScript engine from webkit2gtk4.0
Requires: javascriptcoregtk4.0%{?_isa} = %{version}-%{release}
Obsoletes: webkitgtk4-jsc-devel < %{version}-%{release}
Provides: webkitgtk4-jsc-devel = %{version}-%{release}
Obsoletes: webkit2gtk3-jsc-devel < %{version}-%{release}
Provides: webkit2gtk3-jsc-devel = %{version}-%{release}
%description -n javascriptcoregtk4.0-devel
The javascriptcoregtk4.0-devel package contains libraries, build data, and header
files for developing applications that use JavaScript engine from webkit2gtk-4.0.
%endif
%prep %prep
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%autosetup -p1 -n webkitgtk-%{version} %autosetup -p1 -n webkitgtk-%{version}
@ -314,6 +366,14 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1
-DUSE_LIBBACKTRACE=OFF \ -DUSE_LIBBACKTRACE=OFF \
%if %{without docs} %if %{without docs}
-DENABLE_DOCUMENTATION=OFF \ -DENABLE_DOCUMENTATION=OFF \
%endif
%if !0%{?with_gamepad}
-DENABLE_GAMEPAD=OFF \
%endif
%if 0%{?rhel}
%ifarch aarch64
-DUSE_64KB_PAGE_BLOCK=ON \
%endif
%endif %endif
%{nil} %{nil}
@ -323,21 +383,59 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1
-DPORT=GTK \ -DPORT=GTK \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DUSE_GTK4=OFF \ -DUSE_GTK4=OFF \
-DENABLE_WEBDRIVER=OFF \
-DUSE_LIBBACKTRACE=OFF \ -DUSE_LIBBACKTRACE=OFF \
%if %{without docs}
-DENABLE_DOCUMENTATION=OFF \
%endif
%if !0%{?with_gamepad}
-DENABLE_GAMEPAD=OFF \
%endif
%if 0%{?rhel}
%ifarch aarch64
-DUSE_64KB_PAGE_BLOCK=ON \
%endif
%endif
%{nil}
%if %{with api40}
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0
%cmake \
-GNinja \
-DPORT=GTK \
-DCMAKE_BUILD_TYPE=Release \
-DUSE_GTK4=OFF \
-DUSE_SOUP2=ON \
-DENABLE_WEBDRIVER=OFF \ -DENABLE_WEBDRIVER=OFF \
-DUSE_LIBBACKTRACE=OFF \
%if %{without docs} %if %{without docs}
-DENABLE_DOCUMENTATION=OFF \ -DENABLE_DOCUMENTATION=OFF \
%endif
%if !0%{?with_gamepad}
-DENABLE_GAMEPAD=OFF \
%endif
%if 0%{?rhel}
%ifarch aarch64
-DUSE_64KB_PAGE_BLOCK=ON \
%endif
%endif %endif
%{nil} %{nil}
%endif
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0 %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
export NINJA_STATUS="[1/2][%f/%t %es] " export NINJA_STATUS="[1/3][%f/%t %es] "
%cmake_build %limit_build -m 3072 %cmake_build %limit_build -m 3072
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1 %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
export NINJA_STATUS="[2/2][%f/%t %es] " export NINJA_STATUS="[2/3][%f/%t %es] "
%cmake_build %limit_build -m 3072 %cmake_build %limit_build -m 3072
%if %{with api40}
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0
export NINJA_STATUS="[3/3][%f/%t %es] "
%cmake_build %limit_build -m 3072
%endif
%install %install
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0 %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
%cmake_install %cmake_install
@ -345,8 +443,16 @@ export NINJA_STATUS="[2/2][%f/%t %es] "
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1 %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
%cmake_install %cmake_install
%if %{with api40}
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0
%cmake_install
%endif
%find_lang WebKitGTK-6.0 %find_lang WebKitGTK-6.0
%find_lang WebKitGTK-4.1 %find_lang WebKitGTK-4.1
%if %{with api40}
%find_lang WebKitGTK-4.0
%endif
# Finally, copy over and rename various files for %%license inclusion # Finally, copy over and rename various files for %%license inclusion
%add_to_license_files Source/JavaScriptCore/COPYING.LIB %add_to_license_files Source/JavaScriptCore/COPYING.LIB
@ -391,6 +497,22 @@ export NINJA_STATUS="[2/2][%f/%t %es] "
%exclude %{_libexecdir}/webkit2gtk-4.1/MiniBrowser %exclude %{_libexecdir}/webkit2gtk-4.1/MiniBrowser
%exclude %{_libexecdir}/webkit2gtk-4.1/jsc %exclude %{_libexecdir}/webkit2gtk-4.1/jsc
%if %{with api40}
%files -n webkit2gtk4.0 -f WebKitGTK-4.0.lang
%license _license_files/*ThirdParty*
%license _license_files/*WebCore*
%license _license_files/*WebInspectorUI*
%license _license_files/*WTF*
%{_libdir}/libwebkit2gtk-4.0.so.37*
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/WebKit2-4.0.typelib
%{_libdir}/girepository-1.0/WebKit2WebExtension-4.0.typelib
%{_libdir}/webkit2gtk-4.0/
%{_libexecdir}/webkit2gtk-4.0/
%exclude %{_libexecdir}/webkit2gtk-4.0/MiniBrowser
%exclude %{_libexecdir}/webkit2gtk-4.0/jsc
%endif
%files -n webkitgtk6.0-devel %files -n webkitgtk6.0-devel
%{_libexecdir}/webkitgtk-6.0/MiniBrowser %{_libexecdir}/webkitgtk-6.0/MiniBrowser
%{_includedir}/webkitgtk-6.0/ %{_includedir}/webkitgtk-6.0/
@ -414,6 +536,20 @@ export NINJA_STATUS="[2/2][%f/%t %es] "
%{_datadir}/gir-1.0/WebKit2-4.1.gir %{_datadir}/gir-1.0/WebKit2-4.1.gir
%{_datadir}/gir-1.0/WebKit2WebExtension-4.1.gir %{_datadir}/gir-1.0/WebKit2WebExtension-4.1.gir
%if %{with api40}
%files -n webkit2gtk4.0-devel
%{_libexecdir}/webkit2gtk-4.0/MiniBrowser
%{_includedir}/webkitgtk-4.0/
%exclude %{_includedir}/webkitgtk-4.0/JavaScriptCore
%exclude %{_includedir}/webkitgtk-4.0/jsc
%{_libdir}/libwebkit2gtk-4.0.so
%{_libdir}/pkgconfig/webkit2gtk-4.0.pc
%{_libdir}/pkgconfig/webkit2gtk-web-extension-4.0.pc
%dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/WebKit2-4.0.gir
%{_datadir}/gir-1.0/WebKit2WebExtension-4.0.gir
%endif
%files -n javascriptcoregtk6.0 %files -n javascriptcoregtk6.0
%license _license_files/*JavaScriptCore* %license _license_files/*JavaScriptCore*
%{_libdir}/libjavascriptcoregtk-6.0.so.1* %{_libdir}/libjavascriptcoregtk-6.0.so.1*
@ -426,6 +562,14 @@ export NINJA_STATUS="[2/2][%f/%t %es] "
%dir %{_libdir}/girepository-1.0 %dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/JavaScriptCore-4.1.typelib %{_libdir}/girepository-1.0/JavaScriptCore-4.1.typelib
%if %{with api40}
%files -n javascriptcoregtk4.0
%license _license_files/*JavaScriptCore*
%{_libdir}/libjavascriptcoregtk-4.0.so.18*
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/JavaScriptCore-4.0.typelib
%endif
%files -n javascriptcoregtk6.0-devel %files -n javascriptcoregtk6.0-devel
%{_libexecdir}/webkitgtk-6.0/jsc %{_libexecdir}/webkitgtk-6.0/jsc
%dir %{_includedir}/webkitgtk-6.0 %dir %{_includedir}/webkitgtk-6.0
@ -445,6 +589,18 @@ export NINJA_STATUS="[2/2][%f/%t %es] "
%dir %{_datadir}/gir-1.0 %dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/JavaScriptCore-4.1.gir %{_datadir}/gir-1.0/JavaScriptCore-4.1.gir
%if %{with api40}
%files -n javascriptcoregtk4.0-devel
%{_libexecdir}/webkit2gtk-4.0/jsc
%dir %{_includedir}/webkitgtk-4.0
%{_includedir}/webkitgtk-4.0/JavaScriptCore/
%{_includedir}/webkitgtk-4.0/jsc/
%{_libdir}/libjavascriptcoregtk-4.0.so
%{_libdir}/pkgconfig/javascriptcoregtk-4.0.pc
%dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
%endif
%if %{with docs} %if %{with docs}
%files -n webkitgtk6.0-doc %files -n webkitgtk6.0-doc
%dir %{_datadir}/doc %dir %{_datadir}/doc
@ -457,145 +613,58 @@ export NINJA_STATUS="[2/2][%f/%t %es] "
%{_datadir}/doc/javascriptcoregtk-4.1/ %{_datadir}/doc/javascriptcoregtk-4.1/
%{_datadir}/doc/webkit2gtk-4.1/ %{_datadir}/doc/webkit2gtk-4.1/
%{_datadir}/doc/webkit2gtk-web-extension-4.1/ %{_datadir}/doc/webkit2gtk-web-extension-4.1/
%if %{with api40}
%files -n webkit2gtk4.0-doc
%dir %{_datadir}/doc
%{_datadir}/doc/javascriptcoregtk-4.0/
%{_datadir}/doc/webkit2gtk-4.0/
%{_datadir}/doc/webkit2gtk-web-extension-4.0/
%endif
%endif %endif
%changelog %changelog
* Tue Dec 24 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 2.46.5-1 * Sun Aug 25 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 2.44.3-2.inferit
- Rebuilt for MSVSphere 10 - Rebuilt for MSVSphere 9.4
- Build w/o api40
## START: Generated by rpmautospec ## START: Generated by rpmautospec
* Wed Dec 18 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.5-1 * Thu Aug 15 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.44.3-2
- Update to 2.46.5 - Add patch to fix WebAssembly
* Wed Nov 27 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.4-1
- Update to 2.46.4
* Wed Oct 30 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.3-2
- Update gitignore
* Wed Oct 30 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.3-1
- Update to 2.46.3
* Mon Sep 30 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.1-1
- Update to 2.46.1
* Tue Sep 17 2024 Dan Horák <dan@danny.cz> - 2.46.0-2 * Tue Aug 13 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.44.3-1
- enable build with clang on ppc64le - Update to 2.44.3
* Tue Sep 17 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.0-1 * Sat Jun 08 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.44.2-2
- Upgrade to 2.46.0
* Mon Sep 09 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.45.92-3
- Revert use of -fdebug-types-section flag
* Wed Sep 04 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.45.92-2
- Disable LTO on ppc64le
* Tue Sep 03 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.45.92-1
- Update to 2.45.92
* Mon Aug 26 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.45.91-1
- Update to 2.45.91
* Mon Aug 19 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.45.90-1
- Update to 2.45.90
* Thu Aug 15 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.45.6-2
- Reenable LTO
* Mon Jul 29 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.45.6-1
- Update to 2.45.6
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.45.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Jul 12 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.45.5-1
- Update to 2.45.5
* Wed Jul 03 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.45.4-3
- Drop downstream patch and disable LTO
* Wed Jun 26 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.45.4-2
- Restore the TextDecorationPainter crash patch
* Tue Jun 25 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.45.4-1
- Update to WebKitGTK 2.45.4
* Wed May 29 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.45.3-3
- Attempt to reenable LTO
* Wed May 29 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.45.3-2
- Disable LTO, which is broken again
* Tue May 28 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.45.3-1
- Update to 2.45.3
* Sat May 25 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.45.2-3
- Add patch to fix excessive CPU usage - Add patch to fix excessive CPU usage
* Tue May 14 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.45.2-2 * Thu May 16 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.44.2-1
- Fix builds on i686, ppc64le, and s390x - Update to 2.44.2
* Tue May 14 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.45.2-1 * Thu Apr 18 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.44.1-2
- Update to 2.45.2 - Request 4 GB of RAM per vCPU
* Thu Apr 11 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.44.1-1 * Thu Apr 11 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.44.1-1
- Update to 2.44.1 - Update to 2.44.1
* Thu Apr 11 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.44.0-4
- Attempt to reenable LTO
* Thu Apr 11 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.44.0-3
- Remove RHEL conditions from spec file
* Sun Mar 17 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.44.0-2 * Sun Mar 17 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.44.0-2
- Fix i686 build - Fix i686 build
* Sat Mar 16 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.44.0-1 * Sat Mar 16 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.44.0-1
- Update to 2.44.0 - Upgrade to WebKitGTK 2.44.0
* Wed Mar 13 2024 Sérgio M. Basto <sergio@serjux.com> - 2.43.4-5
- Rebuild for jpegxl (libjxl) 0.10.2
* Wed Feb 14 2024 Sérgio M. Basto <sergio@serjux.com> - 2.43.4-4
- Rebuild for jpegxl (libjxl) 0.9.2 with soname bump
* Wed Feb 07 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.43.4-3
- Remove use of real-time scheduling on vblank thread
* Tue Feb 06 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.43.4-2
- Add patch to maybe fix rhbz#2253099
* Fri Feb 02 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.43.4-1
- Update to 2.43.4
* Wed Jan 31 2024 František Zatloukal <fzatlouk@redhat.com> - 2.43.3-3 * Mon Feb 05 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.5-1
- Rebuilt for libavif 1.0.3 - Update to WebKitGTK 2.42.5
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.43.3-2 * Fri Dec 15 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.4-1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - Update to 2.42.4
* Thu Dec 21 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.43.3-1 * Tue Dec 05 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.3-1
- Update to WebKitGTK 2.43.3 - Update to 2.42.3
* Wed Dec 20 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 2.43.2-2
- Disable avif and jpegxl in RHEL builds
* Tue Dec 05 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.43.2-1
- Update to 2.43.2
* Mon Nov 20 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.43.1-2
- Fix build with libxml2 2.12
* Fri Nov 17 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.43.1-1
- Update to 2.43.1
* Fri Nov 10 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.2-1 * Fri Nov 10 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.2-1
- Update to 2.42.2 - Update to 2.42.2
* Sun Oct 22 2023 Miroslav Suchý <msuchy@redhat.com> - 2.42.1-2
- license analysis
* Wed Sep 27 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.1-1 * Wed Sep 27 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.1-1
- Update to 2.40.1 and fix GL dependencies - Update to 2.40.1 and fix GL dependencies
@ -605,11 +674,8 @@ export NINJA_STATUS="[2/2][%f/%t %es] "
* Fri Sep 08 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.41.92-1 * Fri Sep 08 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.41.92-1
- Update to 2.41.92 - Update to 2.41.92
* Sat Aug 19 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.41.91-3
- Disable LTO again to fix build
* Sat Aug 19 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.41.91-2 * Sat Aug 19 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.41.91-2
- Remove webkitgtk-4.0 API version - Disable LTO again to fix build
* Sat Aug 19 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.41.91-1 * Sat Aug 19 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.41.91-1
- Update to 2.41.91 - Update to 2.41.91
@ -771,7 +837,7 @@ export NINJA_STATUS="[2/2][%f/%t %es] "
- Upgrade to 2.39.1 and webkitgtk-6.0 - Upgrade to 2.39.1 and webkitgtk-6.0
* Tue Nov 15 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.2-2 * Tue Nov 15 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.2-2
- Adjust %%limit_build to request 3 GB of RAM per CPU - Adjust %limit_build to request 3 GB of RAM per CPU
* Fri Nov 04 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.2-1 * Fri Nov 04 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.2-1
- Update to 2.38.2 - Update to 2.38.2

Loading…
Cancel
Save