Changeset 137286 in webkit

Timestamp:

Dec 11, 2012 4:10:06 AM (11 years ago)

Author:

Martin Robinson

Message:

[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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/gtk/generate-gtkdoc (modified) (1 diff)
• Tools/gtk/jhbuild.modules (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -1419 +1419 @@
 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 ]
 

trunk/Tools/ChangeLog

@@ +1 @@
+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>
 

trunk/Tools/gtk/generate-gtkdoc

@@ -162 +162 @@
     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
 

trunk/Tools/gtk/jhbuild.modules

@@ -151 +151 @@
       <dep package="libffi"/>
     </dependencies>
-    <branch module="/pub/GNOME/sources/glib/2.33/glib-2.33.2.tar.xz" version="2.33.2"
-            repo="ftp.gnome.org"
-            hash="sha256:b7163e9f159775d13ecfb433d67c3f0883e0e518e85b2e970d4ad9773d7cd0b4"
-            md5sum="06ef0099fed22afcf34ade39ddff9a5b"/>
+    <branch module="/pub/GNOME/sources/glib/2.35/glib-2.35.2.tar.xz" version="2.35.2"
+            repo="ftp.gnome.org"
+            hash="sha256:84fffa2041850352b83a7b27c127f1c4e8b3d169aa3a000b100820ba10f8c19e"/>
   </autotools>
 
@@ -172 +171 @@
       <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>