Modified: trunk/ChangeLog (148505 => 148506)
--- trunk/ChangeLog 2013-04-16 09:29:37 UTC (rev 148505)
+++ trunk/ChangeLog 2013-04-16 09:35:23 UTC (rev 148506)
@@ -1,3 +1,15 @@
+2013-04-16 Manuel Rego Casasnovas <[email protected]>
+
+ [EFL] Bump libsoup dependency to 2.42.0
+ https://bugs.webkit.org/show_bug.cgi?id=113927
+
+ Reviewed by Gyuyoung Kim.
+
+ Update libsoup required version to v2.42.0 and GLib to v2.36.0 as
+ required by libsoup for EFL port.
+
+ * Source/cmake/OptionsEfl.cmake:
+
2013-04-15 Patrick Gansterer <[email protected]>
[CMake] Add WTF_USE_*_UNICODE variables
Modified: trunk/Source/cmake/OptionsEfl.cmake (148505 => 148506)
--- trunk/Source/cmake/OptionsEfl.cmake 2013-04-16 09:29:37 UTC (rev 148505)
+++ trunk/Source/cmake/OptionsEfl.cmake 2013-04-16 09:35:23 UTC (rev 148506)
@@ -24,8 +24,8 @@
find_package(PNG REQUIRED)
find_package(ZLIB REQUIRED)
-find_package(GLIB 2.33.2 REQUIRED COMPONENTS gio gobject gthread)
-find_package(LibSoup 2.40.3 REQUIRED)
+find_package(GLIB 2.36.0 REQUIRED COMPONENTS gio gobject gthread)
+find_package(LibSoup 2.42.0 REQUIRED)
set(WTF_USE_ICU_UNICODE 1)
set(WTF_USE_SOUP 1)
Modified: trunk/Tools/ChangeLog (148505 => 148506)
--- trunk/Tools/ChangeLog 2013-04-16 09:29:37 UTC (rev 148505)
+++ trunk/Tools/ChangeLog 2013-04-16 09:35:23 UTC (rev 148506)
@@ -1,3 +1,17 @@
+2013-04-16 Manuel Rego Casasnovas <[email protected]>
+
+ [EFL] Bump libsoup dependency to 2.42.0
+ https://bugs.webkit.org/show_bug.cgi?id=113927
+
+ Reviewed by Gyuyoung Kim.
+
+ Update libsoup required version to v2.42.0 and GLib to v2.36.0 as
+ required by libsoup for EFL port.
+
+ * efl/jhbuild.modules:
+ * efl/patches/libsoup-2.40-auth-fix.patch: Removed as it's already
+ included in v2.42.0.
+
2013-04-16 Ryosuke Niwa <[email protected]>
Remove Account class from committers.py
Modified: trunk/Tools/efl/jhbuild.modules (148505 => 148506)
--- trunk/Tools/efl/jhbuild.modules 2013-04-16 09:29:37 UTC (rev 148505)
+++ trunk/Tools/efl/jhbuild.modules 2013-04-16 09:35:23 UTC (rev 148506)
@@ -128,10 +128,9 @@
<dependencies>
<dep package="libffi"/>
</dependencies>
- <branch module="/pub/GNOME/sources/glib/2.33/glib-2.33.2.tar.xz" version="2.33.2"
+ <branch module="/pub/GNOME/sources/glib/2.36/glib-2.36.0.tar.xz" version="2.36.0"
repo="ftp.gnome.org"
- hash="sha256:b7163e9f159775d13ecfb433d67c3f0883e0e518e85b2e970d4ad9773d7cd0b4"
- md5sum="06ef0099fed22afcf34ade39ddff9a5b"/>
+ hash="sha256:455a8abe8692c5174bcc7ffa15b96a7521a2f2f9fb47594405927c35cb9bb227"/>
</autotools>
<autotools id="glib-networking">
@@ -149,10 +148,9 @@
<dependencies>
<dep package="glib-networking"/>
</dependencies>
- <branch module="/pub/gnome/sources/libsoup/2.40/libsoup-2.40.3.tar.xz" version="2.40.3"
+ <branch module="/pub/gnome/sources/libsoup/2.42/libsoup-2.42.0.tar.xz" version="2.42.0"
repo="ftp.gnome.org"
- hash="sha256:82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9">
- <patch file="libsoup-2.40-auth-fix.patch" strip="1"/>
+ hash="sha256:9e0e7eb5d3f7401ccf521fbc289fc1fa0923b7c7833729e2ed7696f7b848893e">
</branch>
</autotools>
Deleted: trunk/Tools/efl/patches/libsoup-2.40-auth-fix.patch (148505 => 148506)
--- trunk/Tools/efl/patches/libsoup-2.40-auth-fix.patch 2013-04-16 09:29:37 UTC (rev 148505)
+++ trunk/Tools/efl/patches/libsoup-2.40-auth-fix.patch 2013-04-16 09:35:23 UTC (rev 148506)
@@ -1,50 +0,0 @@
-From f9816e366e53004618abcee1741885b69e9466a8 Mon Sep 17 00:00:00 2001
-From: Martin Robinson <[email protected]>
-Date: Tue, 4 Dec 2012 17:48:45 -0800
-Subject: [PATCH] Better handle the failure of URI embedded credentials
-
-When using credentials embedded in the URI, clear them so that a failure
-will trigger the authentication signal and the use of previously
-remembered credentials.
----
- libsoup/soup-auth-manager.c | 7 ++++---
- tests/auth-test.c | 5 ++++-
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/libsoup/soup-auth-manager.c b/libsoup/soup-auth-manager.c
-index b3ef9f6..2a2030c 100644
---- a/libsoup/soup-auth-manager.c
-+++ b/libsoup/soup-auth-manager.c
-@@ -411,9 +411,10 @@ authenticate_auth (SoupAuthManager *manager, SoupAuth *auth,
- /* If a password is specified explicitly in the URI, use it
- * even if the auth had previously already been authenticated.
- */
-- if (uri->password) {
-- if (!prior_auth_failed)
-- soup_auth_authenticate (auth, uri->user, uri->password);
-+ if (uri->password && uri->user) {
-+ soup_auth_authenticate (auth, uri->user, uri->password);
-+ soup_uri_set_password (uri, NULL);
-+ soup_uri_set_user (uri, NULL);
- } else if (!soup_auth_is_authenticated (auth) && can_interact) {
- soup_auth_manager_emit_authenticate (manager, msg, auth,
- prior_auth_failed);
-diff --git a/tests/auth-test.c b/tests/auth-test.c
-index 85c4d41..334033b 100644
---- a/tests/auth-test.c
-+++ b/tests/auth-test.c
-@@ -146,7 +146,10 @@ static SoupAuthTest main_tests[] = {
- "Digest/realm1/not/", "1", FALSE, /* should not be used */ "1", SOUP_STATUS_UNAUTHORIZED },
-
- { "Make sure we've forgotten it",
-- "Digest/realm1/", "", FALSE, "0", SOUP_STATUS_UNAUTHORIZED }
-+ "Digest/realm1/", "", FALSE, "0", SOUP_STATUS_UNAUTHORIZED },
-+
-+ { "Fail with URI-embedded password, then use right password in the authenticate signal",
-+ "Basic/realm3/", "43", TRUE, "43", SOUP_STATUS_OK }
- };
-
- static const char *auths[] = {
---
-1.7.10.4
-
