<!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>[166776] 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/166776">166776</a></dd>
<dt>Author</dt> <dd>agomez@igalia.com</dd>
<dt>Date</dt> <dd>2014-04-04 01:11:34 -0700 (Fri, 04 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Win] Update obsolete packages in cygwin
https://bugs.webkit.org/show_bug.cgi?id=126264

Reviewed by Brent Fulgham.

Removed &quot;apache&quot; and &quot;minires&quot; as the first has been replaced by
&quot;lighttpd&quot; and the second is now integrated into
&quot;cygwin&quot;. Replaced the transitional and now obsolete &quot;gcc&quot; package
with &quot;gcc-g++&quot; and ensure that &quot;python&quot; stays at version &quot;2.6.8&quot;
since the newer version available is &quot;2.7.3&quot; which breaks the
build due to some funniness with environment variable handling.

* CygwinDownloader/cygwin-downloader.py:
* CygwinDownloader/cygwin-downloader.zip:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsCygwinDownloadercygwindownloaderpy">trunk/Tools/CygwinDownloader/cygwin-downloader.py</a></li>
<li><a href="#trunkToolsCygwinDownloadercygwindownloaderzip">trunk/Tools/CygwinDownloader/cygwin-downloader.zip</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (166775 => 166776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2014-04-04 07:54:40 UTC (rev 166775)
+++ trunk/Tools/ChangeLog        2014-04-04 08:11:34 UTC (rev 166776)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-04-04  Andres Gomez  &lt;agomez@igalia.com&gt;
+
+        [Win] Update obsolete packages in cygwin
+        https://bugs.webkit.org/show_bug.cgi?id=126264
+
+        Reviewed by Brent Fulgham.
+
+        Removed &quot;apache&quot; and &quot;minires&quot; as the first has been replaced by
+        &quot;lighttpd&quot; and the second is now integrated into
+        &quot;cygwin&quot;. Replaced the transitional and now obsolete &quot;gcc&quot; package
+        with &quot;gcc-g++&quot; and ensure that &quot;python&quot; stays at version &quot;2.6.8&quot;
+        since the newer version available is &quot;2.7.3&quot; which breaks the
+        build due to some funniness with environment variable handling.
+
+        * CygwinDownloader/cygwin-downloader.py:
+        * CygwinDownloader/cygwin-downloader.zip:
+
</ins><span class="cx"> 2014-04-03  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         check-webkit-style: Improve warnings on Objective-C @property syntax
</span></span></pre></div>
<a id="trunkToolsCygwinDownloadercygwindownloaderpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/CygwinDownloader/cygwin-downloader.py (166775 => 166776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/CygwinDownloader/cygwin-downloader.py        2014-04-04 07:54:40 UTC (rev 166775)
+++ trunk/Tools/CygwinDownloader/cygwin-downloader.py        2014-04-04 08:11:34 UTC (rev 166776)
</span><span class="lines">@@ -44,20 +44,18 @@
</span><span class="cx"> def download_package(package, message):
</span><span class="cx">         download_url_to_file(package_mirror_url + package[&quot;path&quot;], package[&quot;path&quot;], message)
</span><span class="cx"> 
</span><del>-required_packages = frozenset([&quot;apache&quot;,
-                               &quot;bc&quot;,
</del><ins>+required_packages = frozenset([&quot;bc&quot;,
</ins><span class="cx">                                &quot;bison&quot;,
</span><span class="cx">                                &quot;curl&quot;,
</span><span class="cx">                                &quot;diffutils&quot;,
</span><span class="cx">                                &quot;e2fsprogs&quot;,
</span><span class="cx">                                &quot;emacs&quot;,
</span><span class="cx">                                &quot;flex&quot;,
</span><del>-                               &quot;gcc&quot;,
</del><ins>+                               &quot;gcc-g++&quot;,
</ins><span class="cx">                                &quot;gperf&quot;,
</span><span class="cx">                                &quot;keychain&quot;,
</span><span class="cx">                                &quot;lighttpd&quot;,
</span><span class="cx">                                &quot;make&quot;,
</span><del>-                               &quot;minires&quot;,
</del><span class="cx">                                &quot;nano&quot;,
</span><span class="cx">                                &quot;openssh&quot;,
</span><span class="cx">                                &quot;patch&quot;,
</span><span class="lines">@@ -72,6 +70,8 @@
</span><span class="cx">                                &quot;vim&quot;,
</span><span class="cx">                                &quot;zip&quot;])
</span><span class="cx"> 
</span><ins>+required_packages_versions = {&quot;python&quot;: &quot;2.6.8-2&quot;}
+
</ins><span class="cx"> #
</span><span class="cx"> # Main
</span><span class="cx"> #
</span><span class="lines">@@ -90,7 +90,9 @@
</span><span class="cx"> for line in downloaded_packages_file.readlines():
</span><span class="cx">         if line[0] == &quot;@&quot;:
</span><span class="cx">                 current_package = line[2:-1]
</span><del>-                packages[current_package] = {&quot;name&quot;: current_package, &quot;needs_download&quot;: False, &quot;requires&quot;: [], &quot;path&quot;: &quot;&quot;}
</del><ins>+                packages[current_package] = {&quot;name&quot;: current_package, &quot;needs_download&quot;: False, &quot;requires&quot;: [], &quot;path&quot;: &quot;&quot;, &quot;version&quot;: &quot;&quot;, &quot;found_version&quot;: False}
+                if current_package in required_packages_versions:
+                        packages[current_package][&quot;version&quot;] = required_packages_versions[current_package]
</ins><span class="cx">         elif line[:10] == &quot;category: &quot;:
</span><span class="cx">                 if current_package in required_packages:
</span><span class="cx">                         line = &quot;category: Base\n&quot;
</span><span class="lines">@@ -99,7 +101,13 @@
</span><span class="cx">         elif line[:10] == &quot;requires: &quot;:
</span><span class="cx">                 packages[current_package][&quot;requires&quot;] = line[10:].split()
</span><span class="cx">                 packages[current_package][&quot;requires&quot;].sort()
</span><del>-        elif line[:9] == &quot;install: &quot; and not len(packages[current_package][&quot;path&quot;]):
</del><ins>+        elif line[:9] == &quot;version: &quot; and not packages[current_package][&quot;found_version&quot;]:
+                if not len(packages[current_package][&quot;version&quot;]):
+                        packages[current_package][&quot;version&quot;] = line[9:-1]
+                        packages[current_package][&quot;found_version&quot;] = True
+                else:
+                        packages[current_package][&quot;found_version&quot;] = (packages[current_package][&quot;version&quot;] == line[9:-1])
+        elif line[:9] == &quot;install: &quot; and packages[current_package][&quot;found_version&quot;] and not len(packages[current_package][&quot;path&quot;]):
</ins><span class="cx">                 end_of_path = line.find(&quot; &quot;, 9)
</span><span class="cx">                 if end_of_path != -1:
</span><span class="cx">                         packages[current_package][&quot;path&quot;] = line[9:end_of_path]
</span></span></pre></div>
<a id="trunkToolsCygwinDownloadercygwindownloaderzip"></a>
<div class="binary"><h4>Modified: trunk/Tools/CygwinDownloader/cygwin-downloader.zip</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
</div>

</body>
</html>