<!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>[209482] trunk/Tools</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/209482">209482</a></dd>
<dt>Author</dt> <dd>changseok@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-07 14:36:46 -0800 (Wed, 07 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Cannot build GTK+ with CUPS 2.* versions
https://bugs.webkit.org/show_bug.cgi?id=163591
Reviewed by Michael Catanzaro.
GTK+ build has failed on the system which CUPS 2.x is installed in. GTK+ 3.16.4
does not assume to use the recent CUPS thus it fails to detect the CUPS in configuration.
GTK+ upstream fixed this issue but it is not easy to apply the original patch to our
old gtk+ since it requires not only bumping up glib accordingly and its consequence
causes many printing test failures. So, I propose to fix the configuration issue by
applying the change to the configure file directly. By doing this, we don't need to
upgrade glib and worry about any test failures as a consequence of the upgraded glib.
* gtk/jhbuild.modules:
* gtk/patches/gtk+-configure-fix-detecting-CUPS-2.x.patch: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsgtkjhbuildmodules">trunk/Tools/gtk/jhbuild.modules</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsgtkpatchesgtkconfigurefixdetectingCUPS2xpatch">trunk/Tools/gtk/patches/gtk+-configure-fix-detecting-CUPS-2.x.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (209481 => 209482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-12-07 22:30:58 UTC (rev 209481)
+++ trunk/Tools/ChangeLog 2016-12-07 22:36:46 UTC (rev 209482)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-12-07 ChangSeok Oh <changseok@webkit.org>
+
+ [GTK] Cannot build GTK+ with CUPS 2.* versions
+ https://bugs.webkit.org/show_bug.cgi?id=163591
+
+ Reviewed by Michael Catanzaro.
+
+ GTK+ build has failed on the system which CUPS 2.x is installed in. GTK+ 3.16.4
+ does not assume to use the recent CUPS thus it fails to detect the CUPS in configuration.
+ GTK+ upstream fixed this issue but it is not easy to apply the original patch to our
+ old gtk+ since it requires not only bumping up glib accordingly and its consequence
+ causes many printing test failures. So, I propose to fix the configuration issue by
+ applying the change to the configure file directly. By doing this, we don't need to
+ upgrade glib and worry about any test failures as a consequence of the upgraded glib.
+
+ * gtk/jhbuild.modules:
+ * gtk/patches/gtk+-configure-fix-detecting-CUPS-2.x.patch: Added.
+
</ins><span class="cx"> 2016-12-07 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix use of enum in a WK2 C SPI header.
</span></span></pre></div>
<a id="trunkToolsgtkjhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/jhbuild.modules (209481 => 209482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/jhbuild.modules 2016-12-07 22:30:58 UTC (rev 209481)
+++ trunk/Tools/gtk/jhbuild.modules 2016-12-07 22:36:46 UTC (rev 209482)
</span><span class="lines">@@ -196,7 +196,9 @@
</span><span class="cx"> </dependencies>
</span><span class="cx"> <branch module="/pub/GNOME/sources/gtk+/3.16/gtk+-3.16.4.tar.xz" version="3.16.4"
</span><span class="cx"> repo="ftp.gnome.org"
</span><del>- hash="sha256:1ee5dbd7a4cb81a91eaa1b7ae64ba5a3eab6a3c0a764155583ab96524590fc8e"/>
</del><ins>+ hash="sha256:1ee5dbd7a4cb81a91eaa1b7ae64ba5a3eab6a3c0a764155583ab96524590fc8e">
+ <patch file="gtk+-configure-fix-detecting-CUPS-2.x.patch" strip="1"/>
+ </branch>
</ins><span class="cx"> </autotools>
</span><span class="cx">
</span><span class="cx"> <autotools id="glib"
</span></span></pre></div>
<a id="trunkToolsgtkpatchesgtkconfigurefixdetectingCUPS2xpatch"></a>
<div class="addfile"><h4>Added: trunk/Tools/gtk/patches/gtk+-configure-fix-detecting-CUPS-2.x.patch (0 => 209482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/patches/gtk+-configure-fix-detecting-CUPS-2.x.patch (rev 0)
+++ trunk/Tools/gtk/patches/gtk+-configure-fix-detecting-CUPS-2.x.patch 2016-12-07 22:36:46 UTC (rev 209482)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- a/configure 2016-12-06 14:33:55.708778846 -0500
++++ b/configure 2016-12-06 14:35:09.695069930 -0500
+@@ -25092,7 +25092,7 @@
+ CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
+ CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
+
+- if test $CUPS_API_MAJOR -gt 1 -o \
++ if test $CUPS_API_MAJOR -lt 1 -o \
+ $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 2; then
+ as_fn_error $? "CUPS >= 1.2 not found" "$LINENO" 5
+ fi
</ins></span></pre>
</div>
</div>
</body>
</html>