Diff
Modified: trunk/Tools/ChangeLog (184711 => 184712)
--- trunk/Tools/ChangeLog 2015-05-21 10:51:59 UTC (rev 184711)
+++ trunk/Tools/ChangeLog 2015-05-21 12:28:22 UTC (rev 184712)
@@ -1,3 +1,14 @@
+2015-05-21 Csaba Osztrogonác <o...@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.
+
2015-05-20 Zan Dobersek <zdober...@igalia.com>
[GTK] Move MainThreadGtk, RunLoopGtk, WorkQueueGtk under Source/WTF/wtf/glib/
Modified: trunk/Tools/efl/jhbuild.modules (184711 => 184712)
--- 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)
@@ -142,11 +142,9 @@
<dep package="glib-networking"/>
<dep package="libxml2"/>
</dependencies>
- <branch module="/pub/gnome/sources/libsoup/2.42/libsoup-2.42.0.tar.xz" version="2.42.0"
+ <branch module="/pub/gnome/sources/libsoup/2.50/libsoup-2.50.0.tar.xz" version="2.50.0"
repo="ftp.gnome.org"
- hash="sha256:9e0e7eb5d3f7401ccf521fbc289fc1fa0923b7c7833729e2ed7696f7b848893e">
- <patch file="soup-clang-warning-fix1.patch" strip="1"/>
- <patch file="soup-clang-warning-fix2.patch" strip="1"/>
+ hash="sha256:1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b">
</branch>
</autotools>
Deleted: trunk/Tools/efl/patches/soup-clang-warning-fix1.patch (184711 => 184712)
--- 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)
@@ -1,41 +0,0 @@
-commit 3c96f1977a556b76bc768edeb78497a2e92dd898
-Author: Dan Winship <d...@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);
- }
-
Deleted: trunk/Tools/efl/patches/soup-clang-warning-fix2.patch (184711 => 184712)
--- 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)
@@ -1,65 +0,0 @@
-commit c2c2ecbf7d021bb5445a205ec8c66286afaf1008
-Author: Ryan Lortie <de...@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",
