From d96074935f4431d2cbcd279aba5c1834ad143450 Mon Sep 17 00:00:00 2001 From: Pablo Saavedra Date: Thu, 9 May 2024 15:46:38 +0200 Subject: [PATCH] webkitgtk: Bump-up to version 2.44.1 Release notes: * https://webkitgtk.org/2024/04/09/webkitgtk2.44.1-released.html --- ...ter.cpp-339-21-error-t6-was-not-decl.patch | 37 ------ ...ite-compile-commands-missing-from-re.patch | 123 ------------------ ...ebkitgtk_2.44.0.bb => webkitgtk_2.44.1.bb} | 4 +- 3 files changed, 1 insertion(+), 163 deletions(-) delete mode 100644 recipes-browser/webkitgtk/webkitgtk/0002-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch delete mode 100644 recipes-browser/webkitgtk/webkitgtk/0003-GLib-Script-rewrite-compile-commands-missing-from-re.patch rename recipes-browser/webkitgtk/{webkitgtk_2.44.0.bb => webkitgtk_2.44.1.bb} (96%) diff --git a/recipes-browser/webkitgtk/webkitgtk/0002-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch b/recipes-browser/webkitgtk/webkitgtk/0002-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch deleted file mode 100644 index 0b27ae61..00000000 --- a/recipes-browser/webkitgtk/webkitgtk/0002-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 17e371d5b6fc86a04504762558cb6b0dec50bcba Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Mon, 5 Feb 2024 11:00:49 -0600 -Subject: [PATCH] =?UTF-8?q?LowLevelInterpreter.cpp:339:21:=20error:=20?= - =?UTF-8?q?=E2=80=98t6=E2=80=99=20was=20not=20declared=20in=20this=20scope?= - =?UTF-8?q?=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid=3D268739?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Unreviewed build fix. Seems a backport went badly, and we didn't notice -because the code is architecture-specific. - -* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: -(JSC::CLoop::execute): ---- - Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- - 1 file changed, 2 deletions(-) - -Upstream-Status: Backport [https://bugs.webkit.org/show_bug.cgi?id=2268739] - -diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -index 5064ead6..9a2e2653 100644 ---- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, - UNUSED_VARIABLE(t2); - UNUSED_VARIABLE(t3); - UNUSED_VARIABLE(t5); -- UNUSED_VARIABLE(t6); -- UNUSED_VARIABLE(t7); - - struct StackPointerScope { - StackPointerScope(CLoopStack& stack) --- -2.30.2 - diff --git a/recipes-browser/webkitgtk/webkitgtk/0003-GLib-Script-rewrite-compile-commands-missing-from-re.patch b/recipes-browser/webkitgtk/webkitgtk/0003-GLib-Script-rewrite-compile-commands-missing-from-re.patch deleted file mode 100644 index 72224525..00000000 --- a/recipes-browser/webkitgtk/webkitgtk/0003-GLib-Script-rewrite-compile-commands-missing-from-re.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 0ccfdfab1cc8546161b0bcb6313482fdf564fa06 Mon Sep 17 00:00:00 2001 -From: Pablo Saavedra -Date: Tue, 26 Mar 2024 12:07:18 +0100 -Subject: [PATCH] [GLib] Script rewrite-compile-commands missing from release - tarballs https://bugs.webkit.org/show_bug.cgi?id=271644 - -Reviewed by Michael Catanzaro. - -* Tools/gtk/manifest.txt.in: List Tools/Scripts/rewrite-compile-commands - for inclusion in release tarballs. -* Tools/wpe/manifest.txt.in: Ditto. - -Canonical link: https://commits.webkit.org/276622@main - -Upstream-Status: Backport [https://github.com/WebKit/WebKit/pull/26407] ---- - Tools/Scripts/rewrite-compile-commands | 94 ++++++++++++++++++++++++++ - 1 file changed, 94 insertions(+) - create mode 100755 Tools/Scripts/rewrite-compile-commands - -diff --git a/Tools/Scripts/rewrite-compile-commands b/Tools/Scripts/rewrite-compile-commands -new file mode 100755 -index 00000000..8109574f ---- /dev/null -+++ b/Tools/Scripts/rewrite-compile-commands -@@ -0,0 +1,94 @@ -+#!/usr/bin/env python3 -+ -+# Copyright (C) 2023 Igalia S.L. -+# -+# Redistribution and use in source and binary forms, with or without -+# modification, are permitted provided that the following conditions are -+# met: -+# -+# * Redistributions of source code must retain the above copyright -+# notice, this list of conditions and the following disclaimer. -+# * Redistributions in binary form must reproduce the above -+# copyright notice, this list of conditions and the following disclaimer -+# in the documentation and/or other materials provided with the -+# distribution. -+# * Neither the name of Apple Inc. ("Apple") nor the names of -+# its contributors may be used to endorse or promote products derived -+# from this software without specific prior written permission. -+# -+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ -+import argparse -+import json -+import os -+import re -+ -+parser = argparse.ArgumentParser( -+ description='This tool takes the compile_commands.json output by CMake and expands any UnifiedSources in it to regular sources.' -+) -+parser.add_argument('input_file') -+parser.add_argument('output_file') -+parser.add_argument('source_dir') -+parser.add_argument('build_dir') -+ -+args = parser.parse_args() -+source_dir = args.source_dir -+build_dir = args.build_dir -+ -+generated_compile_commands = [] -+ -+with open(args.input_file) as f: -+ compile_commands = json.load(f) -+ -+for entry in compile_commands: -+ entry_file = entry['file'] -+ if not 'UnifiedSource' in entry_file: -+ generated_compile_commands.append(entry) -+ continue -+ -+ # The paths we expect are in the style of: -+ # - WebKit/WebKitBuild/Release/DerivedSources/WebKit/unified-sources/UnifiedSource-54928a2b-29.cpp -+ # - WebKit/WebKitBuild/Release/WebCore/DerivedSources/unified-sources/UnifiedSource-42f7b70e-5.cpp -+ # And Windows too: -+ # - WebKit\WebKitBuild\Release\WebCore\DerivedSources\unified-sources\UnifiedSource-42f7b70e-5.cpp -+ # So we extract the parent folders to map them to the source folders. -+ parent_dir_1, parent_dir_2 = entry_file.rsplit(os.path.sep, maxsplit=4)[1:3] -+ search_directories = [ -+ os.path.join(build_dir, parent_dir_1, parent_dir_2), -+ ] -+ -+ if parent_dir_1 == 'DerivedSources': -+ search_directories.append(os.path.join(source_dir, 'Source', parent_dir_2)) -+ else: -+ search_directories.append(os.path.join(source_dir, 'Source', parent_dir_1)) -+ -+ with open(entry_file) as f: -+ for line in f.readlines(): -+ include_path = line[10:-2] # Extract header from `#include "HEADER"\n` -+ for d in search_directories: -+ include_file = os.path.join(d, include_path) -+ -+ if os.path.exists(include_file): -+ generated_compile_commands.append({ -+ "directory": entry["directory"], -+ "command": entry["command"].replace(entry_file, include_file), -+ "file": include_file, -+ }) -+ break -+ -+output_directory = os.path.dirname(args.output_file) -+if not os.path.isdir(output_directory): -+ os.makedirs(output_directory) -+ -+with open(args.output_file, 'w') as f: -+ json.dump(generated_compile_commands, f, indent=2) --- -2.34.1 - diff --git a/recipes-browser/webkitgtk/webkitgtk_2.44.0.bb b/recipes-browser/webkitgtk/webkitgtk_2.44.1.bb similarity index 96% rename from recipes-browser/webkitgtk/webkitgtk_2.44.0.bb rename to recipes-browser/webkitgtk/webkitgtk_2.44.1.bb index b6876687..2f60aa8c 100644 --- a/recipes-browser/webkitgtk/webkitgtk_2.44.0.bb +++ b/recipes-browser/webkitgtk/webkitgtk_2.44.1.bb @@ -30,11 +30,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI = " \ https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz;name=tarball \ file://0001-Activate-HAVE_MISSING_STD_FILESYSTEM_PATH_CONSTRUCTO.patch \ - file://0002-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch \ - file://0003-GLib-Script-rewrite-compile-commands-missing-from-re.patch \ " -SRC_URI[tarball.sha256sum] = "c66530e41ba59b1edba4ee89ef20b2188e273bed0497e95084729e3cfbe30c87" +SRC_URI[tarball.sha256sum] = "425b1459b0f04d0600c78d1abb5e7edfa3c060a420f8b231e9a6a2d5d29c5561" RRECOMMENDS:${PN} = "${PN}-bin \ ca-certificates \