<!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>[174107] 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/174107">174107</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-30 08:19:16 -0700 (Tue, 30 Sep 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>[EFL] Bump EFL version to 1.11.2
https://bugs.webkit.org/show_bug.cgi?id=137118

Patch by Tibor Meszaros &lt;tmeszaros.u-szeged@partner.samsung.com&gt; on 2014-09-30
Reviewed by Gyuyoung Kim.

Disable NEON for EFL build because the build system doesn't pass the necessary -mfpu=neon flag to the compiler.
Tools/efl/patches/ecore.patch: Removed, because this fix is already in EFL.

* efl/jhbuild.modules:
* efl/patches/ecore.patch: Removed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsefljhbuildmodules">trunk/Tools/efl/jhbuild.modules</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolseflpatchesecorepatch">trunk/Tools/efl/patches/ecore.patch</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (174106 => 174107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2014-09-30 14:30:34 UTC (rev 174106)
+++ trunk/Tools/ChangeLog        2014-09-30 15:19:16 UTC (rev 174107)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-09-30  Tibor Meszaros  &lt;tmeszaros.u-szeged@partner.samsung.com&gt;
+
+        [EFL] Bump EFL version to 1.11.2
+        https://bugs.webkit.org/show_bug.cgi?id=137118
+
+        Reviewed by Gyuyoung Kim.
+
+        Disable NEON for EFL build because the build system doesn't pass the necessary -mfpu=neon flag to the compiler.
+        Tools/efl/patches/ecore.patch: Removed, because this fix is already in EFL.
+
+        * efl/jhbuild.modules:
+        * efl/patches/ecore.patch: Removed.
+
</ins><span class="cx"> 2014-09-30  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         REGRESSION(r173929): [GTK] TestInspector fails after r173929
</span></span></pre></div>
<a id="trunkToolsefljhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/efl/jhbuild.modules (174106 => 174107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/efl/jhbuild.modules        2014-09-30 14:30:34 UTC (rev 174106)
+++ trunk/Tools/efl/jhbuild.modules        2014-09-30 15:19:16 UTC (rev 174107)
</span><span class="lines">@@ -161,17 +161,16 @@
</span><span class="cx">  &lt;/autotools&gt;
</span><span class="cx"> 
</span><span class="cx">   &lt;autotools id=&quot;efl&quot; autogen-sh=&quot;configure&quot;
</span><del>-             autogenargs=&quot;--disable-fribidi --disable-audio --disable-libmount --disable-physics --enable-lua-old --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aaa&quot;&gt;
</del><ins>+             autogenargs=&quot;--disable-fribidi --disable-audio --disable-libmount --disable-physics --enable-lua-old --disable-neon --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba&quot;&gt;
</ins><span class="cx">     &lt;dependencies&gt;
</span><span class="cx">       &lt;dep package=&quot;fontconfig&quot;/&gt;
</span><span class="cx">       &lt;dep package=&quot;gstreamer&quot;/&gt;
</span><span class="cx">       &lt;dep package=&quot;gst-plugins-base&quot;/&gt;
</span><span class="cx">     &lt;/dependencies&gt;
</span><del>-    &lt;branch module=&quot;rel/libs/efl/efl-1.9.2.tar.bz2&quot; version=&quot;1.9.2&quot;
</del><ins>+    &lt;branch module=&quot;rel/libs/efl/efl-1.11.2.tar.gz&quot; version=&quot;1.11.2&quot;
</ins><span class="cx">             repo=&quot;download.enlightenment.org&quot;
</span><del>-            hash=&quot;sha256:5dbeb99e1d26ccc74c9d054de5607a7e1020052b313c4b60c9a9794b45307501&quot;
-            md5sum=&quot;51222f49d8faa7e72f097075fec223f5&quot;&gt;
-      &lt;patch file=&quot;ecore.patch&quot; strip=&quot;1&quot;/&gt;
</del><ins>+            hash=&quot;sha256:f3cc1cd2a77df114a7b76a7e77bc77e88c367ec49462047fca209ee622cb7288&quot;
+            md5sum=&quot;f1b23b9a4e2ae04a4c0f6d2f924093e9&quot;&gt;
</ins><span class="cx">       &lt;patch file=&quot;ecore_remove_warnings.patch&quot; strip=&quot;1&quot;/&gt;
</span><span class="cx">     &lt;/branch&gt;
</span><span class="cx">   &lt;/autotools&gt;
</span><span class="lines">@@ -190,10 +189,10 @@
</span><span class="cx">   &lt;autotools id=&quot;elementary&quot;
</span><span class="cx">              autogen-sh=&quot;configure&quot;
</span><span class="cx">              autogenargs=&quot;--disable-emap --disable-eweather --with-elementary-web-backend=none&quot;&gt;
</span><del>-    &lt;branch module=&quot;rel/libs/elementary/elementary-1.9.2.tar.bz2&quot; version=&quot;1.9.2&quot;
</del><ins>+    &lt;branch module=&quot;rel/libs/elementary/elementary-1.11.2.tar.gz&quot; version=&quot;1.11.2&quot;
</ins><span class="cx">             repo=&quot;download.enlightenment.org&quot;
</span><del>-            hash=&quot;e1a8a77e5ff7ac934b5622131301787bc6cfc068b7117ffdbd5e1d855448f3cf&quot;
-            md5sum=&quot;0709699bd3b92660b946137f45c57add&quot;&gt;
</del><ins>+            hash=&quot;sha256:18f7e8fb63fcfd0d5abd213943c0c356b1270a94e20d44b8e6047b1cd0e53010&quot;
+            md5sum=&quot;f6939a24ffc50c2e4eac7ed38663f0f3&quot;&gt;
</ins><span class="cx">     &lt;/branch&gt;
</span><span class="cx">     &lt;dependencies&gt;
</span><span class="cx">         &lt;dep package=&quot;efl&quot;/&gt;
</span></span></pre></div>
<a id="trunkToolseflpatchesecorepatch"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/efl/patches/ecore.patch (174106 => 174107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/efl/patches/ecore.patch        2014-09-30 14:30:34 UTC (rev 174106)
+++ trunk/Tools/efl/patches/ecore.patch        2014-09-30 15:19:16 UTC (rev 174107)
</span><span class="lines">@@ -1,102 +0,0 @@
</span><del>-diff --git a/src/lib/ecore/ecore_pipe.c b/src/lib/ecore/ecore_pipe.c
-index 705673b..44af8ad 100644
---- a/src/lib/ecore/ecore_pipe.c
-+++ b/src/lib/ecore/ecore_pipe.c
-@@ -586,12 +586,21 @@ _ecore_pipe_handler_call(Ecore_Pipe *p,
-                          size_t len)
- {
-    void *data = (void*) p-&gt;data;
-+   
-+   // clear all values of pipe first.
-+   p-&gt;passed_data = NULL;
-+   p-&gt;already_read = 0;
-+   p-&gt;len = 0;
-+   p-&gt;message++;
-+
-    if (!p-&gt;delete_me)
-      {
-         _ecore_unlock();
-         p-&gt;handler(data, buf, len);
-         _ecore_lock();
-      }
-+   // free p-&gt;passed_data
-+   free(buf);
- }

- static Eina_Bool
-@@ -634,11 +643,6 @@ _ecore_pipe_read(void             *data,
-                       {
-      /* no data on first try through means an error */
-                           _ecore_pipe_handler_call(p, NULL, 0);
--                          if (p-&gt;passed_data) free(p-&gt;passed_data);
--                          p-&gt;passed_data = NULL;
--                          p-&gt;already_read = 0;
--                          p-&gt;len = 0;
--                          p-&gt;message++;
-                           pipe_close(p-&gt;fd_read);
-                           p-&gt;fd_read = PIPE_FD_INVALID;
-                           p-&gt;fd_handler = NULL;
-@@ -673,11 +677,6 @@ _ecore_pipe_read(void             *data,
-                    if (WSAGetLastError() != WSAEWOULDBLOCK)
-                      {
-                         _ecore_pipe_handler_call(p, NULL, 0);
--                        if (p-&gt;passed_data) free(p-&gt;passed_data);
--                        p-&gt;passed_data = NULL;
--                        p-&gt;already_read = 0;
--                        p-&gt;len = 0;
--                        p-&gt;message++;
-                         pipe_close(p-&gt;fd_read);
-                         p-&gt;fd_read = PIPE_FD_INVALID;
-                         p-&gt;fd_handler = NULL;
-@@ -694,12 +693,6 @@ _ecore_pipe_read(void             *data,
-         if (p-&gt;len == 0)
-           {
-              _ecore_pipe_handler_call(p, NULL, 0);
--             /* reset all values to 0 */
--             if (p-&gt;passed_data) free(p-&gt;passed_data);
--             p-&gt;passed_data = NULL;
--             p-&gt;already_read = 0;
--             p-&gt;len = 0;
--             p-&gt;message++;
-              _ecore_pipe_unhandle(p);
-              return ECORE_CALLBACK_RENEW;
-           }
-@@ -713,9 +706,6 @@ _ecore_pipe_read(void             *data,
-                {
-                   _ecore_pipe_handler_call(p, NULL, 0);
-      /* close the pipe */
--                  p-&gt;already_read = 0;
--                  p-&gt;len = 0;
--                  p-&gt;message++;
-                   pipe_close(p-&gt;fd_read);
-                   p-&gt;fd_read = PIPE_FD_INVALID;
-                   p-&gt;fd_handler = NULL;
-@@ -732,15 +722,7 @@ _ecore_pipe_read(void             *data,
-         /* catch the non error case first */
-         /* if we read enough data to finish the message/buffer */
-         if (ret == (ssize_t)(p-&gt;len - p-&gt;already_read))
--          {
--             _ecore_pipe_handler_call(p, p-&gt;passed_data, p-&gt;len);
--             free(p-&gt;passed_data);
--             /* reset all values to 0 */
--             p-&gt;passed_data = NULL;
--             p-&gt;already_read = 0;
--             p-&gt;len = 0;
--             p-&gt;message++;
--          }
-+           _ecore_pipe_handler_call(p, p-&gt;passed_data, p-&gt;len);
-         else if (ret &gt; 0)
-           {
-              /* more data left to read */
-@@ -775,11 +757,6 @@ _ecore_pipe_read(void             *data,
-              if (WSAGetLastError() != WSAEWOULDBLOCK)
-                {
-                   _ecore_pipe_handler_call(p, NULL, 0);
--                  if (p-&gt;passed_data) free(p-&gt;passed_data);
--                  p-&gt;passed_data = NULL;
--                  p-&gt;already_read = 0;
--                  p-&gt;len = 0;
--                  p-&gt;message++;
-                   pipe_close(p-&gt;fd_read);
-                   p-&gt;fd_read = PIPE_FD_INVALID;
-                   p-&gt;fd_handler = NULL;
</del></span></pre>
</div>
</div>

</body>
</html>