<!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>[184712] 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/184712">184712</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-21 05:28:22 -0700 (Thu, 21 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] Bump libsoup version to 2.50.0
https://bugs.webkit.org/show_bug.cgi?id=145127
Reviewed by Gyuyoung Kim.
* efl/jhbuild.modules:
* efl/patches/soup-clang-warning-fix1.patch: Removed.
* efl/patches/soup-clang-warning-fix2.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="#trunkToolseflpatchessoupclangwarningfix1patch">trunk/Tools/efl/patches/soup-clang-warning-fix1.patch</a></li>
<li><a href="#trunkToolseflpatchessoupclangwarningfix2patch">trunk/Tools/efl/patches/soup-clang-warning-fix2.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (184711 => 184712)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-05-21 10:51:59 UTC (rev 184711)
+++ trunk/Tools/ChangeLog 2015-05-21 12:28:22 UTC (rev 184712)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-05-21 Csaba Osztrogonác <ossy@webkit.org>
+
+ [EFL] Bump libsoup version to 2.50.0
+ https://bugs.webkit.org/show_bug.cgi?id=145127
+
+ Reviewed by Gyuyoung Kim.
+
+ * efl/jhbuild.modules:
+ * efl/patches/soup-clang-warning-fix1.patch: Removed.
+ * efl/patches/soup-clang-warning-fix2.patch: Removed.
+
</ins><span class="cx"> 2015-05-20 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Move MainThreadGtk, RunLoopGtk, WorkQueueGtk under Source/WTF/wtf/glib/
</span></span></pre></div>
<a id="trunkToolsefljhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/efl/jhbuild.modules (184711 => 184712)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/efl/jhbuild.modules 2015-05-21 10:51:59 UTC (rev 184711)
+++ trunk/Tools/efl/jhbuild.modules 2015-05-21 12:28:22 UTC (rev 184712)
</span><span class="lines">@@ -142,11 +142,9 @@
</span><span class="cx"> <dep package="glib-networking"/>
</span><span class="cx"> <dep package="libxml2"/>
</span><span class="cx"> </dependencies>
</span><del>- <branch module="/pub/gnome/sources/libsoup/2.42/libsoup-2.42.0.tar.xz" version="2.42.0"
</del><ins>+ <branch module="/pub/gnome/sources/libsoup/2.50/libsoup-2.50.0.tar.xz" version="2.50.0"
</ins><span class="cx"> repo="ftp.gnome.org"
</span><del>- hash="sha256:9e0e7eb5d3f7401ccf521fbc289fc1fa0923b7c7833729e2ed7696f7b848893e">
- <patch file="soup-clang-warning-fix1.patch" strip="1"/>
- <patch file="soup-clang-warning-fix2.patch" strip="1"/>
</del><ins>+ hash="sha256:1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b">
</ins><span class="cx"> </branch>
</span><span class="cx"> </autotools>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolseflpatchessoupclangwarningfix1patch"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/efl/patches/soup-clang-warning-fix1.patch (184711 => 184712)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/efl/patches/soup-clang-warning-fix1.patch 2015-05-21 10:51:59 UTC (rev 184711)
+++ trunk/Tools/efl/patches/soup-clang-warning-fix1.patch 2015-05-21 12:28:22 UTC (rev 184712)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-commit 3c96f1977a556b76bc768edeb78497a2e92dd898
-Author: Dan Winship <danw@gnome.org>
-Date: Thu Oct 17 17:56:29 2013 -0400
-
- soup-logger: fix -Wformat-nonliteral warnings in clang
-
-diff --git a/configure.ac b/configure.ac
-index f498b96..3759bab 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -340,6 +340,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
- -Wall -Wstrict-prototypes -Werror=missing-prototypes \
- -Werror=implicit-function-declaration \
- -Werror=pointer-arith -Werror=init-self -Werror=format=2 \
-+ -Wno-format-zero-length \
- -Werror=missing-include-dirs -Werror=aggregate-return \
- -Werror=declaration-after-statement"
- fi
-diff --git a/libsoup/soup-logger.c b/libsoup/soup-logger.c
-index a441f21..34a5576 100644
---- a/libsoup/soup-logger.c
-+++ b/libsoup/soup-logger.c
-@@ -374,6 +374,9 @@ soup_logger_detach (SoupLogger *logger,
- soup_session_remove_feature (session, SOUP_SESSION_FEATURE (logger));
- }
-
-+static void soup_logger_print (SoupLogger *logger, SoupLoggerLogLevel level,
-+ char direction, const char *format, ...) G_GNUC_PRINTF (4, 5);
-+
- static void
- soup_logger_print (SoupLogger *logger, SoupLoggerLogLevel level,
- char direction, const char *format, ...)
-@@ -428,7 +425,7 @@
- *p = '*';
- }
- soup_logger_print (logger, SOUP_LOGGER_LOG_HEADERS, '>',
-- "Authorization: Basic [%.*s]", len, decoded);
-+ "Authorization: Basic [%.*s]", (int)len, decoded);
- g_free (decoded);
- }
-
</del></span></pre></div>
<a id="trunkToolseflpatchessoupclangwarningfix2patch"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/efl/patches/soup-clang-warning-fix2.patch (184711 => 184712)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/efl/patches/soup-clang-warning-fix2.patch 2015-05-21 10:51:59 UTC (rev 184711)
+++ trunk/Tools/efl/patches/soup-clang-warning-fix2.patch 2015-05-21 12:28:22 UTC (rev 184712)
</span><span class="lines">@@ -1,65 +0,0 @@
</span><del>-commit c2c2ecbf7d021bb5445a205ec8c66286afaf1008
-Author: Ryan Lortie <desrt@desrt.ca>
-Date: Sun Dec 8 15:41:56 2013 -0500
-
- fix up non-literal format string issues
-
- Fix up a couple of errors picked up by -Werror=format-nonliteral on
- clang.
-
- https://bugzilla.gnome.org/show_bug.cgi?id=720082
-
-diff --git a/libsoup/soup-xmlrpc.c b/libsoup/soup-xmlrpc.c
-index 8d711d3..e289010 100644
---- a/libsoup/soup-xmlrpc.c
-+++ b/libsoup/soup-xmlrpc.c
-@@ -290,6 +290,11 @@ soup_xmlrpc_build_method_response (GValue *value)
- }
-
- static char *
-+soup_xmlrpc_build_faultv (int fault_code,
-+ const char *fault_format,
-+ va_list args) G_GNUC_PRINTF (2, 0);
-+
-+static char *
- soup_xmlrpc_build_faultv (int fault_code, const char *fault_format, va_list args)
- {
- xmlDoc *doc;
-diff --git a/tests/coding-test.c b/tests/coding-test.c
-index 30417b4..1bffbc4 100644
---- a/tests/coding-test.c
-+++ b/tests/coding-test.c
-@@ -33,7 +33,7 @@ server_callback (SoupServer *server, SoupMessage *msg,
-
- if (codings) {
- gboolean claim_deflate, claim_gzip;
-- const char *file_path = NULL, *encoding = NULL;
-+ const char *extension = NULL, *encoding = NULL;
-
- claim_deflate = g_slist_find_custom (codings, "deflate", (GCompareFunc)g_ascii_strcasecmp) != NULL;
- claim_gzip = g_slist_find_custom (codings, "gzip", (GCompareFunc)g_ascii_strcasecmp) != NULL;
-@@ -41,19 +41,19 @@ server_callback (SoupServer *server, SoupMessage *msg,
- if (claim_gzip && (!claim_deflate ||
- (!soup_header_contains (options, "prefer-deflate-zlib") &&
- !soup_header_contains (options, "prefer-deflate-raw")))) {
-- file_path = SRCDIR "/resources%s.gz";
-+ extension = "gz";
- encoding = "gzip";
- } else if (claim_deflate) {
- if (soup_header_contains (options, "prefer-deflate-raw")) {
-- file_path = SRCDIR "/resources%s.raw";
-+ extension = "raw";
- encoding = "deflate";
- } else {
-- file_path = SRCDIR "/resources%s.zlib";
-+ extension = "zlib";
- encoding = "deflate";
- }
- }
-- if (file_path && encoding) {
-- file = g_strdup_printf (file_path, path);
-+ if (extension && encoding) {
-+ file = g_strdup_printf (SRCDIR "/resources%s.%s", path, extension);
- if (g_file_test (file, G_FILE_TEST_EXISTS)) {
- soup_message_headers_append (msg->response_headers,
- "Content-Encoding",
</del></span></pre>
</div>
</div>
</body>
</html>