diff options
Diffstat (limited to 'meta/recipes-sato/webkit')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Source-JavaScriptCore-CMakeLists.txt-ensure-reproduc.patch | 28 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/4977290ab4ab35258a6da9b13795c9b0f7894bf4.patch | 41 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.40.5.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.40.2.bb) | 5 |
3 files changed, 1 insertions, 73 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Source-JavaScriptCore-CMakeLists.txt-ensure-reproduc.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Source-JavaScriptCore-CMakeLists.txt-ensure-reproduc.patch deleted file mode 100644 index bbe265059d..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Source-JavaScriptCore-CMakeLists.txt-ensure-reproduc.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From cd65e3d9256a4f6eb7906a9f10678c29a4ffef2f Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Mon, 26 Jun 2023 14:30:02 +0200 | ||
4 | Subject: [PATCH] Source/JavaScriptCore/CMakeLists.txt: ensure reproducibility | ||
5 | of __TIMESTAMP__ | ||
6 | |||
7 | __TIMESTAMP__ refers to mtime of the file that contains it, which is unstable | ||
8 | and breaks binary reproducibility when the file is generated at build time. To ensure | ||
9 | this does not happen, mtime should be set from the original file. | ||
10 | |||
11 | Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/15293] | ||
12 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
13 | --- | ||
14 | Source/JavaScriptCore/CMakeLists.txt | 1 + | ||
15 | 1 file changed, 1 insertion(+) | ||
16 | |||
17 | diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt | ||
18 | index 43dc22ff..c2e3b1cd 100644 | ||
19 | --- a/Source/JavaScriptCore/CMakeLists.txt | ||
20 | +++ b/Source/JavaScriptCore/CMakeLists.txt | ||
21 | @@ -159,6 +159,7 @@ add_custom_command( | ||
22 | OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/JSCBytecodeCacheVersion.cpp | ||
23 | MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/runtime/JSCBytecodeCacheVersion.cpp.in | ||
24 | COMMAND ${PERL_EXECUTABLE} -pe s/CACHED_TYPES_CKSUM/__TIMESTAMP__/ ${JAVASCRIPTCORE_DIR}/runtime/JSCBytecodeCacheVersion.cpp.in > ${JavaScriptCore_DERIVED_SOURCES_DIR}/JSCBytecodeCacheVersion.cpp | ||
25 | + COMMAND touch -r ${JAVASCRIPTCORE_DIR}/runtime/JSCBytecodeCacheVersion.cpp.in ${JavaScriptCore_DERIVED_SOURCES_DIR}/JSCBytecodeCacheVersion.cpp | ||
26 | VERBATIM | ||
27 | ) | ||
28 | |||
diff --git a/meta/recipes-sato/webkit/webkitgtk/4977290ab4ab35258a6da9b13795c9b0f7894bf4.patch b/meta/recipes-sato/webkit/webkitgtk/4977290ab4ab35258a6da9b13795c9b0f7894bf4.patch deleted file mode 100644 index 79da855ff4..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/4977290ab4ab35258a6da9b13795c9b0f7894bf4.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From 4977290ab4ab35258a6da9b13795c9b0f7894bf4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Diego Pino Garcia <dpino@igalia.com> | ||
3 | Date: Mon, 22 May 2023 19:58:50 -0700 | ||
4 | Subject: [PATCH] [GLIB] Fix build error after 264196@main | ||
5 | https://bugs.webkit.org/show_bug.cgi?id=256917 | ||
6 | |||
7 | Reviewed by Michael Catanzaro. | ||
8 | |||
9 | Variable BWRAP_EXECUTABLE is only defined when BUBBLEWRAP_SANDBOX is | ||
10 | enabled. | ||
11 | |||
12 | * Source/WTF/wtf/glib/Sandbox.cpp: | ||
13 | (WTF::isInsideUnsupportedContainer): | ||
14 | |||
15 | Canonical link: https://commits.webkit.org/264395@main | ||
16 | Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/4977290ab4ab35258a6da9b13795c9b0f7894bf4] | ||
17 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
18 | --- | ||
19 | Source/WTF/wtf/glib/Sandbox.cpp | 2 ++ | ||
20 | 1 file changed, 2 insertions(+) | ||
21 | |||
22 | diff --git a/Source/WTF/wtf/glib/Sandbox.cpp b/Source/WTF/wtf/glib/Sandbox.cpp | ||
23 | index 7d84e830ab33e..9b07bb8cb5a9b 100644 | ||
24 | --- a/Source/WTF/wtf/glib/Sandbox.cpp | ||
25 | +++ b/Source/WTF/wtf/glib/Sandbox.cpp | ||
26 | @@ -36,6 +36,7 @@ bool isInsideFlatpak() | ||
27 | return returnValue; | ||
28 | } | ||
29 | |||
30 | +#if ENABLE(BUBBLEWRAP_SANDBOX) | ||
31 | bool isInsideUnsupportedContainer() | ||
32 | { | ||
33 | static bool inContainer = g_file_test("/run/.containerenv", G_FILE_TEST_EXISTS); | ||
34 | @@ -64,6 +65,7 @@ bool isInsideUnsupportedContainer() | ||
35 | |||
36 | return inContainer && !supportedContainer; | ||
37 | } | ||
38 | +#endif | ||
39 | |||
40 | bool isInsideSnap() | ||
41 | { | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.40.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.40.5.bb index a9391bfc99..7bf32e8610 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.40.2.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.40.5.bb | |||
@@ -13,11 +13,9 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | |||
13 | file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ | 13 | file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ |
14 | file://reproducibility.patch \ | 14 | file://reproducibility.patch \ |
15 | file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ | 15 | file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ |
16 | file://4977290ab4ab35258a6da9b13795c9b0f7894bf4.patch \ | ||
17 | file://0001-Source-JavaScriptCore-CMakeLists.txt-ensure-reproduc.patch \ | ||
18 | file://check-GST_GL_HAVE_PLATFORM_GLX.patch \ | 16 | file://check-GST_GL_HAVE_PLATFORM_GLX.patch \ |
19 | " | 17 | " |
20 | SRC_URI[sha256sum] = "96898870d994da406ee7a632816dcde9a3bb395ee5f344fcb3f3b8cc8a77e000" | 18 | SRC_URI[sha256sum] = "7de051a263668621d91a61a5eb1c3771d1a7cec900043d4afef06c326c16037f" |
21 | 19 | ||
22 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen | 20 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen |
23 | 21 | ||
@@ -162,6 +160,5 @@ src_package_preprocess () { | |||
162 | ${B}/JavaScriptCore/PrivateHeaders/JavaScriptCore/*.h \ | 160 | ${B}/JavaScriptCore/PrivateHeaders/JavaScriptCore/*.h \ |
163 | ${B}/WebCore/DerivedSources/*.cpp \ | 161 | ${B}/WebCore/DerivedSources/*.cpp \ |
164 | ${B}/WebKitGTK/DerivedSources/webkit/*.cpp | 162 | ${B}/WebKitGTK/DerivedSources/webkit/*.cpp |
165 | |||
166 | } | 163 | } |
167 | 164 | ||