<!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>[165737] 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/165737">165737</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-17 09:40:27 -0700 (Mon, 17 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK][CMake] Ensure that HAVE_GTK_UNIX_PRINTING is defined when appropriate
https://bugs.webkit.org/show_bug.cgi?id=130155
Reviewed by Philippe Normand.
.:
* Source/cmake/FindGTKUnixPrint.cmake: Added.
* Source/cmake/OptionsGTK.cmake: Look for gtk+-unix-print and use it to turn on HAVE_GTK_UNIX_PRINTING.
* Source/cmakeconfig.h.cmake: Add the HAVE_GTK_UNIX_PRINTING define.
Source/WebKit2:
* PlatformGTK.cmake: Add GTK_UNIX_PRINT flags to the build.
Tools:
* TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt: Add GTK_UNIX_PRINT flags to the build.</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="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeconfighcmake">trunk/Source/cmakeconfig.h.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkCMakeListstxt">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourcecmakeFindGTKUnixPrintcmake">trunk/Source/cmake/FindGTKUnixPrint.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (165736 => 165737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-03-17 16:26:53 UTC (rev 165736)
+++ trunk/ChangeLog 2014-03-17 16:40:27 UTC (rev 165737)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-03-17 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK][CMake] Ensure that HAVE_GTK_UNIX_PRINTING is defined when appropriate
+ https://bugs.webkit.org/show_bug.cgi?id=130155
+
+ Reviewed by Philippe Normand.
+
+ * Source/cmake/FindGTKUnixPrint.cmake: Added.
+ * Source/cmake/OptionsGTK.cmake: Look for gtk+-unix-print and use it to turn on HAVE_GTK_UNIX_PRINTING.
+ * Source/cmakeconfig.h.cmake: Add the HAVE_GTK_UNIX_PRINTING define.
+
</ins><span class="cx"> 2014-03-16 Kim Byung Jun <bj1987.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Enable TOUCH_SLIDER macro.
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165736 => 165737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-17 16:26:53 UTC (rev 165736)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-17 16:40:27 UTC (rev 165737)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-03-17 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK][CMake] Ensure that HAVE_GTK_UNIX_PRINTING is defined when appropriate
+ https://bugs.webkit.org/show_bug.cgi?id=130155
+
+ Reviewed by Philippe Normand.
+
+ * PlatformGTK.cmake: Add GTK_UNIX_PRINT flags to the build.
+
</ins><span class="cx"> 2014-03-17 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL][WK2] Restore cursor when moving mouse into webview
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (165736 => 165737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-03-17 16:26:53 UTC (rev 165736)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-03-17 16:40:27 UTC (rev 165737)
</span><span class="lines">@@ -439,6 +439,7 @@
</span><span class="cx"> list(APPEND WebKit2_INCLUDE_DIRECTORIES
</span><span class="cx"> ${GLIB_INCLUDE_DIRS}
</span><span class="cx"> ${GTK_INCLUDE_DIRS}
</span><ins>+ ${GTK_UNIX_PRINT_INCLUDE_DIRS}
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebProcess_SOURCES
</span><span class="lines">@@ -453,11 +454,10 @@
</span><span class="cx"> ${WebKit2_LIBRARIES}
</span><span class="cx"> )
</span><span class="cx">
</span><del>-# Since the GObjectDOMBindings convenience library exports API that is unused except
-# in embedding applications we need to instruct the linker to link all symbols explicitly.
</del><span class="cx"> list(APPEND WebKit2_LIBRARIES
</span><span class="cx"> GObjectDOMBindings
</span><span class="cx"> WebCorePlatformGTK
</span><ins>+ ${GTK_UNIX_PRINT_LIBRARIES}
</ins><span class="cx"> )
</span><span class="cx"> ADD_WHOLE_ARCHIVE_TO_LIBRARIES(WebKit2_LIBRARIES)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeFindGTKUnixPrintcmake"></a>
<div class="addfile"><h4>Added: trunk/Source/cmake/FindGTKUnixPrint.cmake (0 => 165737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindGTKUnixPrint.cmake (rev 0)
+++ trunk/Source/cmake/FindGTKUnixPrint.cmake 2014-03-17 16:40:27 UTC (rev 165737)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+# - Try to find gtk-unix-print
+# Once done, this will define
+#
+# GTK_UNIX_PRINT_FOUND - system has gtk-unix-print
+# GTK_UNIX_PRINT_INCLUDE_DIRS - the gtk-unix-print include directories
+# GTK_UNIX_PRINT_LIBRARIES - link these to use gtk-unix-print
+#
+# Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
+# Copyright (C) 2014 Igalia S.L.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+find_package(PkgConfig)
+pkg_check_modules(GTK_UNIX_PRINT gtk+-unix-print-3.0)
+
+set(VERSION_OK TRUE)
+if (GTK_UNIX_PRINT_VERSION)
+ if (GTK_UNIX_PRINT_FIND_VERSION_EXACT)
+ if (NOT("${GTK_UNIX_PRINT_FIND_VERSION}" VERSION_EQUAL "${GTK_UNIX_PRINT_VERSION}"))
+ set(VERSION_OK FALSE)
+ endif ()
+ else ()
+ if ("${GTK_UNIX_PRINT_VERSION}" VERSION_LESS "${GTK_UNIX_PRINT_FIND_VERSION}")
+ set(VERSION_OK FALSE)
+ endif ()
+ endif ()
+endif ()
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK_UNIX_PRINT DEFAULT_MSG GTK_UNIX_PRINT_INCLUDE_DIRS GTK_UNIX_PRINT_LIBRARIES VERSION_OK)
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (165736 => 165737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-03-17 16:26:53 UTC (rev 165736)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-03-17 16:40:27 UTC (rev 165737)
</span><span class="lines">@@ -214,6 +214,11 @@
</span><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+find_package(GTKUnixPrint)
+if (GTK_UNIX_PRINTING_FOUND)
+ set(HAVE_GTK_UNIX_PRINTING)
+endif ()
+
</ins><span class="cx"> # We don't use find_package for GLX because it is part of -lGL, unlike EGL.
</span><span class="cx"> find_package(OpenGL)
</span><span class="cx"> check_include_files("GL/glx.h" GLX_FOUND)
</span></span></pre></div>
<a id="trunkSourcecmakeconfighcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmakeconfig.h.cmake (165736 => 165737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmakeconfig.h.cmake 2014-03-17 16:26:53 UTC (rev 165736)
+++ trunk/Source/cmakeconfig.h.cmake 2014-03-17 16:40:27 UTC (rev 165737)
</span><span class="lines">@@ -126,6 +126,7 @@
</span><span class="cx"> #cmakedefine01 WTF_USE_GEOCLUE2
</span><span class="cx"> #cmakedefine01 WTF_USE_TILED_BACKING_STORE
</span><span class="cx"> #cmakedefine01 HAVE_LLVM
</span><ins>+#cmakedefine01 HAVE_GTK_UNIX_PRINTING
</ins><span class="cx">
</span><span class="cx"> #if defined(BUILDING_GTK__) && !defined(GTK_API_VERSION_2)
</span><span class="cx"> #define GDK_VERSION_MIN_REQUIRED @GDK_VERSION_MIN_REQUIRED@
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (165736 => 165737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-03-17 16:26:53 UTC (rev 165736)
+++ trunk/Tools/ChangeLog 2014-03-17 16:40:27 UTC (rev 165737)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-03-17 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK][CMake] Ensure that HAVE_GTK_UNIX_PRINTING is defined when appropriate
+ https://bugs.webkit.org/show_bug.cgi?id=130155
+
+ Reviewed by Philippe Normand.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt: Add GTK_UNIX_PRINT flags to the build.
+
</ins><span class="cx"> 2014-03-17 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] MiniBrowser fails to load injected bundle lib
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt (165736 => 165737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt 2014-03-17 16:26:53 UTC (rev 165736)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt 2014-03-17 16:40:27 UTC (rev 165737)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> ${ATSPI_INCLUDE_DIRS}
</span><span class="cx"> ${GLIB_INCLUDE_DIRS}
</span><span class="cx"> ${GTK3_INCLUDE_DIRS}
</span><ins>+ ${GTK_UNIX_PRINT_INCLUDE_DIRS}
</ins><span class="cx"> ${LIBSOUP_INCLUDE_DIRS}
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -72,6 +73,7 @@
</span><span class="cx"> ${ATSPI_LIBRARIES}
</span><span class="cx"> ${GLIB_LIBRARIES}
</span><span class="cx"> ${GTK3_LIBRARIES}
</span><ins>+ ${GTK_UNIX_PRINT_LIBRARIES}
</ins><span class="cx"> ${LIBSOUP_LIBRARIES}
</span><span class="cx"> )
</span><span class="cx"> set_target_properties(${test_name} PROPERTIES
</span></span></pre>
</div>
</div>
</body>
</html>