[GTK] Bump the jhbuild libsoup version to fix an authentication issue

https://bugs.webkit.org/show_bug.cgi?id=104448

Reviewed by Gustavo Noronha Silva.

Tools:

Bump the libsoup version to one from the git repository. This requires updating
GLib as well which in turn requires adjusting the CFLAGS we pass when compiling
the scanobj step of the gtkdoc generation.

* gtk/generate-gtkdoc:
* gtk/jhbuild.modules:

LayoutTests:

* platform/gtk/TestExpectations: Unskip some tests which are now passing.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@137286 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 863c361..cb77e9a 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2012-12-11  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] Bump the jhbuild libsoup version to fix an authentication issue
+        https://bugs.webkit.org/show_bug.cgi?id=104448
+
+        Reviewed by Gustavo Noronha Silva.
+
+        * platform/gtk/TestExpectations: Unskip some tests which are now passing.
+
 2012-12-11  Thiago Marcos P. Santos  <thiago.santos@intel.com>
 
         [EFL] Unreviewed gardening.

diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
index d7ac771..65c8699 100644 (file)
--- a/LayoutTests/platform/gtk/TestExpectations
+++ b/LayoutTests/platform/gtk/TestExpectations
@@ -1418,14 +1418,6 @@ webkit.org/b/104493 svg/custom/js-update-transform-addition.svg [ Failure ]
 webkit.org/b/104493 svg/custom/js-update-transform-changes.svg [ Failure ]
 webkit.org/b/104493 svg/custom/text-xy-updates-SVGList.xhtml [ Failure ]
 
-webkit.org/b/104571 http/tests/security/xssAuditor/base-href-null-char.html [ Failure ]
-webkit.org/b/104571 http/tests/security/xssAuditor/embed-tag-null-char.html [ Failure ]
-webkit.org/b/104571 http/tests/security/xssAuditor/link-onclick-null-char.html [ Failure ]
-webkit.org/b/104571 http/tests/security/xssAuditor/script-tag-addslashes-null-char.html [ Failure ]
-webkit.org/b/104571 http/tests/security/xssAuditor/script-tag-null-char.html [ Failure ]
-webkit.org/b/104571 http/tests/security/xssAuditor/script-tag-with-source-null-char.html [ Failure ]
-webkit.org/b/104571 http/tests/xmlhttprequest/origin-exact-matching.html [ Failure ]
-
 webkit.org/b/104649 svg/W3C-SVG-1.1-SE/svgdom-over-01-f.svg [ Failure ]
 
 #////////////////////////////////////////////////////////////////////////////////////////

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index a2dcd3a..0533114 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2012-12-11  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] Bump the jhbuild libsoup version to fix an authentication issue
+        https://bugs.webkit.org/show_bug.cgi?id=104448
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Bump the libsoup version to one from the git repository. This requires updating
+        GLib as well which in turn requires adjusting the CFLAGS we pass when compiling
+        the scanobj step of the gtkdoc generation.
+
+        * gtk/generate-gtkdoc:
+        * gtk/jhbuild.modules:
+
 2012-12-11  Zan Dobersek  <zandobersek@gmail.com>
 
         Unreviewed functionality fix for the GTK port.

diff --git a/Tools/gtk/generate-gtkdoc b/Tools/gtk/generate-gtkdoc
index 3edd13f..fd84879 100755 (executable)
--- a/Tools/gtk/generate-gtkdoc
+++ b/Tools/gtk/generate-gtkdoc
@@ -161,6 +161,13 @@ os.environ['PKG_CONFIG_PATH'] = common.build_path('Source', 'JavaScriptCore')
 if pkg_config_path:
     os.environ['PKG_CONFIG_PATH'] += ':' + pkg_config_path
 
+# Newer versions of glib have deprecated g_type_init, so we need to disable
+# that warning when running gtkdoc-scanobj by overriding the CFLAGS we use
+# to compile it.
+cflags = os.environ.get('CFLAGS', '')
+cflags += ' -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32'
+os.environ['CFLAGS'] = cflags
+
 saw_webkit1_warnings = saw_webkit2_warnings = False
 
 pkg_config_path = common.build_path('Source', 'WebKit', 'gtk', 'webkitgtk-3.0.pc')

diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules
index 3d4e14f..cb4efc2 100644 (file)
--- a/Tools/gtk/jhbuild.modules
+++ b/Tools/gtk/jhbuild.modules
@@ -150,10 +150,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.35/glib-2.35.2.tar.xz" version="2.35.2"
             repo="ftp.gnome.org"
-            hash="sha256:b7163e9f159775d13ecfb433d67c3f0883e0e518e85b2e970d4ad9773d7cd0b4"
-            md5sum="06ef0099fed22afcf34ade39ddff9a5b"/>
+            hash="sha256:84fffa2041850352b83a7b27c127f1c4e8b3d169aa3a000b100820ba10f8c19e"/>
   </autotools>
 
   <autotools id="glib-networking">
@@ -171,10 +170,9 @@
     <dependencies>
       <dep package="glib-networking"/>
     </dependencies>
-    <branch module="/pub/gnome/sources/libsoup/2.40/libsoup-2.40.1.tar.xz" version="2.40.1"
-            repo="ftp.gnome.org"
-            hash="sha256:77a55d57e7e8055acd2f44e0cc889b9ba48052e8b7f07e829157d57417ac650a"
-            md5sum="2fa30bab92d770eeb6535e1504ab2ded"/>
+    <branch module="libsoup" version="2.40.2-r1"
+            repo="git.gnome.org"
+            revision="5651d18eb8c9edff5961a32c488641bf6776ca6b"/>
   </autotools>
 
   <autotools id="fontconfig" autogen-sh="configure">