diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-10-05 18:32:03 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-18 18:03:56 +0000 |
commit | f83e0cb7f5e6b50356cc456f90cee471a5b7c39b (patch) | |
tree | 7acec18cecc6c1133384b3ccb19c077d26967670 /meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch | |
parent | 8d93c2ae4d0678b130d43262946188b963686a3a (diff) | |
download | poky-f83e0cb7f5e6b50356cc456f90cee471a5b7c39b.tar.gz |
webkitgtk: update to 2.18.3
gcc7.patch, musl-fixes.patch, and ppc-musl-fix.patch all change code that is no
longer present in upstream tree. However, a patch with different musl fixes
has been added.
The rest of the patches are rebased to the new tree.
Libtasn is a new dependency.
Disable Gstreamer GL support on x86 due to clashing headers problem.
(From OE-Core rev: 3acae2dcd130122fe76504ec855af78db829d6ec)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.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 | 21 |
1 files changed, 11 insertions, 10 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 586dd2375c..e1b69b2a21 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,8 +1,8 @@ | |||
1 | From 4eeeaec775e190cf3f5885d7c6717acebd0201a8 Mon Sep 17 00:00:00 2001 | 1 | From 3cc0e5900515cbcedd0447e0bdf487cc8d9a0f8c 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 5/9] Tweak gtkdoc settings so that gtkdoc generation works |
5 | OpenEmbedded build system | 5 | under OpenEmbedded build system |
6 | 6 | ||
7 | This requires setting a few environment variables so that the transient | 7 | This requires setting a few environment variables so that the transient |
8 | binary is build and linked correctly, and disabling the tweaks to RUN | 8 | binary is build and linked correctly, and disabling the tweaks to RUN |
@@ -10,26 +10,27 @@ variable from gtkdoc.py script so that our qemu wrapper is taken into use. | |||
10 | 10 | ||
11 | Upstream-Status: Inappropriate [oe-specific] | 11 | Upstream-Status: Inappropriate [oe-specific] |
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
13 | |||
13 | --- | 14 | --- |
14 | Source/PlatformGTK.cmake | 2 +- | 15 | Source/PlatformGTK.cmake | 2 +- |
15 | Tools/gtk/gtkdoc.py | 4 ++-- | 16 | Tools/gtk/gtkdoc.py | 4 ++-- |
16 | 2 files changed, 3 insertions(+), 3 deletions(-) | 17 | 2 files changed, 3 insertions(+), 3 deletions(-) |
17 | 18 | ||
18 | diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake | 19 | diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake |
19 | index af4d2e3..b7b93c7 100644 | 20 | index 50b5393f..7a31db51 100644 |
20 | --- a/Source/PlatformGTK.cmake | 21 | --- a/Source/PlatformGTK.cmake |
21 | +++ b/Source/PlatformGTK.cmake | 22 | +++ b/Source/PlatformGTK.cmake |
22 | @@ -25,7 +25,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) | 23 | @@ -24,7 +24,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) |
23 | add_custom_command( | 24 | add_custom_command( |
24 | OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}" | 25 | OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}" |
25 | DEPENDS ${DocumentationDependencies} | 26 | DEPENDS ${DocumentationDependencies} |
26 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS} ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args} | 27 | - COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args} |
27 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS} LD=${CMAKE_C_COMPILER} LDFLAGS=${CMAKE_C_LINK_FLAGS} RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper GIR_EXTRA_LIBS_PATH=${CMAKE_BINARY_DIR}/lib ${CMAKE_SOURCE_DIR}/Tools/gtk/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/gtk/generate-gtkdoc -v ${_extra_args} |
28 | COMMAND touch ${_stamp_name} | 29 | COMMAND touch ${_stamp_name} |
29 | WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" | 30 | WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" |
30 | ) | 31 | VERBATIM |
31 | diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py | 32 | diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py |
32 | index 4c8237b..c0205f0 100644 | 33 | index 48f862a3..18240e42 100644 |
33 | --- a/Tools/gtk/gtkdoc.py | 34 | --- a/Tools/gtk/gtkdoc.py |
34 | +++ b/Tools/gtk/gtkdoc.py | 35 | +++ b/Tools/gtk/gtkdoc.py |
35 | @@ -318,9 +318,9 @@ class GTKDoc(object): | 36 | @@ -318,9 +318,9 @@ class GTKDoc(object): |
@@ -45,5 +46,5 @@ index 4c8237b..c0205f0 100644 | |||
45 | 46 | ||
46 | if ldflags: | 47 | if ldflags: |
47 | -- | 48 | -- |
48 | 2.8.1 | 49 | 2.14.1 |
49 | 50 | ||