<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164973] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164973">164973</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-03 00:07:49 -0800 (Mon, 03 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2GNUmakefileam">trunk/Source/WebKit2/GNUmakefile.am</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkconfigureac">trunk/configure.ac</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2webkit2gtkwebextensionpcin">trunk/Source/WebKit2/webkit2gtk-web-extension.pc.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (164972 => 164973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-03-03 07:10:57 UTC (rev 164972)
+++ trunk/ChangeLog 2014-03-03 08:07:49 UTC (rev 164973)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-03-03 Carlos Garcia Campos <cgarcia@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:
+
</ins><span class="cx"> 2014-03-02 Dirkjan Ochtman <d.ochtman@activevideo.com>
</span><span class="cx">
</span><span class="cx"> Support ENABLE_ENCRYPTED_MEDIA in cmake builds
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164972 => 164973)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-03-03 Carlos Garcia Campos <cgarcia@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.
+
</ins><span class="cx"> 2014-03-02 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Streamline use of TextIterator, cutting down includes and use of soon-to-be-deleted functions
</span></span></pre></div>
<a id="trunkSourceWebKit2GNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/GNUmakefile.am (164972 => 164973)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -285,7 +285,9 @@
</span><span class="cx"> $(webkit2gtk_web_extension_h_api)
</span><span class="cx">
</span><span class="cx"> if ENABLE_WEBKIT2
</span><del>-pkgconfig_DATA += Source/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc
</del><ins>+pkgconfig_DATA += \
+ Source/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc \
+ Source/WebKit2/webkit2gtk-web-extension-@WEBKITGTK_API_VERSION@.pc
</ins><span class="cx">
</span><span class="cx"> if ENABLE_INTROSPECTION
</span><span class="cx">
</span><span class="lines">@@ -358,7 +360,7 @@
</span><span class="cx"> --pkg=gobject-2.0 \
</span><span class="cx"> --pkg=gtk+-@GTK_API_VERSION@ \
</span><span class="cx"> --pkg=libsoup-2.4 \
</span><del>- --pkg-export=webkit2gtk-@WEBKITGTK_API_VERSION@ \
</del><ins>+ --pkg-export=webkit2gtk-web-extension-@WEBKITGTK_API_VERSION@ \
</ins><span class="cx"> --output=$@ \
</span><span class="cx"> --add-include-path=$(WebKit2) \
</span><span class="cx"> --add-include-path=$(top_builddir) \
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (164972 => 164973)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx">
</span><span class="cx"> configure_file(UIProcess/API/gtk/WebKitVersion.h.in ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitVersion.h)
</span><span class="cx"> configure_file(webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE} @ONLY)
</span><ins>+configure_file(webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
</ins><span class="cx">
</span><span class="cx"> add_definitions(-DWEBKIT2_COMPILATION)
</span><span class="cx"> add_definitions(-DLIBEXECDIR="${CMAKE_INSTALL_FULL_LIBEXECDIR}")
</span><span class="lines">@@ -741,7 +742,7 @@
</span><span class="cx"> --pkg=gobject-2.0
</span><span class="cx"> --pkg=gtk+-${WEBKITGTK_API_VERSION}
</span><span class="cx"> --pkg=libsoup-2.4
</span><del>- --pkg-export=webkit2gtk-${WEBKITGTK_API_VERSION}
</del><ins>+ --pkg-export=webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}
</ins><span class="cx"> --output=${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
</span><span class="cx"> --c-include="webkit2/webkit-web-extension.h"
</span><span class="cx"> -DBUILDING_WEBKIT
</span><span class="lines">@@ -779,6 +780,7 @@
</span><span class="cx"> DESTINATION "${LIB_INSTALL_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}/injected-bundle"
</span><span class="cx"> )
</span><span class="cx"> install(FILES "${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc"
</span><ins>+ "${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc"
</ins><span class="cx"> DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
</span><span class="cx"> )
</span><span class="cx"> install(FILES ${WebKit2GTK_INSTALLED_HEADERS}
</span></span></pre></div>
<a id="trunkSourceWebKit2webkit2gtkwebextensionpcin"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/webkit2gtk-web-extension.pc.in (0 => 164973)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+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@
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (164972 => 164973)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -270,6 +270,7 @@
</span><span class="cx">
</span><span class="cx"> set(WebKit_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit/gtk/webkitgtk-${WEBKITGTK_API_VERSION}.pc)
</span><span class="cx"> set(WebKit2_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc)
</span><ins>+set(WebKit2WebExtension_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc)
</ins><span class="cx">
</span><span class="cx"> set(SHOULD_INSTALL_JS_SHELL ON)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkconfigureac"></a>
<div class="modfile"><h4>Modified: trunk/configure.ac (164972 => 164973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/configure.ac 2014-03-03 07:10:57 UTC (rev 164972)
+++ trunk/configure.ac 2014-03-03 08:07:49 UTC (rev 164973)
</span><span class="lines">@@ -54,7 +54,9 @@
</span><span class="cx"> if test "$enable_webkit2" = "yes"; then
</span><span class="cx"> AC_CONFIG_FILES([
</span><span class="cx"> DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h:Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in
</span><del>- Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/webkit2gtk.pc.in])
</del><ins>+ 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
+ ])
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> m4_include([Source/autotools/PrintBuildConfiguration.m4])
</span></span></pre>
</div>
</div>
</body>
</html>