From 1dcddabf12f60cff3ba1635a5a07a7a32e2ae55e Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Wed, 20 Apr 2022 13:41:24 -0500 Subject: [PATCH 01/24] Add patch for crashes on exit https://bugs.webkit.org/show_bug.cgi?id=235224 https://bugzilla.redhat.com/show_bug.cgi?id=2065464 --- 235224.patch | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ webkit2gtk3.spec | 3 ++ 2 files changed, 87 insertions(+) create mode 100644 235224.patch diff --git a/235224.patch b/235224.patch new file mode 100644 index 0000000..8a2d132 --- /dev/null +++ b/235224.patch @@ -0,0 +1,84 @@ +From e96d49ab11690752382f3b84739e3097aa539105 Mon Sep 17 00:00:00 2001 +From: Pablo Saavedra +Date: Wed, 30 Mar 2022 07:41:37 +0000 +Subject: [PATCH] [GTK][WPE] Exit cleanly if Connection to UIProcess severed. + Regression (r214307) https://bugs.webkit.org/show_bug.cgi?id=235224 + +This patch reverts the WPE and GTK specific code removed in '[WK2] Make +establishing a connection between the WebProcess and the Network process more +robust' (r12345): + +GTK+ and WPE ports don't exit on send sync message failure. In those particular +cases, the network process can be terminated by the UI process while the +Web process is still initializing, so we always want to exit instead of crashing. This can +happen when the WebView is created and then destroyed quickly. +See https://bugs.webkit.org/show_bug.cgi?id=183348. + +Reviewed by Carlos Garcia Campos. + +* WebProcess/WebProcess.cpp: +(WebKit::getNetworkProcessConnection): +(WebKit::WebProcess::getGPUProcessConnection): +(WebKit::getWebAuthnProcessConnection): + + + +Canonical link: https://commits.webkit.org/249019@main +git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292099 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/WebKit/ChangeLog | 22 ++++++++++++++++++++++ + Source/WebKit/WebProcess/WebProcess.cpp | 20 +++++++++++++++++--- + 2 files changed, 39 insertions(+), 3 deletions(-) + +diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp +index 79d179039303..272105032407 100644 +--- a/Source/WebKit/WebProcess/WebProcess.cpp ++++ b/Source/WebKit/WebProcess/WebProcess.cpp +@@ -1127,6 +1127,20 @@ void WebProcess::setInjectedBundleParameters(const IPC::DataReference& value) + injectedBundle->setBundleParameters(value); + } + ++NO_RETURN inline void failedToSendSyncMessage() ++{ ++#if PLATFORM(GTK) || PLATFORM(WPE) ++ // GTK and WPE ports don't exit on send sync message failure. ++ // In this particular case, the network process can be terminated by the UI process while the ++ // Web process is still initializing, so we always want to exit instead of crashing. This can ++ // happen when the WebView is created and then destroyed quickly. ++ // See https://bugs.webkit.org/show_bug.cgi?id=183348. ++ exit(0); ++#else ++ CRASH(); ++#endif ++} ++ + static NetworkProcessConnectionInfo getNetworkProcessConnection(IPC::Connection& connection) + { + NetworkProcessConnectionInfo connectionInfo; +@@ -1146,7 +1160,7 @@ static NetworkProcessConnectionInfo getNetworkProcessConnection(IPC::Connection& + unsigned failedAttempts = 0; + while (!requestConnection()) { + if (++failedAttempts >= maxFailedAttempts) +- CRASH(); ++ failedToSendSyncMessage(); + + RELEASE_LOG_ERROR(Process, "getNetworkProcessConnection: Failed to get connection to network process, will retry..."); + +@@ -1299,7 +1313,7 @@ GPUProcessConnectionInfo WebProcess::getGPUProcessConnection(IPC::Connection& co + // If we failed the first time, retry once. The attachment may have become invalid + // before it was received by the web process if the network process crashed. + if (!connection.sendSync(Messages::WebProcessProxy::GetGPUProcessConnection(parameters), Messages::WebProcessProxy::GetGPUProcessConnection::Reply(connectionInfo), 0)) +- CRASH(); ++ failedToSendSyncMessage(); + } + + return connectionInfo; +@@ -1384,7 +1398,7 @@ static WebAuthnProcessConnectionInfo getWebAuthnProcessConnection(IPC::Connectio + // before it was received by the web process if the network process crashed. + if (!connection.sendSync(Messages::WebProcessProxy::GetWebAuthnProcessConnection(), Messages::WebProcessProxy::GetWebAuthnProcessConnection::Reply(connectionInfo), 0)) { + RELEASE_LOG_ERROR(WebAuthn, "getWebAuthnProcessConnection: Unable to connect to WebAuthn process (Terminating)"); +- CRASH(); ++ failedToSendSyncMessage(); + } + } + diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index f717b16..681f5f1 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -29,6 +29,9 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc # $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg Source2: webkitgtk-keys.gpg +# https://bugs.webkit.org/show_bug.cgi?id=235224 +Patch0: 235224.patch + BuildRequires: bison BuildRequires: bubblewrap BuildRequires: cmake From ba7fc8eab6eea7b528cde2bd97c07a65b1751c28 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Thu, 21 Apr 2022 14:15:54 -0500 Subject: [PATCH 02/24] Upgrade to 2.36.1 --- .gitignore | 2 ++ 235224.patch | 84 ------------------------------------------------ sources | 4 +-- webkit2gtk3.spec | 5 +-- 4 files changed, 5 insertions(+), 90 deletions(-) delete mode 100644 235224.patch diff --git a/.gitignore b/.gitignore index 9f2d960..9931b2c 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,5 @@ /webkitgtk-2.35.90.tar.xz.asc /webkitgtk-2.36.0.tar.xz /webkitgtk-2.36.0.tar.xz.asc +/webkitgtk-2.36.1.tar.xz +/webkitgtk-2.36.1.tar.xz.asc diff --git a/235224.patch b/235224.patch deleted file mode 100644 index 8a2d132..0000000 --- a/235224.patch +++ /dev/null @@ -1,84 +0,0 @@ -From e96d49ab11690752382f3b84739e3097aa539105 Mon Sep 17 00:00:00 2001 -From: Pablo Saavedra -Date: Wed, 30 Mar 2022 07:41:37 +0000 -Subject: [PATCH] [GTK][WPE] Exit cleanly if Connection to UIProcess severed. - Regression (r214307) https://bugs.webkit.org/show_bug.cgi?id=235224 - -This patch reverts the WPE and GTK specific code removed in '[WK2] Make -establishing a connection between the WebProcess and the Network process more -robust' (r12345): - -GTK+ and WPE ports don't exit on send sync message failure. In those particular -cases, the network process can be terminated by the UI process while the -Web process is still initializing, so we always want to exit instead of crashing. This can -happen when the WebView is created and then destroyed quickly. -See https://bugs.webkit.org/show_bug.cgi?id=183348. - -Reviewed by Carlos Garcia Campos. - -* WebProcess/WebProcess.cpp: -(WebKit::getNetworkProcessConnection): -(WebKit::WebProcess::getGPUProcessConnection): -(WebKit::getWebAuthnProcessConnection): - - - -Canonical link: https://commits.webkit.org/249019@main -git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292099 268f45cc-cd09-0410-ab3c-d52691b4dbfc ---- - Source/WebKit/ChangeLog | 22 ++++++++++++++++++++++ - Source/WebKit/WebProcess/WebProcess.cpp | 20 +++++++++++++++++--- - 2 files changed, 39 insertions(+), 3 deletions(-) - -diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index 79d179039303..272105032407 100644 ---- a/Source/WebKit/WebProcess/WebProcess.cpp -+++ b/Source/WebKit/WebProcess/WebProcess.cpp -@@ -1127,6 +1127,20 @@ void WebProcess::setInjectedBundleParameters(const IPC::DataReference& value) - injectedBundle->setBundleParameters(value); - } - -+NO_RETURN inline void failedToSendSyncMessage() -+{ -+#if PLATFORM(GTK) || PLATFORM(WPE) -+ // GTK and WPE ports don't exit on send sync message failure. -+ // In this particular case, the network process can be terminated by the UI process while the -+ // Web process is still initializing, so we always want to exit instead of crashing. This can -+ // happen when the WebView is created and then destroyed quickly. -+ // See https://bugs.webkit.org/show_bug.cgi?id=183348. -+ exit(0); -+#else -+ CRASH(); -+#endif -+} -+ - static NetworkProcessConnectionInfo getNetworkProcessConnection(IPC::Connection& connection) - { - NetworkProcessConnectionInfo connectionInfo; -@@ -1146,7 +1160,7 @@ static NetworkProcessConnectionInfo getNetworkProcessConnection(IPC::Connection& - unsigned failedAttempts = 0; - while (!requestConnection()) { - if (++failedAttempts >= maxFailedAttempts) -- CRASH(); -+ failedToSendSyncMessage(); - - RELEASE_LOG_ERROR(Process, "getNetworkProcessConnection: Failed to get connection to network process, will retry..."); - -@@ -1299,7 +1313,7 @@ GPUProcessConnectionInfo WebProcess::getGPUProcessConnection(IPC::Connection& co - // If we failed the first time, retry once. The attachment may have become invalid - // before it was received by the web process if the network process crashed. - if (!connection.sendSync(Messages::WebProcessProxy::GetGPUProcessConnection(parameters), Messages::WebProcessProxy::GetGPUProcessConnection::Reply(connectionInfo), 0)) -- CRASH(); -+ failedToSendSyncMessage(); - } - - return connectionInfo; -@@ -1384,7 +1398,7 @@ static WebAuthnProcessConnectionInfo getWebAuthnProcessConnection(IPC::Connectio - // before it was received by the web process if the network process crashed. - if (!connection.sendSync(Messages::WebProcessProxy::GetWebAuthnProcessConnection(), Messages::WebProcessProxy::GetWebAuthnProcessConnection::Reply(connectionInfo), 0)) { - RELEASE_LOG_ERROR(WebAuthn, "getWebAuthnProcessConnection: Unable to connect to WebAuthn process (Terminating)"); -- CRASH(); -+ failedToSendSyncMessage(); - } - } - diff --git a/sources b/sources index b540026..1b3c706 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (webkitgtk-2.36.0.tar.xz) = 0926a792da295b8efa8c0fb80fbb0cb27c43bb86011317d076fbe5eef347f2bc02e8afc4c75699a5c6a14363f4abcbfa2d941fdddd6646a63c7679e2380080da -SHA512 (webkitgtk-2.36.0.tar.xz.asc) = ee0d31152c287d356843e726139663711b525f062457a87aac73a8b799cbd39fb700d17fd9d88a99141f041f1565e62d6c973d7fda2bebe218181c4f80e48b63 +SHA512 (webkitgtk-2.36.1.tar.xz) = c0574bd8924df89c1a82905a8c0c09b4be49f75639db659b38fc3123922128a22fa6f4cf099f08ef7742ecefbbde765177a77e00fd641db3a5eb509586e96ae4 +SHA512 (webkitgtk-2.36.1.tar.xz.asc) = b3c005aef5b5da0d381abb5af13aeb58bf66049021ea6740786b67f0bcabe4e1a516ac69235eafadbb75c5386ed0e7ab5d8a4f582233a28ec47b10da3ac934e0 diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 681f5f1..4fed8ae 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -16,7 +16,7 @@ %bcond_without docs Name: webkit2gtk3 -Version: 2.36.0 +Version: 2.36.1 Release: %autorelease Summary: GTK Web content engine library @@ -29,9 +29,6 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc # $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg Source2: webkitgtk-keys.gpg -# https://bugs.webkit.org/show_bug.cgi?id=235224 -Patch0: 235224.patch - BuildRequires: bison BuildRequires: bubblewrap BuildRequires: cmake From 81a8e955d1635f9679d3d601f38771240942501a Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Thu, 21 Apr 2022 14:59:29 -0500 Subject: [PATCH 03/24] Sync some stuff from the c9s package --- webkit2gtk3.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 4fed8ae..7320ba7 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -202,13 +202,20 @@ rm -rf Source/ThirdParty/qunit/ %global optflags %(echo %{optflags} | sed 's/-g /-g0 /') %endif +# Warning: although RHEL 9 aarch64 now uses 4 KB page sizes, we still have to +# support 64 KB page sizes until the *builders* use RHEL 9. This means we still +# have to disable JIT and bmalloc, even though this disables important heap +# security features. We can't simply disable them only during this build, +# because gobject-introspection will crash when building anything that depends +# on WebKitGTK, because it calls each object's get_type() function, which will +# initialize bmalloc and JIT. + %cmake \ -GNinja \ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -DENABLE_MINIBROWSER=ON \ -DUSE_SOUP2=ON \ - -DUSE_LD_GOLD=OFF \ %if %{with docs} -DENABLE_GTKDOC=ON \ %endif @@ -217,6 +224,12 @@ rm -rf Source/ThirdParty/qunit/ %endif %if 0%{?fedora} -DUSER_AGENT_BRANDING="Fedora" \ +%endif +%if 0%{?rhel} +%ifarch aarch64 + -DENABLE_JIT=OFF \ + -DUSE_SYSTEM_MALLOC=ON \ +%endif %endif %{nil} From c95b7fe3ba90d3800395fe72a01bb4af8a7fb543 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Thu, 21 Apr 2022 15:05:00 -0500 Subject: [PATCH 04/24] Sync more stuff from c9s --- aarch64-page-size.patch | 19 +++++++++++++++++++ webkit2gtk3.spec | 6 ++++++ 2 files changed, 25 insertions(+) create mode 100644 aarch64-page-size.patch diff --git a/aarch64-page-size.patch b/aarch64-page-size.patch new file mode 100644 index 0000000..15aaacb --- /dev/null +++ b/aarch64-page-size.patch @@ -0,0 +1,19 @@ +diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h +index 9bb7fffcc1ae..3e1e24aa69f5 100644 +--- a/Source/WTF/wtf/PageBlock.h ++++ b/Source/WTF/wtf/PageBlock.h +@@ -45,11 +45,11 @@ namespace WTF { + // On Linux, Power systems normally use 64 KiB pages. + // + // Use 64 KiB for any unknown CPUs to be conservative. +-#if OS(DARWIN) || PLATFORM(PLAYSTATION) || CPU(MIPS) || CPU(MIPS64) || (OS(LINUX) && CPU(ARM64)) ++#if OS(DARWIN) || PLATFORM(PLAYSTATION) || CPU(MIPS) || CPU(MIPS64) + constexpr size_t CeilingOnPageSize = 16 * KB; +-#elif CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) ++#elif CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) || CPU(ARM64) + constexpr size_t CeilingOnPageSize = 64 * KB; +-#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(RISCV64) ++#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(RISCV64) + constexpr size_t CeilingOnPageSize = 4 * KB; + #else + #error Must set CeilingOnPageSize in PageBlock.h when adding a new CPU architecture! diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 7320ba7..641fd57 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -29,6 +29,12 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc # $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg Source2: webkitgtk-keys.gpg +%if 0%{?rhel} +# https://bugs.webkit.org/show_bug.cgi?id=217989 +# https://bugs.webkit.org/show_bug.cgi?id=227905 +Patch0: aarch64-page-size.patch +%endif + BuildRequires: bison BuildRequires: bubblewrap BuildRequires: cmake From bc3136a617048ce57af1d4a6060444da677bd2de Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Fri, 22 Apr 2022 14:26:59 -0500 Subject: [PATCH 05/24] Add rpminspect.yaml --- rpminspect.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 rpminspect.yaml diff --git a/rpminspect.yaml b/rpminspect.yaml new file mode 100644 index 0000000..722d4d2 --- /dev/null +++ b/rpminspect.yaml @@ -0,0 +1,4 @@ +--- +inspections: + changedfiles: off + filesize: off From 42e2f04a49563e590d19d24aa23b9832aeee8811 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Wed, 4 May 2022 10:11:25 -0500 Subject: [PATCH 06/24] Remove user agent header branding Fedora no longer requires this branding for metrics purposes. Its benefit is now outweighed by the negative impact on fingerprinting and website compatibility. Bye. --- webkit2gtk3.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 641fd57..4962df4 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -228,9 +228,6 @@ rm -rf Source/ThirdParty/qunit/ %if !0%{?with_gamepad} -DENABLE_GAMEPAD=OFF \ %endif -%if 0%{?fedora} - -DUSER_AGENT_BRANDING="Fedora" \ -%endif %if 0%{?rhel} %ifarch aarch64 -DENABLE_JIT=OFF \ From 466b4f04fdd8bb738ec36ad80673d63d7c10cf80 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Wed, 18 May 2022 08:06:26 -0500 Subject: [PATCH 07/24] Update to 2.36.2 --- .gitignore | 2 ++ sources | 4 ++-- webkit2gtk3.spec | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9931b2c..3ff91e5 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,5 @@ /webkitgtk-2.36.0.tar.xz.asc /webkitgtk-2.36.1.tar.xz /webkitgtk-2.36.1.tar.xz.asc +/webkitgtk-2.36.2.tar.xz +/webkitgtk-2.36.2.tar.xz.asc diff --git a/sources b/sources index 1b3c706..c37aa7f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (webkitgtk-2.36.1.tar.xz) = c0574bd8924df89c1a82905a8c0c09b4be49f75639db659b38fc3123922128a22fa6f4cf099f08ef7742ecefbbde765177a77e00fd641db3a5eb509586e96ae4 -SHA512 (webkitgtk-2.36.1.tar.xz.asc) = b3c005aef5b5da0d381abb5af13aeb58bf66049021ea6740786b67f0bcabe4e1a516ac69235eafadbb75c5386ed0e7ab5d8a4f582233a28ec47b10da3ac934e0 +SHA512 (webkitgtk-2.36.2.tar.xz) = 00849ab0a4f6deca4287d3556ee10d9779197fcb618045174c3d39ff1847937bd3fe4208a39a13c53ebf7e2fe35a915494ddf6bec1120100dfba8695c883154a +SHA512 (webkitgtk-2.36.2.tar.xz.asc) = ebd898f48cf56c4fbe6df19747dfd05ae3c1c75e67061a1f50ffdaa4b35d29faa53215de9726ed827b7b73fbd91636941ada0bc4b3cb62bb39701f125c876247 diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 4962df4..598de5d 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -16,7 +16,7 @@ %bcond_without docs Name: webkit2gtk3 -Version: 2.36.1 +Version: 2.36.2 Release: %autorelease Summary: GTK Web content engine library From 3b66484e87e06d325abb4b6a5e6faa6020974a00 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 21 May 2022 00:33:39 +0200 Subject: [PATCH 08/24] Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 From 0288fdcc7b60b927fe01dce1577f7faf86346752 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Thu, 2 Jun 2022 09:43:27 -0500 Subject: [PATCH 09/24] Update to 3.36.3 --- .gitignore | 2 ++ sources | 4 ++-- webkit2gtk3.spec | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3ff91e5..533e4b8 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,5 @@ /webkitgtk-2.36.1.tar.xz.asc /webkitgtk-2.36.2.tar.xz /webkitgtk-2.36.2.tar.xz.asc +/webkitgtk-2.36.3.tar.xz +/webkitgtk-2.36.3.tar.xz.asc diff --git a/sources b/sources index c37aa7f..2c169c4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (webkitgtk-2.36.2.tar.xz) = 00849ab0a4f6deca4287d3556ee10d9779197fcb618045174c3d39ff1847937bd3fe4208a39a13c53ebf7e2fe35a915494ddf6bec1120100dfba8695c883154a -SHA512 (webkitgtk-2.36.2.tar.xz.asc) = ebd898f48cf56c4fbe6df19747dfd05ae3c1c75e67061a1f50ffdaa4b35d29faa53215de9726ed827b7b73fbd91636941ada0bc4b3cb62bb39701f125c876247 +SHA512 (webkitgtk-2.36.3.tar.xz) = dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692 +SHA512 (webkitgtk-2.36.3.tar.xz.asc) = c11823ac9d54bedeb4f6e9a944570fd1a8ab24c9de67f8c6b6a6c598e3ff1dc39f4f05949b571b320c0819e9e02511444fd2a770c19f3fdf6125bd20f0348616 diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 598de5d..92c4475 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -16,7 +16,7 @@ %bcond_without docs Name: webkit2gtk3 -Version: 2.36.2 +Version: 2.36.3 Release: %autorelease Summary: GTK Web content engine library From 332ee4803539496d79c158a6b5d7355340359462 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Wed, 15 Jun 2022 19:21:41 -0500 Subject: [PATCH 10/24] Drop unneeded perl build deps --- webkit2gtk3.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 92c4475..d978bdf 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -49,10 +49,8 @@ BuildRequires: hyphen-devel BuildRequires: libatomic BuildRequires: ninja-build BuildRequires: perl(English) -BuildRequires: perl(File::Copy::Recursive) BuildRequires: perl(FindBin) BuildRequires: perl(JSON::PP) -BuildRequires: perl(Switch) BuildRequires: python3 BuildRequires: ruby BuildRequires: rubygems From aa1fc9ee569ff3b3289127c11da4d679b816a3ed Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Tue, 5 Jul 2022 11:04:41 -0500 Subject: [PATCH 11/24] Update to 2.36.4 --- .gitignore | 2 ++ fix-build.patch | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ sources | 4 ++-- webkit2gtk3.spec | 5 ++++- 4 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 fix-build.patch diff --git a/.gitignore b/.gitignore index 533e4b8..b8d8820 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,5 @@ /webkitgtk-2.36.2.tar.xz.asc /webkitgtk-2.36.3.tar.xz /webkitgtk-2.36.3.tar.xz.asc +/webkitgtk-2.36.4.tar.xz +/webkitgtk-2.36.4.tar.xz.asc diff --git a/fix-build.patch b/fix-build.patch new file mode 100644 index 0000000..d95e1c8 --- /dev/null +++ b/fix-build.patch @@ -0,0 +1,54 @@ +From f20bac21ea37991c1a1110e78846897a406932f0 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Tue, 5 Jul 2022 08:23:12 -0500 +Subject: [PATCH] Revert "Merge r295034 - WebKitTestRunner shouldn't link + object files of JavaScriptCore and WebCore" + +This reverts commit 7916fda00b347ff263fbfe72c065032d1d9b523c. +--- + Source/JavaScriptCore/CMakeLists.txt | 12 +++++++++--- + Tools/WebKitTestRunner/CMakeLists.txt | 1 - + Tools/WebKitTestRunner/PlatformGTK.cmake | 4 ++++ + Tools/WebKitTestRunner/PlatformWin.cmake | 4 ++++ + 4 files changed, 17 insertions(+), 4 deletions(-) + +diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt +index 95a1300ce1b3..238208eb1137 100644 +--- a/Source/JavaScriptCore/CMakeLists.txt ++++ b/Source/JavaScriptCore/CMakeLists.txt +@@ -456,7 +456,7 @@ if (MSVC AND NOT ENABLE_C_LOOP) + COMMAND ${MASM_EXECUTABLE} ${LLINT_MASM_FLAGS} ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.asm + VERBATIM) + list(APPEND JavaScriptCore_SOURCES ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj) +- add_library(LowLevelInterpreterLib STATIC llint/LowLevelInterpreter.cpp) ++ add_library(LowLevelInterpreterLib OBJECT llint/LowLevelInterpreter.cpp) + else () + # As there's poor toolchain support for using `.file` directives in + # inline asm (i.e. there's no way to avoid clashes with the `.file` +@@ -465,7 +465,7 @@ else () + # an object file. We only need to do this for LowLevelInterpreter.cpp + # and cmake doesn't allow us to introduce a compiler wrapper for a + # single source file, so we need to create a separate target for it. +- add_library(LowLevelInterpreterLib STATIC llint/LowLevelInterpreter.cpp ++ add_library(LowLevelInterpreterLib OBJECT llint/LowLevelInterpreter.cpp + ${JavaScriptCore_DERIVED_SOURCES_DIR}/${LLIntOutput}) + endif () + +@@ -1496,7 +1496,13 @@ if (CMAKE_COMPILER_IS_GNUCXX AND GCC_OFFLINEASM_SOURCE_MAP) + COMPILE_OPTIONS "-fno-lto") + endif () + +-list(APPEND JavaScriptCore_PRIVATE_LIBRARIES LowLevelInterpreterLib) ++# When building JavaScriptCore as an object library, we need to make sure the ++# lowlevelinterpreter lib objects get propogated. ++if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "OBJECT") ++ list(APPEND JavaScriptCore_PRIVATE_LIBRARIES $) ++else () ++ list(APPEND JavaScriptCore_SOURCES $) ++endif () + + WEBKIT_COMPUTE_SOURCES(JavaScriptCore) + list(APPEND JavaScriptCore_SOURCES +-- +2.36.1 + diff --git a/sources b/sources index 2c169c4..8711568 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (webkitgtk-2.36.3.tar.xz) = dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692 -SHA512 (webkitgtk-2.36.3.tar.xz.asc) = c11823ac9d54bedeb4f6e9a944570fd1a8ab24c9de67f8c6b6a6c598e3ff1dc39f4f05949b571b320c0819e9e02511444fd2a770c19f3fdf6125bd20f0348616 +SHA512 (webkitgtk-2.36.4.tar.xz) = c5365c682ba4e8e6ad891638b5a82e74e38fa0867ce6c8e4e08a9dc15b862a6d3edc096a049e0711306972d6162d79fe90a0e76d8b395001798005e4488467f2 +SHA512 (webkitgtk-2.36.4.tar.xz.asc) = 7cea7d124c6de8b89f58aad46565cfb1a0ca51156d3643e88c6c5a97a27a7a0c819015491824aadb4c4b95930728fc3e2212bfc9260e0b303ed8878f9defb2db diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index d978bdf..8ee12fc 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -16,7 +16,7 @@ %bcond_without docs Name: webkit2gtk3 -Version: 2.36.3 +Version: 2.36.4 Release: %autorelease Summary: GTK Web content engine library @@ -35,6 +35,9 @@ Source2: webkitgtk-keys.gpg Patch0: aarch64-page-size.patch %endif +# https://bugs.webkit.org/show_bug.cgi?id=242340 +Patch1: fix-build.patch + BuildRequires: bison BuildRequires: bubblewrap BuildRequires: cmake From 834fdb74de21b580220c7c1b9aae72a4f9807488 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Tue, 12 Jul 2022 15:28:56 -0500 Subject: [PATCH 12/24] Update to 2.37.1 --- .gitignore | 2 ++ fix-build.patch | 54 ------------------------------------------------ sources | 4 ++-- webkit2gtk3.spec | 12 ++++------- 4 files changed, 8 insertions(+), 64 deletions(-) delete mode 100644 fix-build.patch diff --git a/.gitignore b/.gitignore index b8d8820..1493526 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,5 @@ /webkitgtk-2.36.3.tar.xz.asc /webkitgtk-2.36.4.tar.xz /webkitgtk-2.36.4.tar.xz.asc +/webkitgtk-2.37.1.tar.xz +/webkitgtk-2.37.1.tar.xz.asc diff --git a/fix-build.patch b/fix-build.patch deleted file mode 100644 index d95e1c8..0000000 --- a/fix-build.patch +++ /dev/null @@ -1,54 +0,0 @@ -From f20bac21ea37991c1a1110e78846897a406932f0 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Tue, 5 Jul 2022 08:23:12 -0500 -Subject: [PATCH] Revert "Merge r295034 - WebKitTestRunner shouldn't link - object files of JavaScriptCore and WebCore" - -This reverts commit 7916fda00b347ff263fbfe72c065032d1d9b523c. ---- - Source/JavaScriptCore/CMakeLists.txt | 12 +++++++++--- - Tools/WebKitTestRunner/CMakeLists.txt | 1 - - Tools/WebKitTestRunner/PlatformGTK.cmake | 4 ++++ - Tools/WebKitTestRunner/PlatformWin.cmake | 4 ++++ - 4 files changed, 17 insertions(+), 4 deletions(-) - -diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt -index 95a1300ce1b3..238208eb1137 100644 ---- a/Source/JavaScriptCore/CMakeLists.txt -+++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -456,7 +456,7 @@ if (MSVC AND NOT ENABLE_C_LOOP) - COMMAND ${MASM_EXECUTABLE} ${LLINT_MASM_FLAGS} ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.asm - VERBATIM) - list(APPEND JavaScriptCore_SOURCES ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj) -- add_library(LowLevelInterpreterLib STATIC llint/LowLevelInterpreter.cpp) -+ add_library(LowLevelInterpreterLib OBJECT llint/LowLevelInterpreter.cpp) - else () - # As there's poor toolchain support for using `.file` directives in - # inline asm (i.e. there's no way to avoid clashes with the `.file` -@@ -465,7 +465,7 @@ else () - # an object file. We only need to do this for LowLevelInterpreter.cpp - # and cmake doesn't allow us to introduce a compiler wrapper for a - # single source file, so we need to create a separate target for it. -- add_library(LowLevelInterpreterLib STATIC llint/LowLevelInterpreter.cpp -+ add_library(LowLevelInterpreterLib OBJECT llint/LowLevelInterpreter.cpp - ${JavaScriptCore_DERIVED_SOURCES_DIR}/${LLIntOutput}) - endif () - -@@ -1496,7 +1496,13 @@ if (CMAKE_COMPILER_IS_GNUCXX AND GCC_OFFLINEASM_SOURCE_MAP) - COMPILE_OPTIONS "-fno-lto") - endif () - --list(APPEND JavaScriptCore_PRIVATE_LIBRARIES LowLevelInterpreterLib) -+# When building JavaScriptCore as an object library, we need to make sure the -+# lowlevelinterpreter lib objects get propogated. -+if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "OBJECT") -+ list(APPEND JavaScriptCore_PRIVATE_LIBRARIES $) -+else () -+ list(APPEND JavaScriptCore_SOURCES $) -+endif () - - WEBKIT_COMPUTE_SOURCES(JavaScriptCore) - list(APPEND JavaScriptCore_SOURCES --- -2.36.1 - diff --git a/sources b/sources index 8711568..c3a8972 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (webkitgtk-2.36.4.tar.xz) = c5365c682ba4e8e6ad891638b5a82e74e38fa0867ce6c8e4e08a9dc15b862a6d3edc096a049e0711306972d6162d79fe90a0e76d8b395001798005e4488467f2 -SHA512 (webkitgtk-2.36.4.tar.xz.asc) = 7cea7d124c6de8b89f58aad46565cfb1a0ca51156d3643e88c6c5a97a27a7a0c819015491824aadb4c4b95930728fc3e2212bfc9260e0b303ed8878f9defb2db +SHA512 (webkitgtk-2.37.1.tar.xz) = 29935eed5e901780d6be02a7f1072f10e61ad96cecdc3495a71dc8ca00573fa9c485c909fcba928d818df6b901a265a077238ce5fa0cfcc657bdb991867facd8 +SHA512 (webkitgtk-2.37.1.tar.xz.asc) = 5b58dd14f79abcacc3ffa3a9655d9067d6ea392203ab96567a2420bc2d1fff94ea1b9147ad128a321803b99cb6e05aecdd7db14b784a2df177a5afb30ec6b0d1 diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 8ee12fc..a972b3c 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -16,7 +16,7 @@ %bcond_without docs Name: webkit2gtk3 -Version: 2.36.4 +Version: 2.37.1 Release: %autorelease Summary: GTK Web content engine library @@ -35,19 +35,16 @@ Source2: webkitgtk-keys.gpg Patch0: aarch64-page-size.patch %endif -# https://bugs.webkit.org/show_bug.cgi?id=242340 -Patch1: fix-build.patch - BuildRequires: bison BuildRequires: bubblewrap BuildRequires: cmake BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: gettext +BuildRequires: gi-docgen BuildRequires: git BuildRequires: gnupg2 BuildRequires: gperf -BuildRequires: gtk-doc BuildRequires: hyphen-devel BuildRequires: libatomic BuildRequires: ninja-build @@ -221,7 +218,6 @@ rm -rf Source/ThirdParty/qunit/ -GNinja \ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ - -DENABLE_MINIBROWSER=ON \ -DUSE_SOUP2=ON \ %if %{with docs} -DENABLE_GTKDOC=ON \ @@ -308,9 +304,9 @@ export NINJA_STATUS="[%f/%t][%e] " %files doc %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/jsc-glib-4.0/ +%{_datadir}/gtk-doc/html/javascriptcoregtk-4.0/ %{_datadir}/gtk-doc/html/webkit2gtk-4.0/ -%{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ +%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.0/ %endif %changelog From 4a9471bab621c68d050c6e63bd5d32f8c76c4ffe Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Tue, 12 Jul 2022 19:36:42 -0500 Subject: [PATCH 13/24] Fix cloop build --- fix-cloop-build.patch | 0 webkit2gtk3.spec | 3 +++ 2 files changed, 3 insertions(+) create mode 100644 fix-cloop-build.patch diff --git a/fix-cloop-build.patch b/fix-cloop-build.patch new file mode 100644 index 0000000..e69de29 diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index a972b3c..79030c3 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -35,6 +35,9 @@ Source2: webkitgtk-keys.gpg Patch0: aarch64-page-size.patch %endif +# https://bugs.webkit.org/show_bug.cgi?id=242579#c4 +Patch1: fix-cloop-build.patch + BuildRequires: bison BuildRequires: bubblewrap BuildRequires: cmake From 55a2e6dcc4f12cb449397020023ea111e831d1d1 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Tue, 12 Jul 2022 19:39:34 -0500 Subject: [PATCH 14/24] Really fix cloop build Actually adding contents to the patch helps a lot. --- fix-cloop-build.patch | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/fix-cloop-build.patch b/fix-cloop-build.patch index e69de29..f38f3f8 100644 --- a/fix-cloop-build.patch +++ b/fix-cloop-build.patch @@ -0,0 +1,27 @@ +From 40e49bb53218a986b4d6569f3fc2730cc4b71472 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Tue, 12 Jul 2022 16:56:56 -0700 +Subject: [PATCH] Fix cloop build after 252338@main + https://bugs.webkit.org/show_bug.cgi?id=242579 + +Reviewed by Mark Lam. + +* Source/JavaScriptCore/CMakeLists.txt: + +Canonical link: https://commits.webkit.org/252400@main +--- + Source/JavaScriptCore/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt +index aef0678e66f3..f4ba2716faef 100644 +--- a/Source/JavaScriptCore/CMakeLists.txt ++++ b/Source/JavaScriptCore/CMakeLists.txt +@@ -837,6 +837,7 @@ set(JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS + inspector/remote/RemoteInspector.h + + interpreter/AbstractPC.h ++ interpreter/CLoopStack.h + interpreter/CallFrame.h + interpreter/CallFrameInlines.h + interpreter/CalleeBits.h From 1fcd4af3a4ed16f5971fd8d39373267239a66741 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Mon, 18 Jul 2022 13:52:47 -0500 Subject: [PATCH 15/24] Attempt to unbreak --without-docs build for Coverity --- webkit2gtk3.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 79030c3..b60c83d 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -222,8 +222,8 @@ rm -rf Source/ThirdParty/qunit/ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -DUSE_SOUP2=ON \ -%if %{with docs} - -DENABLE_GTKDOC=ON \ +%if %{without docs} + -DENABLE_DOCUMENTATION=OFF \ %endif %if !0%{?with_gamepad} -DENABLE_GAMEPAD=OFF \ From 7ad3b30f85bb30bda7e83c20704c5295597e8d58 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 19 Jul 2022 04:37:55 +0200 Subject: [PATCH 16/24] Add new webkit2gtk4.1 subpackage for parallel-installable 4.1 API The current 4.0 API is for libsoup 2 builds, and the new one, 4.1 is for libsoup 3 builds. mcatanzaro's master plan is to have webkit2gtk4.0 subpackage for GTK 3 and libsoup 2 builds, webkit2gtk4.1 subpackage for GTK 3 and libsoup 3 builds, and webkit2gtk5.0 subpackage for GTK 4 and libsoup 3 builds. There is still a bit more renaming to do to get there after this change, but it should be a good first step. This is all based on mcatanzaro's work. --- webkit2gtk3.spec | 140 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 133 insertions(+), 7 deletions(-) diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index b60c83d..b27985d 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -85,6 +85,7 @@ BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: pkgconfig(libsoup-3.0) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libtasn1) BuildRequires: pkgconfig(libwebp) @@ -133,13 +134,27 @@ Provides: bundled(xdgmime) Requires: %{name}-jsc%{?_isa} = %{version}-%{release} # Filter out provides for private libraries -%global __provides_exclude_from ^%{_libdir}/webkit2gtk-4\\.0/.*\\.so$ +%global __provides_exclude_from ^%{_libdir}/webkit2gtk-?\\.?/.*\\.so$ %description -WebKitGTK is the port of the portable web rendering engine WebKit to the -GTK platform. +WebKitGTK is the port of the WebKit web rendering engine to the +GTK platform. This package contains WebKitGTK for GTK 3 and libsoup 2. -This package contains WebKit2 based WebKitGTK for GTK 3. +%package -n webkit2gtk4.1 +Summary: WebKitGTK for GTK 3 and libsoup 3 +Requires: webkit2gtk4.1-jsc%{?_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(xdgmime) + +%description -n webkit2gtk4.1 +WebKitGTK is the port of the WebKit web rendering engine to the +GTK platform. This package contains WebKitGTK for GTK 3 and libsoup 3. %package devel Summary: Development files for %{name} @@ -153,6 +168,16 @@ Provides: webkitgtk4-devel = %{version}-%{release} The %{name}-devel package contains libraries, build data, and header files for developing applications that use %{name}. +%package -n webkit2gtk4.1-devel +Summary: Development files for webkit2gtk4.1 +Requires: webkit2gtk4.1%{?_isa} = %{version}-%{release} +Requires: webkit2gtk4.1-jsc%{?_isa} = %{version}-%{release} +Requires: webkit2gtk4.1-jsc-devel%{?_isa} = %{version}-%{release} + +%description -n webkit2gtk4.1-devel +The webkit2gtk4.1-devel package contains libraries, build data, and header +files for developing applications that use webkit2gtk4.1. + %if %{with docs} %package doc Summary: Documentation files for %{name} @@ -163,6 +188,14 @@ Provides: webkitgtk4-doc = %{version}-%{release} %description doc This package contains developer documentation for %{name}. + +%package -n webkit2gtk4.1-doc +Summary: Documentation files for webkit2gtk4.1 +BuildArch: noarch +Requires: webkit2gtk4.1 = %{version}-%{release} + +%description -n webkit2gtk4.1-doc +This package contains developer documentation for webkit2gtk4.1. %endif %package jsc @@ -173,6 +206,12 @@ Provides: webkitgtk4-jsc = %{version}-%{release} %description jsc This package contains JavaScript engine from %{name}. +%package -n webkit2gtk4.1-jsc +Summary: JavaScript engine from webkit2gtk4.1 + +%description -n webkit2gtk4.1-jsc +This package contains JavaScript engine from webkit2gtk4.1. + %package jsc-devel Summary: Development files for JavaScript engine from %{name} Requires: %{name}-jsc%{?_isa} = %{version}-%{release} @@ -183,6 +222,14 @@ Provides: webkitgtk4-jsc-devel = %{version}-%{release} The %{name}-jsc-devel package contains libraries, build data, and header files for developing applications that use JavaScript engine from %{name}. +%package -n webkit2gtk4.1-jsc-devel +Summary: Development files for JavaScript engine from webkit2gtk4.1 +Requires: webkit2gtk4.1-jsc%{?_isa} = %{version}-%{release} + +%description -n webkit2gtk4.1-jsc-devel +The webkit2gtk4.1-jsc-devel package contains libraries, build data, and header +files for developing applications that use JavaScript engine from webkit2gtk-4.1. + %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 -n webkitgtk-%{version} @@ -217,6 +264,7 @@ rm -rf Source/ThirdParty/qunit/ # on WebKitGTK, because it calls each object's get_type() function, which will # initialize bmalloc and JIT. +%define _vpath_builddir %{_vendor}-%{_target_os}-build-webkit2gtk-4.0 %cmake \ -GNinja \ -DPORT=GTK \ @@ -236,14 +284,43 @@ rm -rf Source/ThirdParty/qunit/ %endif %{nil} +%define _vpath_builddir %{_vendor}-%{_target_os}-build-webkit2gtk-4.1 +%cmake \ + -GNinja \ + -DPORT=GTK \ + -DCMAKE_BUILD_TYPE=Release \ +%if %{without docs} + -DENABLE_DOCUMENTATION=OFF \ +%endif +%if !0%{?with_gamepad} + -DENABLE_GAMEPAD=OFF \ +%endif +%if 0%{?rhel} +%ifarch aarch64 + -DENABLE_JIT=OFF \ + -DUSE_SYSTEM_MALLOC=ON \ +%endif +%endif + %{nil} + # Show the build time in the status. Require 2 GB of RAM per vCPU. -export NINJA_STATUS="[%f/%t][%e] " +%define _vpath_builddir %{_vendor}-%{_target_os}-build-webkit2gtk-4.0 +export NINJA_STATUS="[1/2][%f/%t %es] " +%cmake_build %limit_build -m 2048 + +%define _vpath_builddir %{_vendor}-%{_target_os}-build-webkit2gtk-4.1 +export NINJA_STATUS="[2/2][%f/%t %es] " %cmake_build %limit_build -m 2048 %install +%define _vpath_builddir %{_vendor}-%{_target_os}-build-webkit2gtk-4.0 +%cmake_install + +%define _vpath_builddir %{_vendor}-%{_target_os}-build-webkit2gtk-4.1 %cmake_install %find_lang WebKit2GTK-4.0 +%find_lang WebKit2GTK-4.1 # Finally, copy over and rename various files for %%license inclusion %add_to_license_files Source/JavaScriptCore/COPYING.LIB @@ -265,7 +342,7 @@ export NINJA_STATUS="[%f/%t][%e] " %license _license_files/*WebCore* %license _license_files/*WebInspectorUI* %license _license_files/*WTF* -%{_libdir}/libwebkit2gtk-4.0.so.* +%{_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 @@ -273,6 +350,20 @@ export NINJA_STATUS="[%f/%t][%e] " %{_libexecdir}/webkit2gtk-4.0/ %exclude %{_libexecdir}/webkit2gtk-4.0/MiniBrowser %exclude %{_libexecdir}/webkit2gtk-4.0/jsc + +%files -n webkit2gtk4.1 -f WebKit2GTK-4.1.lang +%license _license_files/*ThirdParty* +%license _license_files/*WebCore* +%license _license_files/*WebInspectorUI* +%license _license_files/*WTF* +%{_libdir}/libwebkit2gtk-4.1.so.0* +%dir %{_libdir}/girepository-1.0 +%{_libdir}/girepository-1.0/WebKit2-4.1.typelib +%{_libdir}/girepository-1.0/WebKit2WebExtension-4.1.typelib +%{_libdir}/webkit2gtk-4.1/ +%{_libexecdir}/webkit2gtk-4.1/ +%exclude %{_libexecdir}/webkit2gtk-4.1/MiniBrowser +%exclude %{_libexecdir}/webkit2gtk-4.1/jsc %{_bindir}/WebKitWebDriver %files devel @@ -287,12 +378,30 @@ export NINJA_STATUS="[%f/%t][%e] " %{_datadir}/gir-1.0/WebKit2-4.0.gir %{_datadir}/gir-1.0/WebKit2WebExtension-4.0.gir +%files -n webkit2gtk4.1-devel +%{_libexecdir}/webkit2gtk-4.1/MiniBrowser +%{_includedir}/webkitgtk-4.1/ +%exclude %{_includedir}/webkitgtk-4.1/JavaScriptCore +%exclude %{_includedir}/webkitgtk-4.1/jsc +%{_libdir}/libwebkit2gtk-4.1.so +%{_libdir}/pkgconfig/webkit2gtk-4.1.pc +%{_libdir}/pkgconfig/webkit2gtk-web-extension-4.1.pc +%dir %{_datadir}/gir-1.0 +%{_datadir}/gir-1.0/WebKit2-4.1.gir +%{_datadir}/gir-1.0/WebKit2WebExtension-4.1.gir + %files jsc %license _license_files/*JavaScriptCore* -%{_libdir}/libjavascriptcoregtk-4.0.so.* +%{_libdir}/libjavascriptcoregtk-4.0.so.18* %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/JavaScriptCore-4.0.typelib +%files -n webkit2gtk4.1-jsc +%license _license_files/*JavaScriptCore* +%{_libdir}/libjavascriptcoregtk-4.1.so.0* +%dir %{_libdir}/girepository-1.0 +%{_libdir}/girepository-1.0/JavaScriptCore-4.1.typelib + %files jsc-devel %{_libexecdir}/webkit2gtk-4.0/jsc %dir %{_includedir}/webkitgtk-4.0 @@ -303,6 +412,16 @@ export NINJA_STATUS="[%f/%t][%e] " %dir %{_datadir}/gir-1.0 %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir +%files -n webkit2gtk4.1-jsc-devel +%{_libexecdir}/webkit2gtk-4.1/jsc +%dir %{_includedir}/webkitgtk-4.1 +%{_includedir}/webkitgtk-4.1/JavaScriptCore/ +%{_includedir}/webkitgtk-4.1/jsc/ +%{_libdir}/libjavascriptcoregtk-4.1.so +%{_libdir}/pkgconfig/javascriptcoregtk-4.1.pc +%dir %{_datadir}/gir-1.0 +%{_datadir}/gir-1.0/JavaScriptCore-4.1.gir + %if %{with docs} %files doc %dir %{_datadir}/gtk-doc @@ -310,6 +429,13 @@ export NINJA_STATUS="[%f/%t][%e] " %{_datadir}/gtk-doc/html/javascriptcoregtk-4.0/ %{_datadir}/gtk-doc/html/webkit2gtk-4.0/ %{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.0/ + +%files -n webkit2gtk4.1-doc +%dir %{_datadir}/gtk-doc +%dir %{_datadir}/gtk-doc/html +%{_datadir}/gtk-doc/html/javascriptcoregtk-4.1/ +%{_datadir}/gtk-doc/html/webkit2gtk-4.1/ +%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.1/ %endif %changelog From efc94252ce5f724a35939349f97184b7131b18ab Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 19 Jul 2022 04:40:02 +0200 Subject: [PATCH 17/24] Disable webdriver for libsoup 2 builds Unclear what's the best way forward here; maybe we could just install the same /usr/bin/WebKitWebDriver in all future subpackages (webkit2gtk4.0, webkit2gtk4.1, webkit2gtk5.0). Disable it for now for the first iteration. --- webkit2gtk3.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index b27985d..64138c1 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -270,6 +270,7 @@ rm -rf Source/ThirdParty/qunit/ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -DUSE_SOUP2=ON \ + -DENABLE_WEBDRIVER=OFF \ %if %{without docs} -DENABLE_DOCUMENTATION=OFF \ %endif From b6cc8d766f252c2810337a0bb624d3e20b616c1e Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 19 Jul 2022 09:40:45 +0200 Subject: [PATCH 18/24] Disable debuginfo Looks like the size of the package is making builders crash. I suspect they run out of memory and kojid gets oom-killed or something along these lines. This commit completely disables debuginfo to be able to get a build out with 4.1 API so we can continue building the rest of GNOME. I suspect we will have to split this package up into different source packages to get it back to building properly as the unified package (4.0 + 4.1 + 5.0 API) would be just too massive. --- webkit2gtk3.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 64138c1..2496e27 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -251,10 +251,8 @@ rm -rf Source/ThirdParty/qunit/ # Remove debuginfo to reduce memory consumption: # https://bugs.webkit.org/show_bug.cgi?id=140176 # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/I6IVNA52TXTBRQLKW45CJ5K4RA4WNGMI/ -%ifarch %{arm} %{ix86} %global debug_package %{nil} %global optflags %(echo %{optflags} | sed 's/-g /-g0 /') -%endif # Warning: although RHEL 9 aarch64 now uses 4 KB page sizes, we still have to # support 64 KB page sizes until the *builders* use RHEL 9. This means we still From 26d3c3f77785d2f7b769ab7622bd94e04c4dc73b Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Tue, 19 Jul 2022 08:08:43 -0500 Subject: [PATCH 19/24] Revert "Disable debuginfo" This reverts commit b6cc8d766f252c2810337a0bb624d3e20b616c1e. We needed to do this to get an emergency build, but it's not an acceptable solution going forward. --- webkit2gtk3.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 2496e27..64138c1 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -251,8 +251,10 @@ rm -rf Source/ThirdParty/qunit/ # Remove debuginfo to reduce memory consumption: # https://bugs.webkit.org/show_bug.cgi?id=140176 # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/I6IVNA52TXTBRQLKW45CJ5K4RA4WNGMI/ +%ifarch %{arm} %{ix86} %global debug_package %{nil} %global optflags %(echo %{optflags} | sed 's/-g /-g0 /') +%endif # Warning: although RHEL 9 aarch64 now uses 4 KB page sizes, we still have to # support 64 KB page sizes until the *builders* use RHEL 9. This means we still From 71e18562c7cb019b3a0a63af8f8417392b2259dc Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Tue, 19 Jul 2022 08:43:58 -0500 Subject: [PATCH 20/24] Add Provides: bundled(pdfjs) --- webkit2gtk3.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 64138c1..1836065 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -128,6 +128,7 @@ Provides: webkitgtk4 = %{version}-%{release} # We're supposed to specify versions here, but these libraries don't do # normal releases. Accordingly, they're not suitable to be system libs. Provides: bundled(angle) +Provides: bundled(pdfjs) Provides: bundled(xdgmime) # Require the jsc subpackage @@ -150,6 +151,7 @@ Recommends: gstreamer1-plugins-bad-free Recommends: gstreamer1-plugins-good Recommends: xdg-desktop-portal-gtk Provides: bundled(angle) +Provides: bundled(pdfjs) Provides: bundled(xdgmime) %description -n webkit2gtk4.1 From 62fc95b35aaf2fd958af15fc2a4b6b1631c80c64 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Tue, 19 Jul 2022 08:44:36 -0500 Subject: [PATCH 21/24] Reduce parallelization: require 3 GiB of RAM per vCPU We were hitting OOMs on koji, so let's try toning things down a little. This will make everything slower, but hopefully less likely to OOM? --- webkit2gtk3.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 1836065..44ffc38 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -306,14 +306,14 @@ rm -rf Source/ThirdParty/qunit/ %endif %{nil} -# Show the build time in the status. Require 2 GB of RAM per vCPU. +# Show the build time in the status. Require 3 GB of RAM per vCPU. %define _vpath_builddir %{_vendor}-%{_target_os}-build-webkit2gtk-4.0 export NINJA_STATUS="[1/2][%f/%t %es] " -%cmake_build %limit_build -m 2048 +%cmake_build %limit_build -m 3072 %define _vpath_builddir %{_vendor}-%{_target_os}-build-webkit2gtk-4.1 export NINJA_STATUS="[2/2][%f/%t %es] " -%cmake_build %limit_build -m 2048 +%cmake_build %limit_build -m 3072 %install %define _vpath_builddir %{_vendor}-%{_target_os}-build-webkit2gtk-4.0 From 11dc8d0e81b7aebfe8a7a79b3bf11f5382618982 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:18:46 +0000 Subject: [PATCH 22/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From aaaacab7e473640b50f73c3db879e90999806369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Tue, 2 Aug 2022 13:22:44 +0200 Subject: [PATCH 23/24] Rebuilt for ICU 71.1 From e06b96893bd855cf80de20ba12761c9abd740116 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Mon, 8 Aug 2022 08:10:51 -0500 Subject: [PATCH 24/24] Obsoleted by webkitgtk package --- .gitignore | 111 ---------- aarch64-page-size.patch | 19 -- changelog | 340 ------------------------------ dead.package | 1 + fix-cloop-build.patch | 27 --- rpminspect.yaml | 4 - sources | 2 - webkit2gtk3.spec | 445 ---------------------------------------- webkitgtk-keys.gpg | Bin 2816 -> 0 bytes 9 files changed, 1 insertion(+), 948 deletions(-) delete mode 100644 .gitignore delete mode 100644 aarch64-page-size.patch delete mode 100644 changelog create mode 100644 dead.package delete mode 100644 fix-cloop-build.patch delete mode 100644 rpminspect.yaml delete mode 100644 sources delete mode 100644 webkit2gtk3.spec delete mode 100644 webkitgtk-keys.gpg diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1493526..0000000 --- a/.gitignore +++ /dev/null @@ -1,111 +0,0 @@ -/webkitgtk-2.19.5.tar.xz -/webkitgtk-2.19.6.tar.xz -/webkitgtk-2.19.90.tar.xz -/webkitgtk-2.19.91.tar.xz -/webkitgtk-2.19.92.tar.xz -/webkitgtk-2.20.0.tar.xz -/webkitgtk-2.20.1.tar.xz -/webkitgtk-2.21.1.tar.xz -/webkitgtk-2.21.2.tar.xz -/webkitgtk-2.21.3.tar.xz -/webkitgtk-2.21.4.tar.xz -/webkitgtk-2.21.5.tar.xz -/webkitgtk-2.21.91.tar.xz -/webkitgtk-2.21.92.tar.xz -/webkitgtk-2.22.0.tar.xz -/webkitgtk-2.22.1.tar.xz -/webkitgtk-2.22.2.tar.xz -/webkitgtk-2.22.3.tar.xz -/webkitgtk-2.22.4.tar.xz -/webkitgtk-2.23.1.tar.xz -/webkitgtk-2.23.2.tar.xz -/webkitgtk-2.23.3.tar.xz -/webkitgtk-2.23.90.tar.xz -/webkitgtk-2.23.91.tar.xz -/webkitgtk-2.23.92.tar.xz -/webkitgtk-2.24.0.tar.xz -/webkitgtk-2.24.1.tar.xz -/webkitgtk-2.24.2.tar.xz -/webkitgtk-2.25.1.tar.xz -/webkitgtk-2.25.2.tar.xz -/webkitgtk-2.25.3.tar.xz -/webkitgtk-2.25.4.tar.xz -/webkitgtk-2.25.92.tar.xz -/webkitgtk-2.26.0.tar.xz -/webkitgtk-2.26.1.tar.xz -/webkitgtk-2.27.1.tar.xz -/webkitgtk-2.27.2.tar.xz -/webkitgtk-2.27.3.tar.xz -/webkitgtk-2.27.4.tar.xz -/webkitgtk-2.27.90.tar.xz -/webkitgtk-2.27.91.tar.xz -/webkitgtk-2.28.0.tar.xz -/webkitgtk-2.28.1.tar.xz -/webkitgtk-2.28.2.tar.xz -/webkitgtk-2.29.1.tar.xz -/webkitgtk-2.29.2.tar.xz -/webkitgtk-2.29.2.tar.xz.asc -/webkitgtk-2.29.3.tar.xz -/webkitgtk-2.29.3.tar.xz.asc -/webkitgtk-2.29.4.tar.xz -/webkitgtk-2.29.4.tar.xz.asc -/webkitgtk-2.29.91.tar.xz -/webkitgtk-2.29.91.tar.xz.asc -/webkitgtk-2.29.92.tar.xz -/webkitgtk-2.29.92.tar.xz.asc -/webkitgtk-2.30.0.tar.xz.asc -/webkitgtk-2.30.0.tar.xz -/webkitgtk-2.30.1.tar.xz -/webkitgtk-2.30.1.tar.xz.asc -/webkitgtk-2.30.2.tar.xz -/webkitgtk-2.30.2.tar.xz.asc -/webkitgtk-2.30.3.tar.xz -/webkitgtk-2.30.3.tar.xz.asc -/webkitgtk-2.30.4.tar.xz -/webkitgtk-2.30.4.tar.xz.asc -/webkitgtk-2.31.1.tar.xz -/webkitgtk-2.31.1.tar.xz.asc -/webkitgtk-2.31.90.tar.xz.asc -/webkitgtk-2.31.90.tar.xz -/webkitgtk-2.31.91.tar.xz -/webkitgtk-2.31.91.tar.xz.asc -/webkitgtk-2.32.0.tar.xz -/webkitgtk-2.32.0.tar.xz.asc -/webkitgtk-2.32.1.tar.xz -/webkitgtk-2.32.1.tar.xz.asc -/webkitgtk-2.33.1.tar.xz -/webkitgtk-2.33.1.tar.xz.asc -/webkitgtk-2.33.2.tar.xz -/webkitgtk-2.33.2.tar.xz.asc -/webkitgtk-2.33.3.tar.xz -/webkitgtk-2.33.3.tar.xz.asc -/webkitgtk-2.33.90.tar.xz -/webkitgtk-2.33.90.tar.xz.asc -/webkitgtk-2.33.91.tar.xz -/webkitgtk-2.33.91.tar.xz.asc -/webkitgtk-2.34.0.tar.xz -/webkitgtk-2.34.0.tar.xz.asc -/webkitgtk-2.34.1.tar.xz -/webkitgtk-2.34.1.tar.xz.asc -/webkitgtk-2.34.2.tar.xz -/webkitgtk-2.34.2.tar.xz.asc -/webkitgtk-2.35.1.tar.xz -/webkitgtk-2.35.1.tar.xz.asc -/webkitgtk-2.35.2.tar.xz -/webkitgtk-2.35.2.tar.xz.asc -/webkitgtk-2.35.3.tar.xz -/webkitgtk-2.35.3.tar.xz.asc -/webkitgtk-2.35.90.tar.xz -/webkitgtk-2.35.90.tar.xz.asc -/webkitgtk-2.36.0.tar.xz -/webkitgtk-2.36.0.tar.xz.asc -/webkitgtk-2.36.1.tar.xz -/webkitgtk-2.36.1.tar.xz.asc -/webkitgtk-2.36.2.tar.xz -/webkitgtk-2.36.2.tar.xz.asc -/webkitgtk-2.36.3.tar.xz -/webkitgtk-2.36.3.tar.xz.asc -/webkitgtk-2.36.4.tar.xz -/webkitgtk-2.36.4.tar.xz.asc -/webkitgtk-2.37.1.tar.xz -/webkitgtk-2.37.1.tar.xz.asc diff --git a/aarch64-page-size.patch b/aarch64-page-size.patch deleted file mode 100644 index 15aaacb..0000000 --- a/aarch64-page-size.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h -index 9bb7fffcc1ae..3e1e24aa69f5 100644 ---- a/Source/WTF/wtf/PageBlock.h -+++ b/Source/WTF/wtf/PageBlock.h -@@ -45,11 +45,11 @@ namespace WTF { - // On Linux, Power systems normally use 64 KiB pages. - // - // Use 64 KiB for any unknown CPUs to be conservative. --#if OS(DARWIN) || PLATFORM(PLAYSTATION) || CPU(MIPS) || CPU(MIPS64) || (OS(LINUX) && CPU(ARM64)) -+#if OS(DARWIN) || PLATFORM(PLAYSTATION) || CPU(MIPS) || CPU(MIPS64) - constexpr size_t CeilingOnPageSize = 16 * KB; --#elif CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) -+#elif CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) || CPU(ARM64) - constexpr size_t CeilingOnPageSize = 64 * KB; --#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(RISCV64) -+#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(RISCV64) - constexpr size_t CeilingOnPageSize = 4 * KB; - #else - #error Must set CeilingOnPageSize in PageBlock.h when adding a new CPU architecture! diff --git a/changelog b/changelog deleted file mode 100644 index 2ee840e..0000000 --- a/changelog +++ /dev/null @@ -1,340 +0,0 @@ -* Tue Jun 15 2021 Michael Catanzaro - 2.33.2-2 -- Add missing GStreamer recommends - -* Tue Jun 08 2021 Michael Catanzaro - 2.33.2-1 -- Update to 2.33.2 - -* Mon May 24 2021 Michael Catanzaro - 2.33.1-3 -- Unbreak gamepad support - -* Thu May 20 2021 Pete Walter - 2.33.1-2 -- Rebuild for ICU 69 - -* Fri May 14 2021 Michael Catanzaro - 2.33.1-1 -- Update to 2.33.1 - -* Mon May 10 2021 Michael Catanzaro - 2.32.1-1 -- Update to 2.32.1 - -* Wed Mar 31 2021 Jonathan Wakely - 2.32.0-2 -- Rebuilt for removed libstdc++ symbols (#1937698) - -* Fri Mar 26 2021 Michael Catanzaro - 2.32.0-1 -- Update to 2.32.0 - -* Fri Mar 12 2021 Michael Catanzaro - 2.31.91-1 -- Update to 2.31.91 - -* Tue Mar 02 2021 Michael Catanzaro - 2.31.90-1 -- Update to 2.31.90 - -* Wed Jan 27 2021 Fedora Release Engineering - 2.31.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Jan 14 2021 Michael Catanzaro - 2.31.1-3 -- Fix multilib conflict in gir files - -* Wed Jan 13 2021 Michael Catanzaro - 2.31.1-2 -- Disable gamepad support in RHEL - -* Tue Jan 12 2021 Michael Catanzaro - 2.31.1-1 -- Update to 2.31.1 - -* Tue Dec 15 2020 Michael Catanzaro - 2.30.4-1 -- Update to 2.30.4 - -* Tue Nov 24 2020 Michael Catanzaro - 2.30.3-1 -- Update to 2.30.3 - -* Wed Nov 11 2020 Jeff Law - 2.30.2-2 -- Fix bogus volatile caught by gcc-11 - -* Mon Oct 26 2020 Michael Catanzaro - 2.30.2-1 -- Update to 2.30.2 - -* Mon Sep 21 2020 Michael Catanzaro - 2.30.1-1 -- Update to 2.30.1 - -* Fri Sep 11 2020 Michael Catanzaro - 2.30.0-1 -- Update to 2.30.0. Add patch for libwpe#59. - -* Fri Sep 04 2020 Michael Catanzaro - 2.29.92-1 -- Update to 2.29.92 - -* Mon Aug 17 2020 Michael Catanzaro - 2.29.91-1 -- Update to 2.29.91 - -* Wed Jul 29 2020 Michael Catanzaro - 2.29.4-1 -- Update to 2.29.4 - -* Tue Jul 14 2020 Michael Catanzaro - 2.29.3-2 -- Drop some Requires to Recommends - -* Wed Jul 08 2020 Michael Catanzaro - 2.29.3-1 -- Update to 2.29.3 - -* Wed Jul 01 2020 Jeff Law - 2.29.2-2 -- Disable LTO - -* Wed Jun 24 2020 Michael Catanzaro - 2.29.2-1 -- Update to 2.29.2 - -* Mon May 18 2020 Michael Catanzaro - 2.29.1-1 -- Update to 2.29.1 - -* Sat May 16 2020 Pete Walter - 2.28.2-3 -- Rebuild for ICU 67 - -* Fri May 08 2020 Michael Catanzaro - 2.28.2-2 -- Fix garbage collection on ppc64le and s390x after upgrade to 2.28 - -* Fri Apr 24 2020 Michael Catanzaro - 2.28.2-1 -- Update to 2.28.2 - -* Fri Apr 17 2020 Michael Catanzaro - 2.28.1-4 -- Actually reenable WPE renderer. - -* Fri Apr 17 2020 Michael Catanzaro - 2.28.1-3 -- Fix and reenable WPE renderer. Fix popup menus in X11. - -* Wed Apr 15 2020 Michael Catanzaro - 2.28.1-2 -- Disable WPE renderer again. - -* Mon Apr 13 2020 Michael Catanzaro - 2.28.1-1 -- Update to 2.28.1 - -* Thu Apr 09 2020 Michael Catanzaro - 2.28.0-9 -- Reenable WPE renderer, seems to have mysteriously fixed itself. -- Second attempt to fix ppc64le. - -* Tue Mar 24 2020 Michael Catanzaro - 2.28.0-8 -- Fix accelerated compositing mode with bubblewrap sandbox enabled -- Fix JavaScriptCore on ppc64le - -* Mon Mar 16 2020 Michael Catanzaro - 2.28.0-7 -- Disable WPE renderer since it's busted, rhbz#1813993. -- Use perl() syntax to denote perl dependencies. -- Bump revision to maintain upgrade path - -* Wed Mar 11 2020 Michael Catanzaro - 2.28.0-3 -- BuildRequires: perl-English - -* Wed Mar 11 2020 Michael Catanzaro - 2.28.0-2 -- Rebuild with koji hopefully not broken this time? -- Add perl-FindBin BuildRequires - -* Wed Mar 11 2020 Michael Catanzaro - 2.28.0-1 -- Update to 2.28.0 - -* Thu Feb 27 2020 Michael Catanzaro - 2.27.91-1 -- Update to 2.27.91 - -* Mon Feb 10 2020 Michael Catanzaro - 2.27.90-2 -- Add GPG verification during prep - -* Mon Feb 10 2020 Michael Catanzaro - 2.27.90-1 -- Update to 2.27.90 - -* Mon Feb 10 2020 Eike Rathke - 2.27.4-3 -- Resolves: rhbz#1800249 Fix FTBFS - -* Fri Jan 31 2020 Fedora Release Engineering - 2.27.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jan 10 2020 Eike Rathke - 2.27.4-1 -- Update to 2.27.4 - -* Wed Dec 04 2019 Michael Catanzaro - 2.27.3-2 -- Fix minor file and directory ownership issues, rhbz#1779754 and rhbz#1779772 - -* Tue Nov 26 2019 Eike Rathke - 2.27.3-1 -- Resolves: rhbz#1776825 Update to 2.27.3 - -* Sat Nov 02 2019 Pete Walter - 2.27.2-2 -- Rebuild for ICU 65 - -* Tue Oct 22 2019 Eike Rathke - 2.27.2-1 -- Resolves: rhbz#1764135 Update to 2.27.2 - -* Fri Oct 04 2019 Eike Rathke - 2.27.1-1 -- Resolves: rhbz#1758590 Update to 2.27.1 - -* Thu Sep 26 2019 Eike Rathke - 2.26.1-1 -- Resolves: rhbz#1754472 Update to 2.26.1 - -* Thu Sep 19 2019 Michael Catanzaro - 2.26.0-3 -- Enable WPE renderer, resolves rhbz#1753730 - -* Tue Sep 17 2019 Tomas Popela - 2.26.0-2 -- Backport fix for a crash when closing the view and HW acceleration is enabled -- Resolves: rhbz#1750345 -- Backport fix for EGL_BAD_ALLOC -- Resolves: rhbz#1751936 - -* Mon Sep 09 2019 Kalev Lember - 2.26.0-1 -- Update to 2.26.0 - -* Wed Sep 04 2019 Michael Catanzaro - 2.25.92-2 -- Add patch to fix startup in X11 when not using gdm - -* Tue Sep 03 2019 Eike Rathke - 2.25.92-1 -- Resolves: rhbz#1748305 Update to 2.25.92 - -* Fri Aug 02 2019 Eike Rathke - 2.25.4-1 -- Update to 2.25.4 - -* Fri Jul 26 2019 Tomas Popela - 2.25.3-2 -- Follow-up fixes for the GTK2 plugins support removal -- Fixes: rhbz#1733436 - -* Tue Jul 23 2019 Eike Rathke - 2.25.3-1 -- Update to 2.25.3 -- This removes support for GTK 2 based NPAPI plugins (such as Adobe Flash) - -* Wed Jul 17 2019 Adam Williamson - 2.25.2-2 -- Backport fix for crasher that affects Evolution (bwo#199621) - -* Mon Jun 24 2019 Eike Rathke - 2.25.2-1 -- Update to 2.25.2 - -* Thu Jun 06 2019 Eike Rathke - 2.25.1-1 -- Update to 2.25.1 - -* Fri May 17 2019 Eike Rathke - 2.24.2-1 -- Update to 2.24.2 - -* Tue Apr 09 2019 Eike Rathke - 2.24.1-1 -- Update to 2.24.1 - -* Wed Mar 13 2019 Tomas Popela - 2.24.0-1 -- Update to 2.24.0 - -* Fri Mar 08 2019 Tomas Popela - 2.23.92-1 -- Update to 2.23.92 -- Switch to python3 - -* Wed Feb 20 2019 Eike Rathke - 2.23.91-1 -- Update to 2.23.91 - -* Mon Feb 18 2019 Eike Rathke - 2.23.90-1 -- Update to 2.23.90 - -* Sun Feb 03 2019 Fedora Release Engineering - 2.23.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jan 24 2019 Pete Walter - 2.23.3-2 -- Rebuild for ICU 63 - -* Mon Jan 14 2019 Eike Rathke - 2.23.3-1 -- Update to 2.23.3 - -* Tue Nov 27 2018 Eike Rathke - 2.23.1-1 -- Update to 2.23.1 - -* Thu Nov 22 2018 Tomáš Popela - 2.22.4-1 -- Update to 2.22.4 - -* Thu Nov 01 2018 Tomas Popela - 2.22.3-2 -- Switch to using pkgconfig build requires -- Switch to enchant-2 -- Resolves: rhbz#1631486 - -* Mon Oct 29 2018 Tomas Popela - 2.22.3-1 -- Update to 2.22.3 - -* Fri Oct 19 2018 Tomas Popela - 2.22.2-3 -- Fix WebProcess crash while printing -- Resolves: rhbz#1639754 - -* Tue Sep 25 2018 Tomas Popela - 2.22.2-2 -- Switch to Ninja: - -7 minutes on the x86_64 - -11 minutes on ppc64le - -13 minutes on i686 - -13 minutes on s390x - -10 minutes on armv7hl - -19 minutes on aarch64 - -* Sun Sep 23 2018 Tomas Popela - 2.22.2-1 -- Update to 2.22.2 - -* Thu Sep 20 2018 Tomas Popela - 2.22.1-1 -- Update to 2.22.1 - -* Fri Sep 07 2018 Kalev Lember - 2.22.0-3 -- Rebuilt against fixed atk (#1626575) - -* Fri Sep 07 2018 Kalev Lember - 2.22.0-2 -- Rebuilt for GNOME 3.30.0 megaupdate - -* Mon Sep 03 2018 Tomas Popela - 2.22.0-1 -- Update to 2.22.0 - -* Thu Aug 30 2018 Tomas Popela - 2.21.92-2 -- Update the JSC build fix patch - -* Wed Aug 29 2018 Tomas Popela - 2.21.92-1 -- Update to 2.21.92 - -* Thu Aug 16 2018 Tomas Popela - 2.21.91-1 -- Update to 2.21.91 - -* Fri Jul 20 2018 Tomas Popela - 2.21.5-1 -- Update to 2.21.5 - -* Mon Jul 16 2018 Tomas Popela - 2.21.4-4 -- Fix the broken build due to python2 changes - -* Sat Jul 14 2018 Fedora Release Engineering - 2.21.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jul 10 2018 Pete Walter - 2.21.4-2 -- Rebuild for ICU 62 - -* Tue Jun 12 2018 Tomas Popela - 2.21.4-1 -- Update to 2.21.4 - -* Mon May 28 2018 Tomas Popela - 2.21.3-1 -- Update to 2.21.3 - -* Thu May 24 2018 Tomas Popela - 2.21.2-2 -- Explicitly specify python2 over python and add python2 to BR - -* Mon May 21 2018 Tomas Popela - 2.21.2-1 -- Update to 2.21.2 - -* Mon Apr 30 2018 Pete Walter - 2.21.1-2 -- Rebuild for ICU 61.1 - -* Wed Apr 18 2018 Tomas Popela - 2.21.1-1 -- Update to 2.21.1 - -* Tue Apr 10 2018 Tomas Popela - 2.20.1-1 -- Update to 2.20.1 - -* Mon Mar 12 2018 Kalev Lember - 2.20.0-2 -- Bump webkitgtk4 obsoletes versions - -* Mon Mar 12 2018 Tomas Popela - 2.20.0-1 -- Update to 2.20.0 - -* Tue Mar 06 2018 Tomas Popela - 2.19.92-1 -- Update to 2.19.92 - -* Wed Feb 21 2018 Tomas Popela - 2.19.91-1 -- Update to 2.19.91 - -* Fri Feb 09 2018 Fedora Release Engineering - 2.19.90-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Feb 05 2018 Tomas Popela - 2.19.90-1 -- Update to 2.19.90 - -* Tue Jan 30 2018 Tomas Popela - 2.19.6-3 -- Remove obsoleted ldconfig scriptlets - -* Wed Jan 17 2018 Tomas Popela - 2.19.6-1 -- Update to 2.19.6 - -* Thu Jan 11 2018 Tomas Popela - 2.19.5-2 -- This package was formerly named webkitgtk4 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..fa5e1f1 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Obsoleted by webkitgtk package diff --git a/fix-cloop-build.patch b/fix-cloop-build.patch deleted file mode 100644 index f38f3f8..0000000 --- a/fix-cloop-build.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 40e49bb53218a986b4d6569f3fc2730cc4b71472 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Tue, 12 Jul 2022 16:56:56 -0700 -Subject: [PATCH] Fix cloop build after 252338@main - https://bugs.webkit.org/show_bug.cgi?id=242579 - -Reviewed by Mark Lam. - -* Source/JavaScriptCore/CMakeLists.txt: - -Canonical link: https://commits.webkit.org/252400@main ---- - Source/JavaScriptCore/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt -index aef0678e66f3..f4ba2716faef 100644 ---- a/Source/JavaScriptCore/CMakeLists.txt -+++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -837,6 +837,7 @@ set(JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS - inspector/remote/RemoteInspector.h - - interpreter/AbstractPC.h -+ interpreter/CLoopStack.h - interpreter/CallFrame.h - interpreter/CallFrameInlines.h - interpreter/CalleeBits.h diff --git a/rpminspect.yaml b/rpminspect.yaml deleted file mode 100644 index 722d4d2..0000000 --- a/rpminspect.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -inspections: - changedfiles: off - filesize: off diff --git a/sources b/sources deleted file mode 100644 index c3a8972..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (webkitgtk-2.37.1.tar.xz) = 29935eed5e901780d6be02a7f1072f10e61ad96cecdc3495a71dc8ca00573fa9c485c909fcba928d818df6b901a265a077238ce5fa0cfcc657bdb991867facd8 -SHA512 (webkitgtk-2.37.1.tar.xz.asc) = 5b58dd14f79abcacc3ffa3a9655d9067d6ea392203ab96567a2420bc2d1fff94ea1b9147ad128a321803b99cb6e05aecdd7db14b784a2df177a5afb30ec6b0d1 diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec deleted file mode 100644 index 44ffc38..0000000 --- a/webkit2gtk3.spec +++ /dev/null @@ -1,445 +0,0 @@ -## NOTE: Lots of files in various subdirectories have the same name (such as -## "LICENSE") so this short macro allows us to distinguish them by using their -## directory names (from the source tree) as prefixes for the files. -%global add_to_license_files() \ - mkdir -p _license_files ; \ - cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') - -# No libmanette in RHEL -%if !0%{?rhel} -%global with_gamepad 1 -%endif - -# Build documentation by default (use `rpmbuild --without docs` to override it). -# This is used by Coverity. Coverity injects custom compiler warnings, but -# any warning during WebKit docs build is fatal! -%bcond_without docs - -Name: webkit2gtk3 -Version: 2.37.1 -Release: %autorelease -Summary: GTK Web content engine library - -License: LGPLv2 -URL: https://www.webkitgtk.org/ -Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz -Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc -# Use the keys from https://webkitgtk.org/verifying.html -# $ gpg --import aperez.key carlosgc.key -# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg -Source2: webkitgtk-keys.gpg - -%if 0%{?rhel} -# https://bugs.webkit.org/show_bug.cgi?id=217989 -# https://bugs.webkit.org/show_bug.cgi?id=227905 -Patch0: aarch64-page-size.patch -%endif - -# https://bugs.webkit.org/show_bug.cgi?id=242579#c4 -Patch1: fix-cloop-build.patch - -BuildRequires: bison -BuildRequires: bubblewrap -BuildRequires: cmake -BuildRequires: flex -BuildRequires: gcc-c++ -BuildRequires: gettext -BuildRequires: gi-docgen -BuildRequires: git -BuildRequires: gnupg2 -BuildRequires: gperf -BuildRequires: hyphen-devel -BuildRequires: libatomic -BuildRequires: ninja-build -BuildRequires: perl(English) -BuildRequires: perl(FindBin) -BuildRequires: perl(JSON::PP) -BuildRequires: python3 -BuildRequires: ruby -BuildRequires: rubygems -BuildRequires: rubygem-json -BuildRequires: xdg-dbus-proxy - -BuildRequires: pkgconfig(atspi-2) -BuildRequires: pkgconfig(cairo) -BuildRequires: pkgconfig(egl) -BuildRequires: pkgconfig(enchant-2) -BuildRequires: pkgconfig(fontconfig) -BuildRequires: pkgconfig(freetype2) -BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(glesv2) -BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gstreamer-1.0) -BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(harfbuzz) -BuildRequires: pkgconfig(icu-uc) -BuildRequires: pkgconfig(lcms2) -BuildRequires: pkgconfig(libgcrypt) -BuildRequires: pkgconfig(libjpeg) -BuildRequires: pkgconfig(libnotify) -BuildRequires: pkgconfig(libopenjp2) -BuildRequires: pkgconfig(libpcre) -BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(libseccomp) -BuildRequires: pkgconfig(libsecret-1) -BuildRequires: pkgconfig(libsoup-2.4) -BuildRequires: pkgconfig(libsoup-3.0) -BuildRequires: pkgconfig(libsystemd) -BuildRequires: pkgconfig(libtasn1) -BuildRequires: pkgconfig(libwebp) -BuildRequires: pkgconfig(libwoff2dec) -BuildRequires: pkgconfig(libxslt) -%if 0%{?with_gamepad} -BuildRequires: pkgconfig(manette-0.2) -%endif -BuildRequires: pkgconfig(sqlite3) -BuildRequires: pkgconfig(upower-glib) -BuildRequires: pkgconfig(wayland-client) -BuildRequires: pkgconfig(wayland-egl) -BuildRequires: pkgconfig(wayland-protocols) -BuildRequires: pkgconfig(wayland-server) -BuildRequires: pkgconfig(wpe-1.0) -BuildRequires: pkgconfig(wpebackend-fdo-1.0) -BuildRequires: pkgconfig(xt) - -# These are hard requirements of WebKit's bubblewrap sandbox. -Requires: bubblewrap -Requires: xdg-dbus-proxy - -# If Geoclue is not running, the geolocation API will not work. -Recommends: geoclue2 - -# Needed for various GStreamer elements. -Recommends: gstreamer1-plugins-bad-free -Recommends: gstreamer1-plugins-good - -# If no xdg-desktop-portal backend is installed, many features will be broken -# inside the sandbox. In particular, the -gtk backend has to be installed for -# desktop settings access, including font settings. -Recommends: xdg-desktop-portal-gtk - -# This package was renamed, so obsolete the old webkitgtk4 package. This is -# still here because some Fedora packages still depend on the webkitgtk4 name. -Obsoletes: webkitgtk4 < %{version}-%{release} -Provides: webkitgtk4 = %{version}-%{release} - -# We're supposed to specify versions here, but these libraries don't do -# normal releases. Accordingly, they're not suitable to be system libs. -Provides: bundled(angle) -Provides: bundled(pdfjs) -Provides: bundled(xdgmime) - -# Require the jsc subpackage -Requires: %{name}-jsc%{?_isa} = %{version}-%{release} - -# Filter out provides for private libraries -%global __provides_exclude_from ^%{_libdir}/webkit2gtk-?\\.?/.*\\.so$ - -%description -WebKitGTK is the port of the WebKit web rendering engine to the -GTK platform. This package contains WebKitGTK for GTK 3 and libsoup 2. - -%package -n webkit2gtk4.1 -Summary: WebKitGTK for GTK 3 and libsoup 3 -Requires: webkit2gtk4.1-jsc%{?_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) - -%description -n webkit2gtk4.1 -WebKitGTK is the port of the WebKit web rendering engine to the -GTK platform. This package contains WebKitGTK for GTK 3 and libsoup 3. - -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-jsc%{?_isa} = %{version}-%{release} -Requires: %{name}-jsc-devel%{?_isa} = %{version}-%{release} -Obsoletes: webkitgtk4-devel < %{version}-%{release} -Provides: webkitgtk4-devel = %{version}-%{release} - -%description devel -The %{name}-devel package contains libraries, build data, and header -files for developing applications that use %{name}. - -%package -n webkit2gtk4.1-devel -Summary: Development files for webkit2gtk4.1 -Requires: webkit2gtk4.1%{?_isa} = %{version}-%{release} -Requires: webkit2gtk4.1-jsc%{?_isa} = %{version}-%{release} -Requires: webkit2gtk4.1-jsc-devel%{?_isa} = %{version}-%{release} - -%description -n webkit2gtk4.1-devel -The webkit2gtk4.1-devel package contains libraries, build data, and header -files for developing applications that use webkit2gtk4.1. - -%if %{with docs} -%package doc -Summary: Documentation files for %{name} -BuildArch: noarch -Requires: %{name} = %{version}-%{release} -Obsoletes: webkitgtk4-doc < %{version}-%{release} -Provides: webkitgtk4-doc = %{version}-%{release} - -%description doc -This package contains developer documentation for %{name}. - -%package -n webkit2gtk4.1-doc -Summary: Documentation files for webkit2gtk4.1 -BuildArch: noarch -Requires: webkit2gtk4.1 = %{version}-%{release} - -%description -n webkit2gtk4.1-doc -This package contains developer documentation for webkit2gtk4.1. -%endif - -%package jsc -Summary: JavaScript engine from %{name} -Obsoletes: webkitgtk4-jsc < %{version}-%{release} -Provides: webkitgtk4-jsc = %{version}-%{release} - -%description jsc -This package contains JavaScript engine from %{name}. - -%package -n webkit2gtk4.1-jsc -Summary: JavaScript engine from webkit2gtk4.1 - -%description -n webkit2gtk4.1-jsc -This package contains JavaScript engine from webkit2gtk4.1. - -%package jsc-devel -Summary: Development files for JavaScript engine from %{name} -Requires: %{name}-jsc%{?_isa} = %{version}-%{release} -Obsoletes: webkitgtk4-jsc-devel < %{version}-%{release} -Provides: webkitgtk4-jsc-devel = %{version}-%{release} - -%description jsc-devel -The %{name}-jsc-devel package contains libraries, build data, and header -files for developing applications that use JavaScript engine from %{name}. - -%package -n webkit2gtk4.1-jsc-devel -Summary: Development files for JavaScript engine from webkit2gtk4.1 -Requires: webkit2gtk4.1-jsc%{?_isa} = %{version}-%{release} - -%description -n webkit2gtk4.1-jsc-devel -The webkit2gtk4.1-jsc-devel package contains libraries, build data, and header -files for developing applications that use JavaScript engine from webkit2gtk-4.1. - -%prep -%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%autosetup -p1 -n webkitgtk-%{version} - -# Remove bundled libraries -rm -rf Source/ThirdParty/gtest/ -rm -rf Source/ThirdParty/qunit/ - -%build -# Increase the DIE limit so our debuginfo packages could be size optimized. -# Decreases the size for x86_64 from ~5G to ~1.1G. -# https://bugzilla.redhat.com/show_bug.cgi?id=1456261 -%global _dwz_max_die_limit 250000000 -# The _dwz_max_die_limit is being overridden by the arch specific ones from the -# redhat-rpm-config so we need to set the arch specific ones as well - now it -# is only needed for x86_64. -%global _dwz_max_die_limit_x86_64 250000000 - -# Remove debuginfo to reduce memory consumption: -# https://bugs.webkit.org/show_bug.cgi?id=140176 -# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/I6IVNA52TXTBRQLKW45CJ5K4RA4WNGMI/ -%ifarch %{arm} %{ix86} -%global debug_package %{nil} -%global optflags %(echo %{optflags} | sed 's/-g /-g0 /') -%endif - -# Warning: although RHEL 9 aarch64 now uses 4 KB page sizes, we still have to -# support 64 KB page sizes until the *builders* use RHEL 9. This means we still -# have to disable JIT and bmalloc, even though this disables important heap -# security features. We can't simply disable them only during this build, -# because gobject-introspection will crash when building anything that depends -# on WebKitGTK, because it calls each object's get_type() function, which will -# initialize bmalloc and JIT. - -%define _vpath_builddir %{_vendor}-%{_target_os}-build-webkit2gtk-4.0 -%cmake \ - -GNinja \ - -DPORT=GTK \ - -DCMAKE_BUILD_TYPE=Release \ - -DUSE_SOUP2=ON \ - -DENABLE_WEBDRIVER=OFF \ -%if %{without docs} - -DENABLE_DOCUMENTATION=OFF \ -%endif -%if !0%{?with_gamepad} - -DENABLE_GAMEPAD=OFF \ -%endif -%if 0%{?rhel} -%ifarch aarch64 - -DENABLE_JIT=OFF \ - -DUSE_SYSTEM_MALLOC=ON \ -%endif -%endif - %{nil} - -%define _vpath_builddir %{_vendor}-%{_target_os}-build-webkit2gtk-4.1 -%cmake \ - -GNinja \ - -DPORT=GTK \ - -DCMAKE_BUILD_TYPE=Release \ -%if %{without docs} - -DENABLE_DOCUMENTATION=OFF \ -%endif -%if !0%{?with_gamepad} - -DENABLE_GAMEPAD=OFF \ -%endif -%if 0%{?rhel} -%ifarch aarch64 - -DENABLE_JIT=OFF \ - -DUSE_SYSTEM_MALLOC=ON \ -%endif -%endif - %{nil} - -# Show the build time in the status. Require 3 GB of RAM per vCPU. -%define _vpath_builddir %{_vendor}-%{_target_os}-build-webkit2gtk-4.0 -export NINJA_STATUS="[1/2][%f/%t %es] " -%cmake_build %limit_build -m 3072 - -%define _vpath_builddir %{_vendor}-%{_target_os}-build-webkit2gtk-4.1 -export NINJA_STATUS="[2/2][%f/%t %es] " -%cmake_build %limit_build -m 3072 - -%install -%define _vpath_builddir %{_vendor}-%{_target_os}-build-webkit2gtk-4.0 -%cmake_install - -%define _vpath_builddir %{_vendor}-%{_target_os}-build-webkit2gtk-4.1 -%cmake_install - -%find_lang WebKit2GTK-4.0 -%find_lang WebKit2GTK-4.1 - -# Finally, copy over and rename various files for %%license inclusion -%add_to_license_files Source/JavaScriptCore/COPYING.LIB -%add_to_license_files Source/ThirdParty/ANGLE/LICENSE -%add_to_license_files Source/ThirdParty/ANGLE/src/common/third_party/smhasher/LICENSE -%add_to_license_files Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/LICENSE -%add_to_license_files Source/WebCore/LICENSE-APPLE -%add_to_license_files Source/WebCore/LICENSE-LGPL-2 -%add_to_license_files Source/WebCore/LICENSE-LGPL-2.1 -%add_to_license_files Source/WebInspectorUI/UserInterface/External/CodeMirror/LICENSE -%add_to_license_files Source/WebInspectorUI/UserInterface/External/Esprima/LICENSE -%add_to_license_files Source/WebInspectorUI/UserInterface/External/three.js/LICENSE -%add_to_license_files Source/WTF/icu/LICENSE -%add_to_license_files Source/WTF/wtf/dtoa/COPYING -%add_to_license_files Source/WTF/wtf/dtoa/LICENSE - -%files -f WebKit2GTK-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 - -%files -n webkit2gtk4.1 -f WebKit2GTK-4.1.lang -%license _license_files/*ThirdParty* -%license _license_files/*WebCore* -%license _license_files/*WebInspectorUI* -%license _license_files/*WTF* -%{_libdir}/libwebkit2gtk-4.1.so.0* -%dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/WebKit2-4.1.typelib -%{_libdir}/girepository-1.0/WebKit2WebExtension-4.1.typelib -%{_libdir}/webkit2gtk-4.1/ -%{_libexecdir}/webkit2gtk-4.1/ -%exclude %{_libexecdir}/webkit2gtk-4.1/MiniBrowser -%exclude %{_libexecdir}/webkit2gtk-4.1/jsc -%{_bindir}/WebKitWebDriver - -%files 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 - -%files -n webkit2gtk4.1-devel -%{_libexecdir}/webkit2gtk-4.1/MiniBrowser -%{_includedir}/webkitgtk-4.1/ -%exclude %{_includedir}/webkitgtk-4.1/JavaScriptCore -%exclude %{_includedir}/webkitgtk-4.1/jsc -%{_libdir}/libwebkit2gtk-4.1.so -%{_libdir}/pkgconfig/webkit2gtk-4.1.pc -%{_libdir}/pkgconfig/webkit2gtk-web-extension-4.1.pc -%dir %{_datadir}/gir-1.0 -%{_datadir}/gir-1.0/WebKit2-4.1.gir -%{_datadir}/gir-1.0/WebKit2WebExtension-4.1.gir - -%files jsc -%license _license_files/*JavaScriptCore* -%{_libdir}/libjavascriptcoregtk-4.0.so.18* -%dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/JavaScriptCore-4.0.typelib - -%files -n webkit2gtk4.1-jsc -%license _license_files/*JavaScriptCore* -%{_libdir}/libjavascriptcoregtk-4.1.so.0* -%dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/JavaScriptCore-4.1.typelib - -%files jsc-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 - -%files -n webkit2gtk4.1-jsc-devel -%{_libexecdir}/webkit2gtk-4.1/jsc -%dir %{_includedir}/webkitgtk-4.1 -%{_includedir}/webkitgtk-4.1/JavaScriptCore/ -%{_includedir}/webkitgtk-4.1/jsc/ -%{_libdir}/libjavascriptcoregtk-4.1.so -%{_libdir}/pkgconfig/javascriptcoregtk-4.1.pc -%dir %{_datadir}/gir-1.0 -%{_datadir}/gir-1.0/JavaScriptCore-4.1.gir - -%if %{with docs} -%files doc -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/javascriptcoregtk-4.0/ -%{_datadir}/gtk-doc/html/webkit2gtk-4.0/ -%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.0/ - -%files -n webkit2gtk4.1-doc -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/javascriptcoregtk-4.1/ -%{_datadir}/gtk-doc/html/webkit2gtk-4.1/ -%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.1/ -%endif - -%changelog -%autochangelog diff --git a/webkitgtk-keys.gpg b/webkitgtk-keys.gpg deleted file mode 100644 index 180e358ac0e97fa8d910e5e8c44ad83a2abba1ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2816 zcmb7_c{J4f8^^yhhO9LyGa{KWnXxN7W1C!C_AQmA#+VoeV<`Jrlclmoh#|WhSC+z1 z2$7H^Bq8F8vCE#{$vyYCoZtEV@%!`hoX;Px^E}V{d1ZheLkx6&vL1&3!<%~@qha<2 zbCPb=9!IStjC+iIJaXBt+Ei2J1lb?LrLS#$b+q$~&9hKt&XL!# zjf3q-{`QrC-iWIvUov8Lf!y%ZSFP;;C*c)O&rpk~$j-#?>>&`KZkp3kbO!f;W%0@d zF3-klcVScvC}g`Bq!L`Tn%rQ#AiwSu$CDl0rZBanat4;h*XRpK4;v*`WzC>5Ie{x$ zd&&qfjL-R$kCLy1OK<`?O{Km~ZoN?T4r+&=QMlW~Y07U%go<$bzsDUM`5d!bY0Q;` zKu21!cdi7fifKcDx?%gaqPJ=D)9K9K+lpZUH@Fbc-^#xGer3?zzHBs`}X<+X22@ZB;j!7+hCVQfu+i|snHWFKlXIJ`fh3lV>rv%>( z*RVT4gVP;YZGU1J?VnWkL0Uu5;bUfm-G1W&9mVH$MV6MjHJUhQD(O|8C&K(yDU}$A za3&&j@IJm&FN7F{NcHjZ#FNDl>Ud`=3Gb;*AySEf&P2lD2N^G_i)IWBa^g5Apa~X4 zfzN=z@Gw>`4)!A~tbCjt>|CrcFbfEPAt6`u8|BT0rj&Am{i>4MuZ&K2@nTuQjtya+ ztQ-O=b4~y!2lVf{rX4^xln;dBpU-^9yyvqsL(P`XA&*1aJf{T6ZFK^4s9&R;IQ}X{U9%TF2Y;NY>dlOrj%Mpj6Mr8!;Ros+qo*l6}$&=`$Tl zmo`s};tW>MNLd!vtqGv{$Sd>1E28IK$r?P-+BQz9CPY9ku(2yQw?aOmTWY-qOA((U zvIcXcw&*opIzpipLBB^X6jWeLDQM>J14R@Q&56bbTXRop!BOSDN7LSf+EwlhtZ8cY z_CX2!LJC*9G1|nZDFEf!YE87q;GC02QaQD(xf0IP^km@d zqG4t669M)$p~Sn~j+;1>dFEJsq>Y}T{Zeah=s@-iHh+0pF5z;Tc!WDDv4db_#<1;M zkj3||gl=4{zsNOUYLMJ7Fmgh#uFxZ6MLY=+-#@$|A^{cEaCzYQhg+|!+9OX1zMU9r z5!uw86}F*R2gecvHR!Z_T^}Oqp5wu)2-{f&4-XH#1QO zI|h6WmZNv>M({(HE>Uxmel|AxlwxPk{9s7z{IiskLPFmyGrMTqG`AKHSjd$6RXt$2 z=hYtMF3@hIzPhjynBYn||Hf!|ju5F4OtbB2ZI;U=nOwi!)75qAwBwdmQBkcpN7dJ* zhZD%hMnplzUdPvBL#mKbM^KeKVr1!IwkS(uE~VAN%h380puurAg5~x*{Gza(di;EfjtQd3DhuysPufx zX^#DglAE4FCNJoRa=%XJenY6*Lk2}mGHZBMg+@|>rt)ilU~kr2rSo6(y`*3ZT+fU( zR|i+{#YvyIC6lH5Szp1oZ>V==$5K-SP(6R;wSq&3U~r!c$UdUNJwz z0>Qs~GR80HB>p%fng@Iycj3JpeYQ^5Rc0{0E7s~51End28?ho0dsF--B~F3g1Qt<8 ztrci(fI;{$`XoA;jW=HmWomWG6Iy?lV9u7Vgc zjGpS3=UJqsd1VmjGc~X~;tyJ^giv@3|Lyk3eQu{_I>s9~H^fNxQ=4yNZo)FL_HJ6G zHTBJEe!e>8Mmr}vp=9SL%x|U7qRXNvFo&<~r8WU$YN1H9+*Houn0-5Fx?N|9+!U`%HZf*A!Z7zff zPpu317eZGJt&Nt#)zID?$Qf%iHu$SB^Gs^^a*QE_|2P=nU1@B&veA{ng{=?8Kb){+t;XBvyoL!IeJC8cmJ~`t}EPYnNaf$&vQ0 zY30w)-wcb8fo09;JPy|MB7!KAp$s5*9g_0%7(DEK#w3~a+kHX#ecVevmIJaQS{D`J zLa}ueQth94>e+HV>4PLxdOgp#{0_TX{(MQWx;q&Oyc%s%sugA z(+X@rUYC!<9VKebyaPR{^hT-R+=RuW>vWX1+h&!e;>{nq{bvh3-|~II;SVfK9eJ~o zLeKOEA#E3%k=%2|mlzWwcXC9^A)Tb64d(z6BPa75S9Cj4gY;($`H3 zbGKEMD9N}$CZOT&`btRwe$JaOeMA}(K53>$OZuqtu)x!;)BWp?N?mLy61%6%Yz5nT zOJK69#7V>euLT7X>tNJ;fiJ?2P(R9zK5%i z*_@iJ2k{*43={&4!0ndj6@#4fa+l+-#cT7D6>Q%6xlbK&jrrKlU$~mW{#-+_B&{aJ zZzDM1l=qF~JUMUo^plsL&7BlRv-sO{kH4sR zZ9Sw&W~+wz>EU_oB!KFcxG$^xx62|%-JTj*)9-d|1kRSw0TxyW@aUOGP)&ewIcmD; z;$E`-nv-eL@HcpVlF^^uXG#rBogH7esrGcYoL|lt9+#U%J`n0m+}oi6vU#Zb^*^rD zPA?wF&#u+KK%*Z@mG{R7G_tBp$%q2gR=YF9OU3aYu0`cNO(@xpt@W|nnDB$PGdGtr zCBiOeu9>?VKnf`1P5+AHUp+sJ~CuSX_T*N(qr;?~$xh+E#bYH8~7G_g}l& V3L@TM79{#?`RR8JR|mG9_y^-50h#~+