Title: [165625] trunk/Source/WebKit2
- Revision
- 165625
- Author
- carlo...@webkit.org
- Date
- 2014-03-14 10:06:06 -0700 (Fri, 14 Mar 2014)
Log Message
[GTK] WebKit2WebExtension GIR can't be used in vala
https://bugs.webkit.org/show_bug.cgi?id=127179
Reviewed by Martin Robinson.
Do not include all WebKit2 gir symbols from WebKit2WebExtension gir
file.
* GNUmakefile.am:
* PlatformGTK.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (165624 => 165625)
--- trunk/Source/WebKit2/ChangeLog 2014-03-14 16:25:13 UTC (rev 165624)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-14 17:06:06 UTC (rev 165625)
@@ -1,3 +1,16 @@
+2014-03-14 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] WebKit2WebExtension GIR can't be used in vala
+ https://bugs.webkit.org/show_bug.cgi?id=127179
+
+ Reviewed by Martin Robinson.
+
+ Do not include all WebKit2 gir symbols from WebKit2WebExtension gir
+ file.
+
+ * GNUmakefile.am:
+ * PlatformGTK.cmake:
+
2014-03-14 Csaba Osztrogonác <o...@webkit.org>
[CMake] URTBF after r165619.
Modified: trunk/Source/WebKit2/GNUmakefile.am (165624 => 165625)
--- trunk/Source/WebKit2/GNUmakefile.am 2014-03-14 16:25:13 UTC (rev 165624)
+++ trunk/Source/WebKit2/GNUmakefile.am 2014-03-14 17:06:06 UTC (rev 165625)
@@ -353,7 +353,6 @@
--include=GObject-2.0 \
--include=Gtk-3.0 \
--include-uninstalled=_javascript_Core-@WEBKITGTK_API_VERSION@.gir \
- --include-uninstalled=WebKit2-@WEBKITGTK_API_VERSION@.gir \
--library=webkit2gtk-@WEBKITGTK_API_VERSION@ \
--library=_javascript_coregtk-@WEBKITGTK_API_VERSION@ \
--libtool="$(LIBTOOL)" \
@@ -380,6 +379,8 @@
-DWEBKIT2_COMPILATION \
$(webkit2gtk_web_extension_h_api) \
$(webkitgtk_gdom_built_h_api) \
+ $(WebKit2)/UIProcess/API/gtk/WebKitURIRequest.h \
+ $(WebKit2)/UIProcess/API/gtk/WebKitURIResponse.h \
$(WebKit2)/WebProcess/InjectedBundle/API/gtk/*.cpp
WebKit2WebExtension-@WEBKITGTK_API_VERSION@.typelib: WebKit2WebExtension-@WEBKITGTK_API_VERSION@.gir $(G_IR_COMPILER)
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (165624 => 165625)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-03-14 16:25:13 UTC (rev 165624)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-03-14 17:06:06 UTC (rev 165625)
@@ -737,7 +737,6 @@
--include=Gtk-${WEBKITGTK_API_VERSION}
--include=Soup-2.4
--include-uninstalled=${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
- --include-uninstalled=${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
--library=webkit2gtk-${WEBKITGTK_API_VERSION}
--library=_javascript_coregtk-${WEBKITGTK_API_VERSION}
-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
@@ -761,6 +760,8 @@
-I${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk
${GObjectDOMBindings_GIR_HEADERS}
${WebKit2WebExtension_INSTALLED_HEADERS}
+ ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitURIRequest.h
+ ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitURIResponse.h
${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/*.cpp
)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
