Title: [106267] releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk
- Revision
- 106267
- Author
- mrobin...@webkit.org
- Date
- 2012-01-30 11:32:06 -0800 (Mon, 30 Jan 2012)
Log Message
Mergigg r97979
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/ChangeLog (106266 => 106267)
--- releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/ChangeLog 2012-01-30 19:28:57 UTC (rev 106266)
+++ releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/ChangeLog 2012-01-30 19:32:06 UTC (rev 106267)
@@ -1,5 +1,14 @@
2012-01-30 Gustavo Noronha Silva <g...@gnome.org>
+ [GTK] webkitgtk's pkgconfig file needs to require _javascript_coregtk
+ https://bugs.webkit.org/show_bug.cgi?id=70500
+
+ Reviewed by Philippe Normand.
+
+ * webkit.pc.in: add _javascript_coregtk to Requires
+
+2012-01-30 Gustavo Noronha Silva <g...@gnome.org>
+
GTK+ build fix. Rename the INCLUDES variable so it is not picked
up by random bystanders. Also do some more cleanup on stuff we
inherited from gtk-doc.make.
Modified: releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/webkit.pc.in (106266 => 106267)
--- releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/webkit.pc.in 2012-01-30 19:28:57 UTC (rev 106266)
+++ releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/webkit.pc.in 2012-01-30 19:32:06 UTC (rev 106267)
@@ -6,6 +6,6 @@
Name: WebKit
Description: Web content engine for GTK+
Version: @VERSION@
-Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4
+Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4 _javascript_coregtk-@WEBKITGTK_API_VERSION@
Libs: -L${libdir} -lwebkitgtk-@WEBKITGTK_API_VERSION@
Cflags: -I${includedir}/webkit-@WEBKITGTK_API_VERSION@
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
