Title: [207643] trunk/Tools
- Revision
- 207643
- Author
- commit-qu...@webkit.org
- Date
- 2016-10-20 16:41:10 -0700 (Thu, 20 Oct 2016)
Log Message
Unreviewed, rolling out r207589.
https://bugs.webkit.org/show_bug.cgi?id=163765
Introduced 17 new layout test failures (Requested by
mcatanzaro on #webkit).
Reverted changeset:
"[GTK] Bump glib to 2.50.1"
https://bugs.webkit.org/show_bug.cgi?id=163689
http://trac.webkit.org/changeset/207589
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (207642 => 207643)
--- trunk/Tools/ChangeLog 2016-10-20 23:05:53 UTC (rev 207642)
+++ trunk/Tools/ChangeLog 2016-10-20 23:41:10 UTC (rev 207643)
@@ -1,3 +1,17 @@
+2016-10-20 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r207589.
+ https://bugs.webkit.org/show_bug.cgi?id=163765
+
+ Introduced 17 new layout test failures (Requested by
+ mcatanzaro on #webkit).
+
+ Reverted changeset:
+
+ "[GTK] Bump glib to 2.50.1"
+ https://bugs.webkit.org/show_bug.cgi?id=163689
+ http://trac.webkit.org/changeset/207589
+
2016-10-19 Myles C. Maxfield <mmaxfi...@apple.com>
[macOS] [iOS] Disable variation fonts on macOS El Capitan and iOS 9
Modified: trunk/Tools/gtk/jhbuild.modules (207642 => 207643)
--- trunk/Tools/gtk/jhbuild.modules 2016-10-20 23:05:53 UTC (rev 207642)
+++ trunk/Tools/gtk/jhbuild.modules 2016-10-20 23:41:10 UTC (rev 207643)
@@ -200,13 +200,15 @@
<autotools id="glib"
autogen-sh="configure"
- autogenargs="--disable-dtrace --disable-libmount">
+ autogenargs="--disable-dtrace">
<dependencies>
<dep package="libffi"/>
</dependencies>
- <branch module="/pub/GNOME/sources/glib/2.50/glib-2.50.1.tar.xz" version="2.50.1"
+ <branch module="/pub/GNOME/sources/glib/2.44/glib-2.44.1.tar.xz" version="2.44.1"
repo="ftp.gnome.org"
- hash="sha256:2ef87a78f37c1eb5b95f4cc95efd5b66f69afad9c9c0899918d04659cf6df7dd">
+ hash="sha256:8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07">
+ <patch file="glib-warning-fix.patch" strip="1"/>
+ <patch file="gdate-suppress-string-format-literal-warning.patch" strip="1"/>
</branch>
</autotools>
Added: trunk/Tools/gtk/patches/gdate-suppress-string-format-literal-warning.patch (0 => 207643)
--- trunk/Tools/gtk/patches/gdate-suppress-string-format-literal-warning.patch (rev 0)
+++ trunk/Tools/gtk/patches/gdate-suppress-string-format-literal-warning.patch 2016-10-20 23:41:10 UTC (rev 207643)
@@ -0,0 +1,29 @@
+From 3a7efd598d39366c2c9de0def2fdfb35e5e9f2a1 Mon Sep 17 00:00:00 2001
+From: coypu <co...@sdf.org>
+Date: Mon, 8 Feb 2016 00:06:06 +0200
+Subject: [PATCH 1/1] gdate: Suppress string format literal warning
+
+Newer versions of GCC emit an error here, but we know it's safe.
+https://bugzilla.gnome.org/761550
+---
+ glib/gdate.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/glib/gdate.c b/glib/gdate.c
+index 4aece02..cdc735c 100644
+--- a/glib/gdate.c
++++ b/glib/gdate.c
+@@ -2494,7 +2494,10 @@ g_date_strftime (gchar *s,
+ * recognize whether strftime actually failed or just returned "".
+ */
+ tmpbuf[0] = '\1';
++ #pragma GCC diagnostic push
++ #pragma GCC diagnostic ignored "-Wformat-nonliteral"
+ tmplen = strftime (tmpbuf, tmpbufsize, locale_format, &tm);
++ #pragma GCC diagnostic pop
+
+ if (tmplen == 0 && tmpbuf[0] != '\0')
+ {
+--
+2.7.0
+
Added: trunk/Tools/gtk/patches/glib-warning-fix.patch (0 => 207643)
--- trunk/Tools/gtk/patches/glib-warning-fix.patch (rev 0)
+++ trunk/Tools/gtk/patches/glib-warning-fix.patch 2016-10-20 23:41:10 UTC (rev 207643)
@@ -0,0 +1,34 @@
+From 9f90ee5eeccd47f39c7a03dcd786b125a19c195d Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanz...@gnome.org>
+Date: Sat, 13 Jun 2015 22:52:33 -0500
+Subject: [PATCH] genmarshal: silence register storage class warnings
+
+Using the register keyword triggers warnings on noteworthy compilers
+(clang), since it's deprecated in C++ and at danger of being removed
+from the language. There is no reason to use it since it isn't 1980
+anymore.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=750918
+---
+ gobject/glib-genmarshal.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gobject/glib-genmarshal.c b/gobject/glib-genmarshal.c
+index be4151a..ca78a6f 100644
+--- a/gobject/glib-genmarshal.c
++++ b/gobject/glib-genmarshal.c
+@@ -412,9 +412,9 @@ generate_marshal (const gchar *signame,
+ g_fprintf (fout, "%s%s data2);\n", indent (ind), pad ("gpointer"));
+
+ /* cfile marshal variables */
+- g_fprintf (fout, " register GMarshalFunc_%s callback;\n", signame);
+- g_fprintf (fout, " register GCClosure *cc = (GCClosure*) closure;\n");
+- g_fprintf (fout, " register gpointer data1, data2;\n");
++ g_fprintf (fout, " GMarshalFunc_%s callback;\n", signame);
++ g_fprintf (fout, " GCClosure *cc = (GCClosure*) closure;\n");
++ g_fprintf (fout, " gpointer data1, data2;\n");
+ if (sig->rarg->setter)
+ g_fprintf (fout, " %s v_return;\n", sig->rarg->ctype);
+
+--
+2.4.2
\ No newline at end of file
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
