diff options
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch | 14 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.18.5.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.18.3.bb) | 4 |
2 files changed, 9 insertions, 9 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 e1b69b2a21..83fd5129a0 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,7 +1,7 @@ | |||
1 | From 3cc0e5900515cbcedd0447e0bdf487cc8d9a0f8c Mon Sep 17 00:00:00 2001 | 1 | From 9b09974003097c9a408bbeea568996768efe705b 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 5/9] Tweak gtkdoc settings so that gtkdoc generation works | 4 | Subject: [PATCH 05/10] Tweak gtkdoc settings so that gtkdoc generation works |
5 | under 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 |
@@ -17,7 +17,7 @@ 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/PlatformGTK.cmake b/Source/PlatformGTK.cmake | 19 | diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake |
20 | index 50b5393f..7a31db51 100644 | 20 | index 50b5393..7a31db5 100644 |
21 | --- a/Source/PlatformGTK.cmake | 21 | --- a/Source/PlatformGTK.cmake |
22 | +++ b/Source/PlatformGTK.cmake | 22 | +++ b/Source/PlatformGTK.cmake |
23 | @@ -24,7 +24,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) | 23 | @@ -24,7 +24,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) |
@@ -30,7 +30,7 @@ index 50b5393f..7a31db51 100644 | |||
30 | WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" | 30 | WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" |
31 | VERBATIM | 31 | VERBATIM |
32 | 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 |
33 | index 48f862a3..18240e42 100644 | 33 | index 03c8e8e..34fbaff 100644 |
34 | --- a/Tools/gtk/gtkdoc.py | 34 | --- a/Tools/gtk/gtkdoc.py |
35 | +++ b/Tools/gtk/gtkdoc.py | 35 | +++ b/Tools/gtk/gtkdoc.py |
36 | @@ -318,9 +318,9 @@ class GTKDoc(object): | 36 | @@ -318,9 +318,9 @@ class GTKDoc(object): |
@@ -39,12 +39,12 @@ index 48f862a3..18240e42 100644 | |||
39 | current_ld_library_path = env.get('LD_LIBRARY_PATH') | 39 | current_ld_library_path = env.get('LD_LIBRARY_PATH') |
40 | - if current_ld_library_path: | 40 | - if current_ld_library_path: |
41 | + if current_ld_library_path and 'RUN' not in env: | 41 | + if current_ld_library_path and 'RUN' not in env: |
42 | env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path) | 42 | env['LD_LIBRARY_PATH'] = '%s:%s' % (self.library_path, current_ld_library_path) |
43 | - else: | 43 | - else: |
44 | + elif 'RUN' not in env: | 44 | + elif 'RUN' not in env: |
45 | env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path | 45 | env['LD_LIBRARY_PATH'] = self.library_path |
46 | 46 | ||
47 | if ldflags: | 47 | if ldflags: |
48 | -- | 48 | -- |
49 | 2.14.1 | 49 | 2.15.1 |
50 | 50 | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.18.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.18.5.bb index 4938f69b7b..a64aee22e6 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.18.3.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.18.5.bb | |||
@@ -22,8 +22,8 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | |||
22 | file://0001-Fix-build-with-musl.patch \ | 22 | file://0001-Fix-build-with-musl.patch \ |
23 | " | 23 | " |
24 | 24 | ||
25 | SRC_URI[md5sum] = "264a22d7467deae606e42b6eb5dd65af" | 25 | SRC_URI[md5sum] = "af18c2cfa00cadfd0b4d8db21cab011d" |
26 | SRC_URI[sha256sum] = "e15420e1616a6f70f321541d467af5ca285bff66b1e0fa68a01df3ccf1b18f9e" | 26 | SRC_URI[sha256sum] = "0c6d80cc7eb5d32f8063041fa11a1a6f17a29765c2f69c6bc862cd47c2d539b8" |
27 | 27 | ||
28 | inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc | 28 | inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc |
29 | 29 | ||