<!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>[205594] trunk/Source/WebKit2</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/205594">205594</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2016-09-08 00:36:27 -0700 (Thu, 08 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move webkit2gtk.pc.in, webkit2gtk-web-extension.pc.in files under Source/WebKit2/gtk/
https://bugs.webkit.org/show_bug.cgi?id=161703
Reviewed by Carlos Garcia Campos.
Move the pkg-config input files that are specific to the GTK+ port
under the Source/WebKit2/gtk/ directory. Build rules are updated
accordingly.
* PlatformGTK.cmake:
* gtk/webkit2gtk-web-extension.pc.in: Renamed from Source/WebKit2/webkit2gtk-web-extension.pc.in.
* gtk/webkit2gtk.pc.in: Renamed from Source/WebKit2/webkit2gtk.pc.in.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2gtkwebkit2gtkwebextensionpcin">trunk/Source/WebKit2/gtk/webkit2gtk-web-extension.pc.in</a></li>
<li><a href="#trunkSourceWebKit2gtkwebkit2gtkpcin">trunk/Source/WebKit2/gtk/webkit2gtk.pc.in</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2webkit2gtkwebextensionpcin">trunk/Source/WebKit2/webkit2gtk-web-extension.pc.in</a></li>
<li><a href="#trunkSourceWebKit2webkit2gtkpcin">trunk/Source/WebKit2/webkit2gtk.pc.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (205593 => 205594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-08 07:24:44 UTC (rev 205593)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-08 07:36:27 UTC (rev 205594)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-09-08 Zan Dobersek <zdobersek@igalia.com>
+
+ Move webkit2gtk.pc.in, webkit2gtk-web-extension.pc.in files under Source/WebKit2/gtk/
+ https://bugs.webkit.org/show_bug.cgi?id=161703
+
+ Reviewed by Carlos Garcia Campos.
+
+ Move the pkg-config input files that are specific to the GTK+ port
+ under the Source/WebKit2/gtk/ directory. Build rules are updated
+ accordingly.
+
+ * PlatformGTK.cmake:
+ * gtk/webkit2gtk-web-extension.pc.in: Renamed from Source/WebKit2/webkit2gtk-web-extension.pc.in.
+ * gtk/webkit2gtk.pc.in: Renamed from Source/WebKit2/webkit2gtk.pc.in.
+
</ins><span class="cx"> 2016-09-07 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Address some clang static analyzer warnings in WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (205593 => 205594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2016-09-08 07:24:44 UTC (rev 205593)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2016-09-08 07:36:27 UTC (rev 205594)
</span><span class="lines">@@ -10,8 +10,8 @@
</span><span class="cx"> file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR})
</span><span class="cx">
</span><span class="cx"> configure_file(UIProcess/API/gtk/WebKitVersion.h.in ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitVersion.h)
</span><del>-configure_file(webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE} @ONLY)
-configure_file(webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
</del><ins>+configure_file(gtk/webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE} @ONLY)
+configure_file(gtk/webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
</ins><span class="cx">
</span><span class="cx"> add_definitions(-DBUILDING_WEBKIT)
</span><span class="cx"> add_definitions(-DWEBKIT2_COMPILATION)
</span></span></pre></div>
<a id="trunkSourceWebKit2gtkwebkit2gtkwebextensionpcin"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/gtk/webkit2gtk-web-extension.pc.in (0 => 205594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/gtk/webkit2gtk-web-extension.pc.in (rev 0)
+++ trunk/Source/WebKit2/gtk/webkit2gtk-web-extension.pc.in 2016-09-08 07:36:27 UTC (rev 205594)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=@LIB_INSTALL_DIR@
+includedir=${prefix}/include
+
+Name: WebKit2WebExtension
+Description: WebKit web process extensions
+Version: @PROJECT_VERSION@
+Requires: glib-2.0 gtk+-3.0 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="trunkSourceWebKit2gtkwebkit2gtkpcin"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/gtk/webkit2gtk.pc.in (0 => 205594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/gtk/webkit2gtk.pc.in (rev 0)
+++ trunk/Source/WebKit2/gtk/webkit2gtk.pc.in 2016-09-08 07:36:27 UTC (rev 205594)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=@LIB_INSTALL_DIR@
+includedir=${prefix}/include
+
+Name: WebKit2
+Description: Web content engine for GTK+
+Version: @PROJECT_VERSION@
+Requires: glib-2.0 gtk+-3.0 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="trunkSourceWebKit2webkit2gtkwebextensionpcin"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/webkit2gtk-web-extension.pc.in (205593 => 205594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/webkit2gtk-web-extension.pc.in 2016-09-08 07:24:44 UTC (rev 205593)
+++ trunk/Source/WebKit2/webkit2gtk-web-extension.pc.in 2016-09-08 07:36:27 UTC (rev 205594)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=@LIB_INSTALL_DIR@
-includedir=${prefix}/include
-
-Name: WebKit2WebExtension
-Description: WebKit web process extensions
-Version: @PROJECT_VERSION@
-Requires: glib-2.0 gtk+-3.0 libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@
-Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@
-Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@
</del></span></pre></div>
<a id="trunkSourceWebKit2webkit2gtkpcin"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/webkit2gtk.pc.in (205593 => 205594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/webkit2gtk.pc.in 2016-09-08 07:24:44 UTC (rev 205593)
+++ trunk/Source/WebKit2/webkit2gtk.pc.in 2016-09-08 07:36:27 UTC (rev 205594)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=@LIB_INSTALL_DIR@
-includedir=${prefix}/include
-
-Name: WebKit2
-Description: Web content engine for GTK+
-Version: @PROJECT_VERSION@
-Requires: glib-2.0 gtk+-3.0 libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@
-Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@
-Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@
</del></span></pre>
</div>
</div>
</body>
</html>