summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-05-02 13:16:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-15 11:53:55 +0000
commit712b6f51f9f35b53ab7987a66bca9d6173044ac5 (patch)
treec74904e02c720837a93f7fec25ba1463784f0ff6
parent25cf12590903e0313b4c8fbd3cf6526bdc22a22d (diff)
downloadpoky-712b6f51f9f35b53ab7987a66bca9d6173044ac5.tar.gz
webkitgtk: Fix reproducibility in minibrowser
(From OE-Core rev: 5ebea40c2236900a11b6025b53b4728eb08e5464) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 8f08ca440b6c2ad3494808ffa4ec6091722c0339) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch31
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.28.4.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch b/meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch
new file mode 100644
index 0000000000..528dec8c8b
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch
@@ -0,0 +1,31 @@
1From dcf9ae0dc0b4510eddbeeea09e11edfb123f95af Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 2 May 2021 13:10:49 -0700
4Subject: [PATCH] MiniBrowser: Fix reproduciblity
5
6Do not emit references to source dir in generated sourcecode
7
8Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=225283]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 Tools/MiniBrowser/gtk/CMakeLists.txt | 4 ++--
12 1 file changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
15index 93b62521..482d3b00 100644
16--- a/Tools/MiniBrowser/gtk/CMakeLists.txt
17+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
18@@ -48,8 +48,8 @@ add_custom_command(
19 OUTPUT ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
20 ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h
21 MAIN_DEPENDENCY ${MINIBROWSER_DIR}/browser-marshal.list
22- COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --body > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
23- COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --header > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h
24+ COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --body --skip-source > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
25+ COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --header --skip-source > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h
26 VERBATIM)
27
28 if (DEVELOPER_MODE)
29--
302.31.1
31
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.28.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.28.4.bb
index ceda2992d7..2e3f0aa682 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.28.4.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.28.4.bb
@@ -20,6 +20,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
20 file://0001-Fix-build-with-musl.patch \ 20 file://0001-Fix-build-with-musl.patch \
21 file://include_array.patch \ 21 file://include_array.patch \
22 file://0001-clang-11-fix-build-errors-due-to-WWc-11-narrowing.patch \ 22 file://0001-clang-11-fix-build-errors-due-to-WWc-11-narrowing.patch \
23 file://0001-MiniBrowser-Fix-reproduciblity.patch \
23 " 24 "
24SRC_URI[sha256sum] = "821952e8c9303ed752f1fb1d4283f612c25249d00d705d2b79c2db1bc49c9464" 25SRC_URI[sha256sum] = "821952e8c9303ed752f1fb1d4283f612c25249d00d705d2b79c2db1bc49c9464"
25 26