diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-08-30 14:49:58 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-01 22:33:07 +0100 |
commit | 4c45bdff807173366137176b5e0b2f9884a03e48 (patch) | |
tree | 46bc98581b1ad44f605e3d32b05c52325fd62ea7 /meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch | |
parent | 14a0d1cc90d4c13ff284927966bd6b0530d72ab1 (diff) | |
download | poky-4c45bdff807173366137176b5e0b2f9884a03e48.tar.gz |
webkitgtk: update 2.24.3 -> 2.24.4
In particular this brings an important fix for builds with py3:
"Fix build issue which would cause media controls to disappear when Python 3.x was used during the build process."
https://webkitgtk.org/2019/08/28/webkitgtk2.24.4-released.html
(From OE-Core rev: 62c1a8ead15d58fb1f159dc6cd6cf22fa8183426)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch | 10 |
1 files changed, 5 insertions, 5 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 @@ | |||
1 | From d3796ad1a19233ee5d3492a5560d7ede882f89cf Mon Sep 17 00:00:00 2001 | 1 | From 4b5e02212a31b82fc9b3becad90542274816fc29 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 11 Aug 2016 17:13:51 +0300 | 3 | Date: Thu, 11 Aug 2016 17:13:51 +0300 |
4 | Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under | 4 | Subject: [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 | ||
19 | diff --git a/Source/cmake/GtkDoc.cmake b/Source/cmake/GtkDoc.cmake | 19 | diff --git a/Source/cmake/GtkDoc.cmake b/Source/cmake/GtkDoc.cmake |
20 | index 2ee05550..6cb6313d 100644 | 20 | index 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 |
32 | diff --git a/Tools/gtkdoc/gtkdoc.py b/Tools/gtkdoc/gtkdoc.py | 32 | diff --git a/Tools/gtkdoc/gtkdoc.py b/Tools/gtkdoc/gtkdoc.py |
33 | index 81ee8cdc..3e11c2f0 100644 | 33 | index 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') |