summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch10
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch33
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.24.4.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.24.3.bb)5
3 files changed, 7 insertions, 41 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
index 664cea9c75..e7c668c040 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
@@ -1,4 +1,4 @@
1From d3796ad1a19233ee5d3492a5560d7ede882f89cf Mon Sep 17 00:00:00 2001 1From 4b5e02212a31b82fc9b3becad90542274816fc29 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 11 Aug 2016 17:13:51 +0300 3Date: Thu, 11 Aug 2016 17:13:51 +0300
4Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under 4Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under
@@ -17,23 +17,23 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
17 2 files changed, 3 insertions(+), 3 deletions(-) 17 2 files changed, 3 insertions(+), 3 deletions(-)
18 18
19diff --git a/Source/cmake/GtkDoc.cmake b/Source/cmake/GtkDoc.cmake 19diff --git a/Source/cmake/GtkDoc.cmake b/Source/cmake/GtkDoc.cmake
20index 2ee05550..6cb6313d 100644 20index b0fb31ca..6cb6313d 100644
21--- a/Source/cmake/GtkDoc.cmake 21--- a/Source/cmake/GtkDoc.cmake
22+++ b/Source/cmake/GtkDoc.cmake 22+++ b/Source/cmake/GtkDoc.cmake
23@@ -4,7 +4,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) 23@@ -4,7 +4,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args)
24 add_custom_command( 24 add_custom_command(
25 OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}" 25 OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}"
26 DEPENDS ${DocumentationDependencies} 26 DEPENDS ${DocumentationDependencies}
27- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args} 27- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LDFLAGS=${CMAKE_EXE_LINKER_FLAGS}" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
28+ COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LD=${CMAKE_C_COMPILER}" "LDFLAGS=${CMAKE_C_LINK_FLAGS}" "RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args} 28+ COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LD=${CMAKE_C_COMPILER}" "LDFLAGS=${CMAKE_C_LINK_FLAGS}" "RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
29 COMMAND touch ${_stamp_name} 29 COMMAND touch ${_stamp_name}
30 WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" 30 WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
31 VERBATIM 31 VERBATIM
32diff --git a/Tools/gtkdoc/gtkdoc.py b/Tools/gtkdoc/gtkdoc.py 32diff --git a/Tools/gtkdoc/gtkdoc.py b/Tools/gtkdoc/gtkdoc.py
33index 81ee8cdc..3e11c2f0 100644 33index 054cafa1..416de7d1 100644
34--- a/Tools/gtkdoc/gtkdoc.py 34--- a/Tools/gtkdoc/gtkdoc.py
35+++ b/Tools/gtkdoc/gtkdoc.py 35+++ b/Tools/gtkdoc/gtkdoc.py
36@@ -317,9 +317,9 @@ class GTKDoc(object): 36@@ -320,9 +320,9 @@ class GTKDoc(object):
37 additional_ldflags = '%s %s' % (additional_ldflags, arg) 37 additional_ldflags = '%s %s' % (additional_ldflags, arg)
38 ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags 38 ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags
39 current_ld_library_path = env.get('LD_LIBRARY_PATH') 39 current_ld_library_path = env.get('LD_LIBRARY_PATH')
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch
deleted file mode 100644
index e550a0d457..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 4bc241539246f7a17d07357257ab47cb96bc4b69 Mon Sep 17 00:00:00 2001
2From: "ysuzuki@apple.com" <ysuzuki@apple.com>
3Date: Thu, 18 Apr 2019 07:30:18 +0000
4Subject: [PATCH] Unreviewed, fix build failure
5 https://bugs.webkit.org/show_bug.cgi?id=195938
6
7Including <array>.
8
9* bmalloc/AvailableMemory.cpp:
10
11git-svn-id: http://svn.webkit.org/repository/webkit/trunk@244422 268f45cc-cd09-0410-ab3c-d52691b4dbfc
12
13Upstream-Status: Backport [https://github.com/WebKit/webkit/commit/84c111dc0d83b5acf60706ef49bc2f5e91112471]
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 Source/bmalloc/bmalloc/AvailableMemory.cpp | 1 +
17 1 file changed, 1 insertion(+)
18
19diff --git a/Source/bmalloc/bmalloc/AvailableMemory.cpp b/Source/bmalloc/bmalloc/AvailableMemory.cpp
20index 595889fe..b72000d5 100644
21--- a/Source/bmalloc/bmalloc/AvailableMemory.cpp
22+++ b/Source/bmalloc/bmalloc/AvailableMemory.cpp
23@@ -32,6 +32,7 @@
24 #include "PerProcess.h"
25 #include "Scavenger.h"
26 #include "Sizes.h"
27+#include <array>
28 #include <mutex>
29 #if BOS(DARWIN)
30 #if BPLATFORM(IOS_FAMILY)
31--
322.22.0
33
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.24.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb
index 7108242168..8c695ce9e7 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.24.3.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb
@@ -23,11 +23,10 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
23 file://include_array.patch \ 23 file://include_array.patch \
24 file://narrowing.patch \ 24 file://narrowing.patch \
25 file://0001-gstreamer-add-a-missing-format-string.patch \ 25 file://0001-gstreamer-add-a-missing-format-string.patch \
26 file://0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch \
27 " 26 "
28 27
29SRC_URI[md5sum] = "e2a5bbd09a217eba096a2d1562143e35" 28SRC_URI[md5sum] = "c214963d8c0e7d83460da04a0d8dda87"
30SRC_URI[sha256sum] = "940d746d7e82c357222feb5b3f44c4b201e81df7d81ddca5ca2bf3ae0acf6c51" 29SRC_URI[sha256sum] = "8668b129c026624ec226a4cccf4995f9d26f3e88fc28ab75b0e965f3c32b7dd8"
31 30
32inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc 31inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
33 32