Commit c518a90e authored by Michael Catanzaro's avatar Michael Catanzaro

3.14: add patch for missing WebKit headers

These are missing by mistake, and needed to build Epiphany
parent bff85dbd
......@@ -1303,6 +1303,7 @@
module="webkitgtk-2.5.1.tar.xz" version="2.5.1"
hash="sha256:3e66b0b932bd79c0e63eda4ab59b12bfff0daefeb0b5aa34a8eb902b5761368e"
size="10502028">
<patch file="webkit-2.5.1.missing-headers.patch" strip="1"/>
</branch>
<dependencies>
<dep package="at-spi2-core"/>
......
2014-08-03 Carlos Garcia Campos <cgarcia@igalia.com>
[GTK] Install all unstable webkitdom headers
https://bugs.webkit.org/show_bug.cgi?id=135544
Reviewed by NOBODY (OOPS!).
Add Unstable.h header for all stable classes to
GObjectDOMBindingsUnstable_INSTALLED_HEADERS and split the install
command for stable and unstable headers making unstable headers optional.
* PlatformGTK.cmake:
diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
index 25d2177..886c791 100644
--- a/Source/WebCore/PlatformGTK.cmake
+++ b/Source/WebCore/PlatformGTK.cmake
@@ -669,9 +669,7 @@ foreach (file ${GObjectDOMBindingsStable_IDL_FILES})
get_filename_component(classname ${file} NAME_WE)
list(APPEND GObjectDOMBindingsStable_CLASS_LIST ${classname})
list(APPEND GObjectDOMBindingsStable_INSTALLED_HEADERS ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}.h)
- if (EXISTS "${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}Unstable.h")
- list(APPEND GObjectDOMBindingsUnstable_INSTALLED_HEADERS ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}Unstable.h)
- endif ()
+ list(APPEND GObjectDOMBindingsUnstable_INSTALLED_HEADERS ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}Unstable.h)
endforeach ()
foreach (file ${GObjectDOMBindingsUnstable_IDL_FILES})
@@ -749,13 +747,18 @@ file(WRITE ${CMAKE_BINARY_DIR}/gtkdoc-webkitdom.cfg
"headers=${GObjectDOMBindingsStable_INSTALLED_HEADERS}\n"
)
-set(GObjectDOMBindings_INSTALLED_HEADERS ${GObjectDOMBindingsStable_INSTALLED_HEADERS} ${GObjectDOMBindingsUnstable_INSTALLED_HEADERS})
-install(FILES ${GObjectDOMBindings_INSTALLED_HEADERS}
+install(FILES ${GObjectDOMBindingsStable_INSTALLED_HEADERS}
+ DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/webkitdom"
+)
+
+# Make unstable header optional if they don't exist
+install(FILES ${GObjectDOMBindingsUnstable_INSTALLED_HEADERS}
DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/webkitdom"
+ OPTIONAL
)
# Some installed headers are not on the list of headers used for gir generation.
-set(GObjectDOMBindings_GIR_HEADERS ${GObjectDOMBindings_INSTALLED_HEADERS})
+set(GObjectDOMBindings_GIR_HEADERS ${GObjectDOMBindingsStable_INSTALLED_HEADERS})
list(REMOVE_ITEM GObjectDOMBindings_GIR_HEADERS
bindings/gobject/WebKitDOMEventTarget.h
bindings/gobject/WebKitDOMNodeFilter.h
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment