<!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>[207664] 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/207664">207664</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-21 01:17:33 -0700 (Fri, 21 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/207609">r207609</a>.
https://bugs.webkit.org/show_bug.cgi?id=163776
As glib bump was rollout, we need to rollout this too
(Requested by rego on #webkit).
Reverted changeset:
"[GTK] Cannot build GTK+ with CUPS 2.* versions"
https://bugs.webkit.org/show_bug.cgi?id=163591
http://trac.webkit.org/changeset/207609</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>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsgtkpatchesconfigurefixdetectingCUPS2xpatch">trunk/Tools/gtk/patches/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 (207663 => 207664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-21 08:11:14 UTC (rev 207663)
+++ trunk/Tools/ChangeLog 2016-10-21 08:17:33 UTC (rev 207664)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-21 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r207609.
+ https://bugs.webkit.org/show_bug.cgi?id=163776
+
+ As glib bump was rollout, we need to rollout this too
+ (Requested by rego on #webkit).
+
+ Reverted changeset:
+
+ "[GTK] Cannot build GTK+ with CUPS 2.* versions"
+ https://bugs.webkit.org/show_bug.cgi?id=163591
+ http://trac.webkit.org/changeset/207609
+
</ins><span class="cx"> 2016-10-20 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> "Download Linked File" context menu action should use 'download' attribute as suggested filename
</span></span></pre></div>
<a id="trunkToolsgtkjhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/jhbuild.modules (207663 => 207664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/jhbuild.modules 2016-10-21 08:11:14 UTC (rev 207663)
+++ trunk/Tools/gtk/jhbuild.modules 2016-10-21 08:17:33 UTC (rev 207664)
</span><span class="lines">@@ -175,7 +175,8 @@
</span><span class="cx"> </branch>
</span><span class="cx"> </autotools>
</span><span class="cx">
</span><del>- <autotools id="gtk+" autogenargs="--disable-introspection">
</del><ins>+ <autotools id="gtk+" autogen-sh="configure"
+ autogenargs="--disable-introspection">
</ins><span class="cx"> <if condition-set="macos">
</span><span class="cx"> <autogenargs value="--enable-x11-backend=no --enable-quartz-backend" />
</span><span class="cx"> <makeargs value="-j1" />
</span><span class="lines">@@ -193,9 +194,7 @@
</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">
- <patch file="configure-fix-detecting-CUPS-2.x.patch" strip="1"/>
- </branch>
</del><ins>+ hash="sha256:1ee5dbd7a4cb81a91eaa1b7ae64ba5a3eab6a3c0a764155583ab96524590fc8e"/>
</ins><span class="cx"> </autotools>
</span><span class="cx">
</span><span class="cx"> <autotools id="glib"
</span></span></pre></div>
<a id="trunkToolsgtkpatchesconfigurefixdetectingCUPS2xpatch"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/gtk/patches/configure-fix-detecting-CUPS-2.x.patch (207663 => 207664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/patches/configure-fix-detecting-CUPS-2.x.patch 2016-10-21 08:11:14 UTC (rev 207663)
+++ trunk/Tools/gtk/patches/configure-fix-detecting-CUPS-2.x.patch 2016-10-21 08:17:33 UTC (rev 207664)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-From 631f6b536485829a0bd00532f5826ad302b4951b Mon Sep 17 00:00:00 2001
-From: Misty De Meo <mistydemeo@github.com>
-Date: Thu, 16 Jun 2016 15:59:27 -0700
-Subject: [PATCH] configure: fix detecting CUPS 2.x
-
-https://bugzilla.gnome.org/show_bug.cgi?id=767766
----
- configure.ac | 2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index a0b9c34..b2a6315 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1438,7 +1438,7 @@ else
- 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
- AC_MSG_ERROR([CUPS >= 1.2 not found])
- fi
---
-2.9.3
-
</del></span></pre>
</div>
</div>
</body>
</html>