Source/WebKit2/ChangeLog

112014-03-10 Carlos Garcia Campos <cgarcia@igalia.com>
22
 3 [GTK] WebKit2WebExtension GIR can't be used in vala
 4 https://bugs.webkit.org/show_bug.cgi?id=127179
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 Do not include WebKit2 gir symbols from WebKit2WebExtension gir
 9 file.
 10
 11 * GNUmakefile.am:
 12 * PlatformGTK.cmake:
 13
 142014-03-10 Carlos Garcia Campos <cgarcia@igalia.com>
 15
316 [GTK] The web process can finish while a print operation is still ongoing
417 https://bugs.webkit.org/show_bug.cgi?id=129871
518

Source/WebKit2/GNUmakefile.am

@@WebKit2WebExtension-@WEBKITGTK_API_VERSION@.gir: $(G_IR_SCANNER) WebKit2-@WEBKIT
353353 --include=GObject-2.0 \
354354 --include=Gtk-3.0 \
355355 --include-uninstalled=JavaScriptCore-@WEBKITGTK_API_VERSION@.gir \
356  --include-uninstalled=WebKit2-@WEBKITGTK_API_VERSION@.gir \
357356 --library=webkit2gtk-@WEBKITGTK_API_VERSION@ \
358357 --library=javascriptcoregtk-@WEBKITGTK_API_VERSION@ \
359358 --libtool="$(LIBTOOL)" \

@@WebKit2WebExtension-@WEBKITGTK_API_VERSION@.gir: $(G_IR_SCANNER) WebKit2-@WEBKIT
380379 -DWEBKIT2_COMPILATION \
381380 $(webkit2gtk_web_extension_h_api) \
382381 $(webkitgtk_gdom_built_h_api) \
 382 $(WebKit2)/UIProcess/API/gtk/WebKitURIRequest.h \
 383 $(WebKit2)/UIProcess/API/gtk/WebKitURIResponse.h \
383384 $(WebKit2)/WebProcess/InjectedBundle/API/gtk/*.cpp
384385
385386WebKit2WebExtension-@WEBKITGTK_API_VERSION@.typelib: WebKit2WebExtension-@WEBKITGTK_API_VERSION@.gir $(G_IR_COMPILER)

Source/WebKit2/PlatformGTK.cmake

@@add_custom_command(
734734 --include=Gtk-${WEBKITGTK_API_VERSION}
735735 --include=Soup-2.4
736736 --include-uninstalled=${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
737  --include-uninstalled=${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
738737 --library=webkit2gtk-${WEBKITGTK_API_VERSION}
739738 --library=javascriptcoregtk-${WEBKITGTK_API_VERSION}
740739 -L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}

@@add_custom_command(
758757 -I${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk
759758 ${GObjectDOMBindings_GIR_HEADERS}
760759 ${WebKit2WebExtension_INSTALLED_HEADERS}
 760 ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitURIRequest.h
 761 ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitURIResponse.h
761762 ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/*.cpp
762763)
763764