commit 6c531ac94b040378573fe1ef98a0058188658b54 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Sun Apr 21 11:29:21 2024 +0200
- updated to 2.44.1 gtk-webkit4.spec | 6 ++---- webkit-timer-size-assert.patch | 34 ---------------------------------- 2 files changed, 2 insertions(+), 38 deletions(-) --- diff --git a/gtk-webkit4.spec b/gtk-webkit4.spec index 3911dcc..f38ecde 100644 --- a/gtk-webkit4.spec +++ b/gtk-webkit4.spec @@ -23,17 +23,16 @@ Summary: Port of WebKit embeddable web component to GTK+ 3 Summary(pl.UTF-8): Port osadzalnego komponentu WWW WebKit do GTK+ 3 Name: gtk-webkit4 # NOTE: 2.44.x is stable, 2.45.x devel -Version: 2.44.0 +Version: 2.44.1 Release: 1 License: BSD-like Group: X11/Libraries Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz -# Source0-md5: 20fef6a9122fc46f66f2f8550d5f08c6 +# Source0-md5: b3a4504892162b30a774d3afde4707f7 Patch0: x32.patch Patch1: %{name}-icu59.patch Patch2: parallel-gir.patch Patch3: %{name}-driver-version-suffix.patch -Patch4: webkit-timer-size-assert.patch URL: https://webkitgtk.org/ BuildRequires: /usr/bin/ld.gold BuildRequires: EGL-devel @@ -318,7 +317,6 @@ Dokumentacja API portu WebKitu do GTK 4. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %build %if %{with lowmem} diff --git a/webkit-timer-size-assert.patch b/webkit-timer-size-assert.patch deleted file mode 100644 index 70975b3..0000000 --- a/webkit-timer-size-assert.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2922af379dc70b4b1a63b01d67179eb431f03ac4 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro <mcatanz...@redhat.com> -Date: Mon, 18 Mar 2024 11:14:54 -0700 -Subject: [PATCH] REGRESSION(274077@main): failure to build on i586 (and likely - other 32bit arches): static assertion failed: Timer should stay small - https://bugs.webkit.org/show_bug.cgi?id=271108 - -Unreviewed build fix. This changes SameSizeOfTimer to ensure it matches -the size of Timer on 32-bit platforms. - -* Source/WebCore/platform/Timer.cpp: - -Canonical link: https://commits.webkit.org/276282@main ---- - Source/WebCore/platform/Timer.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Source/WebCore/platform/Timer.cpp b/Source/WebCore/platform/Timer.cpp -index 4f7c0f5c39ca9..0f3734cca2474 100644 ---- a/Source/WebCore/platform/Timer.cpp -+++ b/Source/WebCore/platform/Timer.cpp -@@ -263,7 +263,11 @@ struct SameSizeAsTimer { - - WeakPtr<TimerAlignment> timerAlignment; - double times[2]; -- void* pointers[3]; -+ void* pointers[2]; -+#if CPU(ADDRESS32) -+ uint8_t bitfields; -+#endif -+ void* pointer; - }; - - static_assert(sizeof(Timer) == sizeof(SameSizeAsTimer), "Timer should stay small"); ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gtk-webkit4.git/commitdiff/6c531ac94b040378573fe1ef98a0058188658b54 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit