Title: [164973] trunk
- Revision
- 164973
- Author
- carlo...@webkit.org
- Date
- 2014-03-03 00:07:49 -0800 (Mon, 03 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.
Add a different pkg-config file for the web extensions API.
.:
* Source/cmake/OptionsGTK.cmake:
* configure.ac:
Source/WebKit2:
* GNUmakefile.am:
* PlatformGTK.cmake:
* webkit2gtk-web-extension.pc.in: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/ChangeLog (164972 => 164973)
--- trunk/ChangeLog 2014-03-03 07:10:57 UTC (rev 164972)
+++ trunk/ChangeLog 2014-03-03 08:07:49 UTC (rev 164973)
@@ -1,3 +1,15 @@
+2014-03-03 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.
+
+ Add a different pkg-config file for the web extensions API.
+
+ * Source/cmake/OptionsGTK.cmake:
+ * configure.ac:
+
2014-03-02 Dirkjan Ochtman <d.ocht...@activevideo.com>
Support ENABLE_ENCRYPTED_MEDIA in cmake builds
Modified: trunk/Source/WebKit2/ChangeLog (164972 => 164973)
--- trunk/Source/WebKit2/ChangeLog 2014-03-03 07:10:57 UTC (rev 164972)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-03 08:07:49 UTC (rev 164973)
@@ -1,3 +1,16 @@
+2014-03-03 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.
+
+ Add a different pkg-config file for the web extensions API.
+
+ * GNUmakefile.am:
+ * PlatformGTK.cmake:
+ * webkit2gtk-web-extension.pc.in: Added.
+
2014-03-02 Darin Adler <da...@apple.com>
Streamline use of TextIterator, cutting down includes and use of soon-to-be-deleted functions
Modified: trunk/Source/WebKit2/GNUmakefile.am (164972 => 164973)
--- trunk/Source/WebKit2/GNUmakefile.am 2014-03-03 07:10:57 UTC (rev 164972)
+++ trunk/Source/WebKit2/GNUmakefile.am 2014-03-03 08:07:49 UTC (rev 164973)
@@ -285,7 +285,9 @@
$(webkit2gtk_web_extension_h_api)
if ENABLE_WEBKIT2
-pkgconfig_DATA += Source/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc
+pkgconfig_DATA += \
+ Source/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc \
+ Source/WebKit2/webkit2gtk-web-extension-@WEBKITGTK_API_VERSION@.pc
if ENABLE_INTROSPECTION
@@ -358,7 +360,7 @@
--pkg=gobject-2.0 \
--pkg=gtk+-@GTK_API_VERSION@ \
--pkg=libsoup-2.4 \
- --pkg-export=webkit2gtk-@WEBKITGTK_API_VERSION@ \
+ --pkg-export=webkit2gtk-web-extension-@WEBKITGTK_API_VERSION@ \
--output=$@ \
--add-include-path=$(WebKit2) \
--add-include-path=$(top_builddir) \
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (164972 => 164973)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-03-03 07:10:57 UTC (rev 164972)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-03-03 08:07:49 UTC (rev 164973)
@@ -5,6 +5,7 @@
configure_file(UIProcess/API/gtk/WebKitVersion.h.in ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitVersion.h)
configure_file(webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE} @ONLY)
+configure_file(webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
add_definitions(-DWEBKIT2_COMPILATION)
add_definitions(-DLIBEXECDIR="${CMAKE_INSTALL_FULL_LIBEXECDIR}")
@@ -741,7 +742,7 @@
--pkg=gobject-2.0
--pkg=gtk+-${WEBKITGTK_API_VERSION}
--pkg=libsoup-2.4
- --pkg-export=webkit2gtk-${WEBKITGTK_API_VERSION}
+ --pkg-export=webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}
--output=${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
--c-include="webkit2/webkit-web-extension.h"
-DBUILDING_WEBKIT
@@ -779,6 +780,7 @@
DESTINATION "${LIB_INSTALL_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}/injected-bundle"
)
install(FILES "${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc"
+ "${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc"
DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
)
install(FILES ${WebKit2GTK_INSTALLED_HEADERS}
Added: trunk/Source/WebKit2/webkit2gtk-web-extension.pc.in (0 => 164973)
--- trunk/Source/WebKit2/webkit2gtk-web-extension.pc.in (rev 0)
+++ trunk/Source/WebKit2/webkit2gtk-web-extension.pc.in 2014-03-03 08:07:49 UTC (rev 164973)
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: WebKit2WebExtension
+Description: WebKit web process extensions
+Version: @VERSION@
+Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4 _javascript_coregtk-@WEBKITGTK_API_VERSION@
+Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@
+Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@
Modified: trunk/Source/cmake/OptionsGTK.cmake (164972 => 164973)
--- trunk/Source/cmake/OptionsGTK.cmake 2014-03-03 07:10:57 UTC (rev 164972)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-03-03 08:07:49 UTC (rev 164973)
@@ -270,6 +270,7 @@
set(WebKit_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit/gtk/webkitgtk-${WEBKITGTK_API_VERSION}.pc)
set(WebKit2_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc)
+set(WebKit2WebExtension_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc)
set(SHOULD_INSTALL_JS_SHELL ON)
Modified: trunk/configure.ac (164972 => 164973)
--- trunk/configure.ac 2014-03-03 07:10:57 UTC (rev 164972)
+++ trunk/configure.ac 2014-03-03 08:07:49 UTC (rev 164973)
@@ -54,7 +54,9 @@
if test "$enable_webkit2" = "yes"; then
AC_CONFIG_FILES([
DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h:Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in
- Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/webkit2gtk.pc.in])
+ Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/webkit2gtk.pc.in
+ Source/WebKit2/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/webkit2gtk-web-extension.pc.in
+ ])
fi
m4_include([Source/autotools/PrintBuildConfiguration.m4])
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
