Attachment 253324 Details for Bug 145127 – Patch

[patch] Patch

bug-145127-20150518041009.patch (text/plain), 6.09 KB, created by Csaba Osztrogonác on 2015-05-18 04:10:11 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Csaba Osztrogonác

Created: 2015-05-18 04:10:11 PDT

Size: 6.09 KB

patch

obsolete

>Subversion Revision: 184449
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index ebc2ce9c251799623632473888095110e3dfab52..c1bf86d6fdd2a553591460d8d32a9af95223956c 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,14 @@
>+2015-05-18  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 NOBODY (OOPS!).
>+
>+        * efl/jhbuild.modules:
>+        * efl/patches/soup-clang-warning-fix1.patch: Removed.
>+        * efl/patches/soup-clang-warning-fix2.patch: Removed.
>+
> 2015-05-17  David Kilzer  <ddkilzer@apple.com>
> 
>         bisect-builds: Add 'retry' option when prompting whether the bug reproduced
>diff --git a/Tools/efl/jhbuild.modules b/Tools/efl/jhbuild.modules
>index 1dd598755c4f14f2a5b037f29202971fa29e725e..21624679d0db3124fabf9ad783a1eaacb4d464c6 100644
>--- a/Tools/efl/jhbuild.modules
>+++ b/Tools/efl/jhbuild.modules
>@@ -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>
> 
>diff --git a/Tools/efl/patches/soup-clang-warning-fix1.patch b/Tools/efl/patches/soup-clang-warning-fix1.patch
>deleted file mode 100644
>index 7f32b682728e14f8257624cddead82bc44d8b51f..0000000000000000000000000000000000000000
>--- a/Tools/efl/patches/soup-clang-warning-fix1.patch
>+++ /dev/null
>@@ -1,41 +0,0 @@
>-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);
>- }
>- 
>diff --git a/Tools/efl/patches/soup-clang-warning-fix2.patch b/Tools/efl/patches/soup-clang-warning-fix2.patch
>deleted file mode 100644
>index d715a5fd5167db23673b7a4ffefd2463846ce632..0000000000000000000000000000000000000000
>--- a/Tools/efl/patches/soup-clang-warning-fix2.patch
>+++ /dev/null
>@@ -1,65 +0,0 @@
>-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",

Actions: View | Formatted Diff | Diff

Attachments on bug 145127: 253324 | 253509