diff options
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch index 3f71297f50..fb4c4dc932 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch | |||
@@ -1,23 +1,24 @@ | |||
1 | From bae9f73b2c693b5aa156fed717d6481b60682786 Mon Sep 17 00:00:00 2001 | 1 | From 98b1359a0cd87bbdb22cef98ba594440f4c57d92 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: Wed, 28 Oct 2015 14:18:57 +0200 | 3 | Date: Wed, 28 Oct 2015 14:18:57 +0200 |
4 | Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the | 4 | Subject: [PATCH 2/9] When building introspection files, add CMAKE_C_FLAGS to |
5 | compiler flags. | 5 | the compiler flags. |
6 | 6 | ||
7 | g-ir-compiler is using a C compiler internally, so it needs to set | 7 | g-ir-compiler is using a C compiler internally, so it needs to set |
8 | the proper flags for it. | 8 | the proper flags for it. |
9 | 9 | ||
10 | Upstream-Status: Pending [review on oe-core list] | 10 | Upstream-Status: Pending [review on oe-core list] |
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
12 | |||
12 | --- | 13 | --- |
13 | Source/WebKit2/PlatformGTK.cmake | 4 ++-- | 14 | Source/WebKit/PlatformGTK.cmake | 4 ++-- |
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | 15 | 1 file changed, 2 insertions(+), 2 deletions(-) |
15 | 16 | ||
16 | Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake | 17 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake |
17 | =================================================================== | 18 | index 7f92ae72..a33c6a86 100644 |
18 | --- webkitgtk-2.12.1.orig/Source/WebKit2/PlatformGTK.cmake | 19 | --- a/Source/WebKit/PlatformGTK.cmake |
19 | +++ webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake | 20 | +++ b/Source/WebKit/PlatformGTK.cmake |
20 | @@ -910,7 +910,7 @@ add_custom_command( | 21 | @@ -1126,7 +1126,7 @@ add_custom_command( |
21 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | 22 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir |
22 | DEPENDS WebKit2 | 23 | DEPENDS WebKit2 |
23 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | 24 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
@@ -26,7 +27,7 @@ Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake | |||
26 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | 27 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" |
27 | ${INTROSPECTION_SCANNER} | 28 | ${INTROSPECTION_SCANNER} |
28 | --quiet | 29 | --quiet |
29 | @@ -951,7 +951,7 @@ add_custom_command( | 30 | @@ -1169,7 +1169,7 @@ add_custom_command( |
30 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir | 31 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir |
31 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | 32 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
32 | DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | 33 | DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir |
@@ -35,3 +36,6 @@ Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake | |||
35 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" | 36 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" |
36 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | 37 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" |
37 | ${INTROSPECTION_SCANNER} | 38 | ${INTROSPECTION_SCANNER} |
39 | -- | ||
40 | 2.14.1 | ||
41 | |||