Title: [207589] trunk/Tools
- Revision
- 207589
- Author
- r...@igalia.com
- Date
- 2016-10-20 01:30:13 -0700 (Thu, 20 Oct 2016)
Log Message
[GTK] Bump glib to 2.50.1
https://bugs.webkit.org/show_bug.cgi?id=163689
Reviewed by Michael Catanzaro.
This is need in order to fix GTK+ build with CUPS 2.* (bug #163591).
* gtk/jhbuild.modules: Bump glib version. Pass --disable-libmount to build properly.
Also we don't need the patches anymore.
* gtk/patches/gdate-suppress-string-format-literal-warning.patch: Removed.
* gtk/patches/glib-warning-fix.patch: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/Tools/ChangeLog (207588 => 207589)
--- trunk/Tools/ChangeLog 2016-10-20 07:26:55 UTC (rev 207588)
+++ trunk/Tools/ChangeLog 2016-10-20 08:30:13 UTC (rev 207589)
@@ -1,3 +1,17 @@
+2016-10-20 Manuel Rego Casasnovas <r...@igalia.com>
+
+ [GTK] Bump glib to 2.50.1
+ https://bugs.webkit.org/show_bug.cgi?id=163689
+
+ Reviewed by Michael Catanzaro.
+
+ This is need in order to fix GTK+ build with CUPS 2.* (bug #163591).
+
+ * gtk/jhbuild.modules: Bump glib version. Pass --disable-libmount to build properly.
+ Also we don't need the patches anymore.
+ * gtk/patches/gdate-suppress-string-format-literal-warning.patch: Removed.
+ * gtk/patches/glib-warning-fix.patch: Removed.
+
2016-10-19 Alex Christensen <achristen...@webkit.org>
Re-enable URLParser for non-Safari Cocoa apps after r207321
Modified: trunk/Tools/gtk/jhbuild.modules (207588 => 207589)
--- trunk/Tools/gtk/jhbuild.modules 2016-10-20 07:26:55 UTC (rev 207588)
+++ trunk/Tools/gtk/jhbuild.modules 2016-10-20 08:30:13 UTC (rev 207589)
@@ -199,15 +199,13 @@
<autotools id="glib"
autogen-sh="configure"
- autogenargs="--disable-dtrace">
+ autogenargs="--disable-dtrace --disable-libmount">
<dependencies>
<dep package="libffi"/>
</dependencies>
- <branch module="/pub/GNOME/sources/glib/2.44/glib-2.44.1.tar.xz" version="2.44.1"
+ <branch module="/pub/GNOME/sources/glib/2.50/glib-2.50.1.tar.xz" version="2.50.1"
repo="ftp.gnome.org"
- hash="sha256:8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07">
- <patch file="glib-warning-fix.patch" strip="1"/>
- <patch file="gdate-suppress-string-format-literal-warning.patch" strip="1"/>
+ hash="sha256:2ef87a78f37c1eb5b95f4cc95efd5b66f69afad9c9c0899918d04659cf6df7dd">
</branch>
</autotools>
Deleted: trunk/Tools/gtk/patches/gdate-suppress-string-format-literal-warning.patch (207588 => 207589)
--- trunk/Tools/gtk/patches/gdate-suppress-string-format-literal-warning.patch 2016-10-20 07:26:55 UTC (rev 207588)
+++ trunk/Tools/gtk/patches/gdate-suppress-string-format-literal-warning.patch 2016-10-20 08:30:13 UTC (rev 207589)
@@ -1,29 +0,0 @@
-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
-
Deleted: trunk/Tools/gtk/patches/glib-warning-fix.patch (207588 => 207589)
--- trunk/Tools/gtk/patches/glib-warning-fix.patch 2016-10-20 07:26:55 UTC (rev 207588)
+++ trunk/Tools/gtk/patches/glib-warning-fix.patch 2016-10-20 08:30:13 UTC (rev 207589)
@@ -1,34 +0,0 @@
-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
