Skip to contentSkip to conversation

webkitgtk: Fix reproducibility in minibrowser

PATCH New Khem Raj 1 participant 2 messages May 2, 2021

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 webkitgtk: Fix reproducibility in minibrowser

---
 .../0001-MiniBrowser-Fix-reproduciblity.patch | 31 +++++++++++++++++++
 meta/recipes-sato/webkit/webkitgtk_2.30.6.bb  |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch
meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch new file +31 -0
new file mode 100644
index 0000000000..98d2d1ded9
@@ -0,0 +1,31 @@
+From dcf9ae0dc0b4510eddbeeea09e11edfb123f95af Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sun, 2 May 2021 13:10:49 -0700
+Subject: [PATCH] MiniBrowser: Fix reproduciblity
+
+Do not emit references to source dir in generated sourcecode
+
+Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=225283]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ Tools/MiniBrowser/gtk/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
+index 93b62521..482d3b00 100644
+--- a/Tools/MiniBrowser/gtk/CMakeLists.txt
++++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
+@@ -51,8 +51,8 @@ add_custom_command(
+     OUTPUT ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c
+            ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h
+     MAIN_DEPENDENCY ${MiniBrowser_DIR}/browser-marshal.list
+-    COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --body > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c
+-    COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --header > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h
++    COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --body --skip-source > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c
++    COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --header --skip-source > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h
+     VERBATIM)
+ 
+ if (USE_GTK4)
+-- 
+2.31.1
+
meta/recipes-sato/webkit/webkitgtk_2.30.6.bb +1 -0
index 2912bc83a6..7d0d0fc16f 100644
@@ -20,6 +20,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://reduce-memory-overheads.patch \
            file://0001-Extend-atomics-check-to-include-1-byte-CAS-test.patch \
            file://musl-lower-stack-usage.patch \
+           file://0001-MiniBrowser-Fix-reproduciblity.patch \
            "
 
 SRC_URI[sha256sum] = "50736ec7a91770b5939d715196e5fe7209b93efcdeef425b24dc51fb8e9d7c1e"
Signature · 1 line
2.31.1
author
#1 lore raw

PATCH 2/2 webkitgtk: Update patch status

These patches are accepted in webkit master ( 2.34+ )

---
 .../0001-Extend-atomics-check-to-include-1-byte-CAS-test.patch  | 2 +-
 .../webkit/webkitgtk/0001-Fix-build-with-musl.patch             | 2 +-
 meta/recipes-sato/webkit/webkitgtk/musl-lower-stack-usage.patch | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-sato/webkit/webkitgtk/0001-Extend-atomics-check-to-include-1-byte-CAS-test.patch +1 -1
index 93bda4d754..68195f8464 100644
@@ -8,7 +8,7 @@ it can reflect broader range which is now checked
 
 Rename ATOMIC_INT64_IS_BUILTIN to ATOMICS_ARE_BUILTIN
 
-Upstream-Status: Submitted [https://bugs.webkit.org/attachment.cgi?bugid=222959]
+Upstream-Status: Accepted [https://bugs.webkit.org/attachment.cgi?bugid=222959]
 Signed-off-by: Khem Raj <[email protected]>
 ---
  Source/JavaScriptCore/CMakeLists.txt   |  2 +-
meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch +1 -1
index a13b394fd9..1ccef1fdc8 100644
@@ -3,7 +3,7 @@ From: Alexander Kanavin <[email protected]>
 Date: Fri, 6 Oct 2017 17:00:08 +0300
 Subject: [PATCH] Fix build with musl
 
-Upstream-Status: Pending
+Upstream-Status: Accepted
 Signed-off-by: Alexander Kanavin <[email protected]>
 
 ---
meta/recipes-sato/webkit/webkitgtk/musl-lower-stack-usage.patch +1 -1
index dc3a71d932..5033de4196 100644
@@ -13,7 +13,7 @@ setting DEFAULT_THREAD_STACK_SIZE_IN_KB alone is not enough either
 This patch only changes behavior when using musl, the defaults for
 glibc in OE remains same
 
-Upstream-Status: Pending
+Upstream-Status: Accepted
 Signed-off-by: Khem Raj <[email protected]>
 
 --- a/Source/JavaScriptCore/runtime/OptionsList.h
Signature · 1 line
2.31.1