Title: [164976] releases/WebKitGTK/webkit-2.4
- Revision
- 164976
- Author
- [email protected]
- Date
- 2014-03-03 00:24:55 -0800 (Mon, 03 Mar 2014)
Log Message
Merge r164973 - [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.
.:
* configure.ac:
Source/WebKit2:
* GNUmakefile.am:
* webkit2gtk-web-extension.pc.in: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/ChangeLog (164975 => 164976)
--- releases/WebKitGTK/webkit-2.4/ChangeLog 2014-03-03 08:22:40 UTC (rev 164975)
+++ releases/WebKitGTK/webkit-2.4/ChangeLog 2014-03-03 08:24:55 UTC (rev 164976)
@@ -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-02-27 Koop Mast <[email protected]>
Fallback on checking for libz manualy if zlib.pc isn't available.
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (164975 => 164976)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-03-03 08:22:40 UTC (rev 164975)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-03-03 08:24:55 UTC (rev 164976)
@@ -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 Carlos Garcia Campos <[email protected]>
[GTK] Make impossible to build with <webkit2/webkit2.h> and <webkit2/webkit-web-extension.h> included together
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/GNUmakefile.am (164975 => 164976)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/GNUmakefile.am 2014-03-03 08:22:40 UTC (rev 164975)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/GNUmakefile.am 2014-03-03 08:24:55 UTC (rev 164976)
@@ -287,7 +287,9 @@
$(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
@@ -360,7 +362,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) \
Added: releases/WebKitGTK/webkit-2.4/Source/WebKit2/webkit2gtk-web-extension.pc.in (0 => 164976)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/webkit2gtk-web-extension.pc.in (rev 0)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/webkit2gtk-web-extension.pc.in 2014-03-03 08:24:55 UTC (rev 164976)
@@ -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: releases/WebKitGTK/webkit-2.4/configure.ac (164975 => 164976)
--- releases/WebKitGTK/webkit-2.4/configure.ac 2014-03-03 08:22:40 UTC (rev 164975)
+++ releases/WebKitGTK/webkit-2.4/configure.ac 2014-03-03 08:24:55 UTC (rev 164976)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
