Request 4 GB of RAM per vCPU

The aarch64 builders are running out of memory, so I guess we need to lower parallelism again.
Update to 2.44.1
2024-04-18 16:44:33 -05:00 · 2024-04-11 13:12:31 -05:00 · 2024-03-16 19:47:44 -05:00 · 2024-03-16 19:47:40 -05:00 · 2024-02-05 14:00:13 -06:00 · 2023-12-15 09:20:33 -06:00
6 changed files with 51 additions and 145 deletions
--- a/.gitignore
+++ b/.gitignore
@ -13,3 +13,19 @@
 /webkitgtk-2.39.6.tar.xz.asc
 /webkitgtk-2.39.7.tar.xz.asc
 /webkitgtk-2.39.90.tar.xz.asc
+/webkitgtk-2.39.91.tar.xz.asc
+/webkitgtk-2.40.0.tar.xz.asc
+/webkitgtk-2.40.1.tar.xz.asc
+/webkitgtk-2.40.2.tar.xz.asc
+/webkitgtk-2.40.3.tar.xz.asc
+/webkitgtk-2.40.4.tar.xz.asc
+/webkitgtk-2.40.5.tar.xz.asc
+/webkitgtk-2.42.0.tar.xz.asc
+/webkitgtk-2.42.1.tar.xz.asc
+/webkitgtk-2.42.2.tar.xz.asc
+/webkitgtk-2.43.2.tar.xz.asc
+/webkitgtk-2.42.3.tar.xz.asc
+/webkitgtk-2.42.4.tar.xz.asc
+/webkitgtk-2.42.5.tar.xz.asc
+/webkitgtk-2.44.0.tar.xz.asc
+/webkitgtk-2.44.1.tar.xz.asc
--- a/fix-installed-headers.patch
+++ b/fix-installed-headers.patch
@ -1,62 +0,0 @@
-From 166cdf23242165c9c84f621a4121c80432211c50 Mon Sep 17 00:00:00 2001
-From: Adrian Perez de Castro <aperez@igalia.com>
-Date: Mon, 20 Feb 2023 16:26:28 +0200
-Subject: [PATCH] [GLib] Installed API headers are unusable with the new 2022
- API https://bugs.webkit.org/show_bug.cgi?id=252562
-
-Reviewed by NOBODY (OOPS!).
-
-* Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in: Only
-  include JavaScriptCore/JSBase.h with the old API, change a !USE(GTK4)
-  guard to !ENABLE(2022_GLIB_API) as it is more correct.
-* Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in: Ditto.
---
- Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in | 4 ++--
- Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in          | 4 +++-
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in b/Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in
-index b7eece231000..78ba2120b225 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in
-+++ b/Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in
-@@ -26,7 +26,7 @@
- #include <glib-object.h>
- #include <@API_INCLUDE_PREFIX@/WebKitDefines.h>
- 
-#if PLATFORM(GTK)
-+#if PLATFORM(GTK) && !ENABLE(2022_GLIB_API)
- #include <JavaScriptCore/JSBase.h>
- #endif
- 
-@@ -46,7 +46,7 @@ webkit_javascript_result_ref                (WebKitJavascriptResult *js_result);
- WEBKIT_API void
- webkit_javascript_result_unref              (WebKitJavascriptResult *js_result);
- 
-#if PLATFORM(GTK) && !USE(GTK4)
-+#if PLATFORM(GTK) && !ENABLE(2022_GLIB_API)
- WEBKIT_DEPRECATED JSGlobalContextRef
- webkit_javascript_result_get_global_context (WebKitJavascriptResult *js_result);
- 
-diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in b/Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in
-index 45949e44e4a3..293aa3841695 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in
-+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in
-@@ -59,7 +59,9 @@
- #endif
- 
- #if PLATFORM(GTK)
-+#if !ENABLE(2022_GLIB_API)
- #include <JavaScriptCore/JSBase.h>
-+#endif
- #include <webkit/WebKitColorChooserRequest.h>
- #include <webkit/WebKitWebInspector.h>
- #include <webkit/WebKitWebViewBase.h>
-@@ -628,7 +630,7 @@ webkit_web_view_execute_editing_command_with_argument(WebKitWebView
- WEBKIT_API WebKitFindController *
- webkit_web_view_get_find_controller                  (WebKitWebView             *web_view);
- 
-#if PLATFORM(GTK) && !USE(GTK4)
-+#if PLATFORM(GTK) && !ENABLE(2022_GLIB_API)
- WEBKIT_DEPRECATED JSGlobalContextRef
- webkit_web_view_get_javascript_global_context        (WebKitWebView             *web_view);
- #endif
--- a/no-debug-fission.patch
+++ b/no-debug-fission.patch
@ -1,29 +0,0 @@
-diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
-index 94b9740c8a82..43b961c996c3 100644
--- a/Source/cmake/OptionsCommon.cmake
-+++ b/Source/cmake/OptionsCommon.cmake
-@@ -154,19 +154,11 @@ if (USE_THIN_ARCHIVES)
- endif ()
- 
- set(ENABLE_DEBUG_FISSION_DEFAULT OFF)
-check_cxx_compiler_flag(-gsplit-dwarf CXX_COMPILER_SUPPORTS_GSPLIT_DWARF)
-if (CXX_COMPILER_SUPPORTS_GSPLIT_DWARF AND LD_SUPPORTS_SPLIT_DEBUG)
-  set(ENABLE_DEBUG_FISSION_DEFAULT ON)
-endif ()
-
-if (ENABLE_DEBUG_FISSION_DEFAULT AND SCCACHE_FOUND AND COMPILER_IS_CLANG AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-    # https://github.com/mozilla/sccache/issues/1593
-    message("The SCCache clang backend doesn't support split-dwarf for non-debug builds yet. Keeping default value of DEBUG_FISSION to OFF.")
-    set(ENABLE_DEBUG_FISSION_DEFAULT OFF)
-endif ()
-
-if (CMAKE_GENERATOR MATCHES "Visual Studio")
-    set(ENABLE_DEBUG_FISSION_DEFAULT OFF)
-+if ((CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") AND NOT CMAKE_GENERATOR MATCHES "Visual Studio")
-+    check_cxx_compiler_flag(-gsplit-dwarf CXX_COMPILER_SUPPORTS_GSPLIT_DWARF)
-+    if (CXX_COMPILER_SUPPORTS_GSPLIT_DWARF AND LD_SUPPORTS_SPLIT_DEBUG)
-+        set(ENABLE_DEBUG_FISSION_DEFAULT ON)
-+    endif ()
- endif ()
- 
- option(DEBUG_FISSION "Use Debug Fission support" ${ENABLE_DEBUG_FISSION_DEFAULT})
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.39.90.tar.xz) = 1a17a60443072253c9b2a4a04356213ea9a3f36976ebad048048b1bf6a5dd15a9fb161df1cabbf4258b001a5ab326161887cc8e6f1863a3e32834a35f607e4d4
-SHA512 (webkitgtk-2.39.90.tar.xz.asc) = 772e584f3caa3141d3cdc0abdd747c2c08990c244740f138fe9f64f3aedb01a08f39fea59e27906e27063aaebf41432a25a6326f4841af7b3075c4da70b16f09
+SHA512 (webkitgtk-2.44.1.tar.xz) = b1752303f9ee38ef98c1e5c0cad001d389eaedbbf07d13fed8699104e6e311cb47a9bed7089868cb92c53d2777aaff441147353da13123d5c8eee4adf8709169
+SHA512 (webkitgtk-2.44.1.tar.xz.asc) = 2d2ab4a903ff3e8eeb128b2e7a182d073fc12e14d4b8f2668aaafc638f194e2fa3cf707c040f679f320636c1398dd11df2b6e2941dd3580b8032ea30b604c711
--- a/super-sampler.patch
+++ b/super-sampler.patch
@ -1,12 +0,0 @@
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-index 97e22b7ec4c1..64397ee50cf7 100644
--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-@@ -39,6 +39,7 @@
- #include "LLIntData.h"
- #include "LLIntSlowPaths.h"
- #include "JSCInlines.h"
-+#include "SuperSampler.h"
- #include <wtf/Assertions.h>
- #include <wtf/MathExtras.h>
-
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@ -1,6 +1,3 @@
-# https://bugs.webkit.org/show_bug.cgi?id=249368
-%global _lto_cflags %{nil}
-
 ## 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.
@ -13,13 +10,15 @@
 %global with_gamepad 1
 %endif

+%global _lto_cflags %{nil}
+
 # 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:           webkitgtk
-Version:        2.39.90
+Version:        2.44.1
 Release:        %autorelease
 Summary:        GTK web content engine library

@ -32,15 +31,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://github.com/WebKit/WebKit/pull/10362
-Patch0:         fix-installed-headers.patch
-
-# https://bugs.webkit.org/show_bug.cgi?id=252617
-Patch1:         super-sampler.patch
-
-# https://bugs.webkit.org/show_bug.cgi?id=252679
-Patch2:         no-debug-fission.patch
-
 BuildRequires:  bison
 BuildRequires:  bubblewrap
 BuildRequires:  cmake
@ -55,6 +45,7 @@ BuildRequires:  hyphen-devel
 BuildRequires:  libatomic
 BuildRequires:  ninja-build
 BuildRequires:  openssl-devel
+BuildRequires:  perl(bigint)
 BuildRequires:  perl(English)
 BuildRequires:  perl(FindBin)
 BuildRequires:  perl(JSON::PP)
@ -72,9 +63,8 @@ BuildRequires:  pkgconfig(enchant-2)
 BuildRequires:  pkgconfig(epoxy)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(gbm)
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(glesv2)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-plugins-bad-1.0)
@ -85,10 +75,11 @@ BuildRequires:  pkgconfig(harfbuzz)
 BuildRequires:  pkgconfig(icu-uc)
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libavif)
+BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libgcrypt)
 BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  pkgconfig(libjxl)
 BuildRequires:  pkgconfig(libnotify)
-BuildRequires:  pkgconfig(libopenjp2)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libseccomp)
@ -109,8 +100,6 @@ 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)

 # Filter out provides for private libraries
@ -124,6 +113,7 @@ GTK platform.
 Summary:        WebKitGTK for GTK 4
 Requires:       javascriptcoregtk6.0%{?_isa} = %{version}-%{release}
 Requires:       bubblewrap
+Requires:       libGLES
 Requires:       xdg-dbus-proxy
 Recommends:     geoclue2
 Recommends:     gstreamer1-plugins-bad-free
@ -142,6 +132,7 @@ GTK platform. This package contains WebKitGTK for GTK 4.
 Summary:        WebKitGTK for GTK 3 and libsoup 3
 Requires:       javascriptcoregtk4.1%{?_isa} = %{version}-%{release}
 Requires:       bubblewrap
+Requires:       libGLES
 Requires:       xdg-dbus-proxy
 Recommends:     geoclue2
 Recommends:     gstreamer1-plugins-bad-free
@ -337,6 +328,7 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0
  -DPORT=GTK \
  -DCMAKE_BUILD_TYPE=Release \
  -DUSE_GTK4=ON \
+  -DUSE_LIBBACKTRACE=OFF \
 %if %{without docs}
  -DENABLE_DOCUMENTATION=OFF \
 %endif
@ -355,7 +347,9 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0
  -GNinja \
  -DPORT=GTK \
  -DCMAKE_BUILD_TYPE=Release \
+  -DUSE_GTK4=OFF \
  -DENABLE_WEBDRIVER=OFF \
+  -DUSE_LIBBACKTRACE=OFF \
 %if %{without docs}
  -DENABLE_DOCUMENTATION=OFF \
 %endif
@ -374,8 +368,10 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0
  -GNinja \
  -DPORT=GTK \
  -DCMAKE_BUILD_TYPE=Release \
+  -DUSE_GTK4=OFF \
  -DUSE_SOUP2=ON \
  -DENABLE_WEBDRIVER=OFF \
+  -DUSE_LIBBACKTRACE=OFF \
 %if %{without docs}
  -DENABLE_DOCUMENTATION=OFF \
 %endif
@ -391,15 +387,15 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0

 %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
 export NINJA_STATUS="[1/3][%f/%t %es] "
-%cmake_build %limit_build -m 3072
+%cmake_build %limit_build -m 4096

 %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
 export NINJA_STATUS="[2/3][%f/%t %es] "
-%cmake_build %limit_build -m 3072
+%cmake_build %limit_build -m 4096

 %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0
 export NINJA_STATUS="[3/3][%f/%t %es] "
-%cmake_build %limit_build -m 3072
+%cmake_build %limit_build -m 4096

 %install
 %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
@ -434,10 +430,10 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
 %license _license_files/*WebCore*
 %license _license_files/*WebInspectorUI*
 %license _license_files/*WTF*
-%{_libdir}/libwebkitgtk-6.0.so.3*
+%{_libdir}/libwebkitgtk-6.0.so.4*
 %dir %{_libdir}/girepository-1.0
 %{_libdir}/girepository-1.0/WebKit-6.0.typelib
-%{_libdir}/girepository-1.0/WebKitWebExtension-6.0.typelib
+%{_libdir}/girepository-1.0/WebKitWebProcessExtension-6.0.typelib
 %{_libdir}/webkitgtk-6.0/
 %{_libexecdir}/webkitgtk-6.0/
 %exclude %{_libexecdir}/webkitgtk-6.0/MiniBrowser
@ -478,10 +474,10 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
 %exclude %{_includedir}/webkitgtk-6.0/jsc
 %{_libdir}/libwebkitgtk-6.0.so
 %{_libdir}/pkgconfig/webkitgtk-6.0.pc
-%{_libdir}/pkgconfig/webkitgtk-web-extension-6.0.pc
+%{_libdir}/pkgconfig/webkitgtk-web-process-extension-6.0.pc
 %dir %{_datadir}/gir-1.0
 %{_datadir}/gir-1.0/WebKit-6.0.gir
-%{_datadir}/gir-1.0/WebKitWebExtension-6.0.gir
+%{_datadir}/gir-1.0/WebKitWebProcessExtension-6.0.gir

 %files -n webkit2gtk4.1-devel
 %{_libexecdir}/webkit2gtk-4.1/MiniBrowser
@ -556,25 +552,22 @@ export NINJA_STATUS="[3/3][%f/%t %es] "

 %if %{with docs}
 %files -n webkitgtk6.0-doc
-%dir %{_datadir}/gtk-doc
-%dir %{_datadir}/gtk-doc/html
-%{_datadir}/gtk-doc/html/javascriptcoregtk-6.0/
-%{_datadir}/gtk-doc/html/webkitgtk-6.0/
-%{_datadir}/gtk-doc/html/webkitgtk-web-extension-6.0/
+%dir %{_datadir}/doc
+%{_datadir}/doc/javascriptcoregtk-6.0/
+%{_datadir}/doc/webkitgtk-6.0/
+%{_datadir}/doc/webkitgtk-web-process-extension-6.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/
+%dir %{_datadir}/doc
+%{_datadir}/doc/javascriptcoregtk-4.1/
+%{_datadir}/doc/webkit2gtk-4.1/
+%{_datadir}/doc/webkit2gtk-web-extension-4.1/

 %files -n webkit2gtk4.0-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/
+%dir %{_datadir}/doc
+%{_datadir}/doc/javascriptcoregtk-4.0/
+%{_datadir}/doc/webkit2gtk-4.0/
+%{_datadir}/doc/webkit2gtk-web-extension-4.0/
 %endif

 %changelog
Author	SHA1	Message	Date
Michael Catanzaro	0eb35346f4	Request 4 GB of RAM per vCPU The aarch64 builders are running out of memory, so I guess we need to lower parallelism again.	2024-04-18 16:44:33 -05:00
Michael Catanzaro	dd545a0a98	Update to 2.44.1	2024-04-11 13:12:31 -05:00
Michael Catanzaro	4e83d98d55	Fix i686 build	2024-03-16 19:47:44 -05:00
Michael Catanzaro	fdf59e2beb	Upgrade to WebKitGTK 2.44.0	2024-03-16 19:47:40 -05:00
Michael Catanzaro	3a255e6ee8	Update to WebKitGTK 2.42.5	2024-02-05 14:00:13 -06:00
Michael Catanzaro	00c81f9217	Update to 2.42.4	2023-12-15 09:20:33 -06:00
Michael Catanzaro	4e06d27bca	Update to 2.42.3	2023-12-05 13:05:21 -06:00
Michael Catanzaro	158c6b9177	Update to 2.42.2 This also removes the unused bundled libavif/libdav1d from the tarball, which slightly simplifies the license tag.	2023-11-10 11:55:07 -06:00
Michael Catanzaro	1b96b0061b	Update to 2.40.1 and fix GL dependencies GLES needs to be available at runtime or we'll crash, #2240428. It's not needed at runtime because it's only used via libepoxy. And desktop GL is no longer used at all. Fixes #2240428	2023-09-27 11:22:44 -05:00
Michael Catanzaro	b00ab16782	Upgrade to 2.42.0	2023-09-15 09:28:10 -05:00
Michael Catanzaro	849bcbe248	Update to 2.40.5	2023-08-01 10:12:09 -05:00
Michael Catanzaro	30995825e3	Update to 2.40.4	2023-07-21 08:41:35 -05:00
Michael Catanzaro	edff400008	Update to 2.40.3	2023-06-28 10:04:09 -05:00
Michael Catanzaro	ca4289befb	Update to 2.40.2	2023-05-30 13:22:38 -05:00
Michael Catanzaro	5f66bc79b1	Update to 2.40.1	2023-04-19 18:16:03 -05:00
Michael Catanzaro	5df30ca9bd	Add user content manager patch and reenable LTO	2023-03-17 18:34:32 -05:00
Michael Catanzaro	eca9a77b20	Upgrade to 2.40.0	2023-03-17 12:51:04 -05:00
Michael Catanzaro	b4503e8fbf	Upgrade to 2.39.91	2023-03-08 17:20:39 -06:00