[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. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@164973 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKitNix · Mar 3, 2014 · 8cb949d · 8cb949d
1 parent 144735f
commit 8cb949d
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,15 @@
+2014-03-03  Carlos Garcia Campos  <[email protected]>
+
+        [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  <[email protected]>
 
         Support ENABLE_ENCRYPTED_MEDIA in cmake builds

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2014-03-03  Carlos Garcia Campos  <[email protected]>
+
+        [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  <[email protected]>
 
         Streamline use of TextIterator, cutting down includes and use of soon-to-be-deleted functions

diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am
@@ -285,7 +285,9 @@ webkit2gtk_h_api += \
 	$(webkit2gtk_web_extension_h_api)
 
 if ENABLE_WEBKIT2
-pkgconfig_DATA += Source/WebKit2/webkit2gtk-@[email protected]
+pkgconfig_DATA += \
+	Source/WebKit2/webkit2gtk-@[email protected] \
+	Source/WebKit2/webkit2gtk-web-extension-@[email protected]
 
 if ENABLE_INTROSPECTION
 
@@ -358,7 +360,7 @@ WebKit2WebExtension-@[email protected]: $(G_IR_SCANNER) WebKit2-@WEBKIT
 	     --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) \

diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake
@@ -5,6 +5,7 @@ file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR})
 
 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 @@ add_custom_command(
         --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 @@ install(TARGETS webkit2gtkinjectedbundle
         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}

diff --git a/Source/WebKit2/webkit2gtk-web-extension.pc.in b/Source/WebKit2/webkit2gtk-web-extension.pc.in
@@ -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 javascriptcoregtk-@WEBKITGTK_API_VERSION@
+Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@
+Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
@@ -270,6 +270,7 @@ set(FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/webkit
 
 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)
 

diff --git a/configure.ac b/configure.ac
@@ -54,7 +54,9 @@ fi
 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])