[GTK] Bump glib to 2.50.1
authorrego@igalia.com <rego@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Oct 2016 08:30:13 +0000 (08:30 +0000)
committerrego@igalia.com <rego@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Oct 2016 08:30:13 +0000 (08:30 +0000)
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.

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

Tools/ChangeLog
Tools/gtk/jhbuild.modules
Tools/gtk/patches/gdate-suppress-string-format-literal-warning.patch [deleted file]
Tools/gtk/patches/glib-warning-fix.patch [deleted file]

index 4694e18..61076fe 100644 (file)
@@ -1,3 +1,17 @@
+2016-10-20  Manuel Rego Casasnovas  <rego@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  <achristensen@webkit.org>
 
         Re-enable URLParser for non-Safari Cocoa apps after r207321
index a837dda..270f774 100644 (file)
 
   <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>
 
diff --git a/Tools/gtk/patches/gdate-suppress-string-format-literal-warning.patch b/Tools/gtk/patches/gdate-suppress-string-format-literal-warning.patch
deleted file mode 100644 (file)
index 90cb951..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3a7efd598d39366c2c9de0def2fdfb35e5e9f2a1 Mon Sep 17 00:00:00 2001
-From: coypu <coypu@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
-
diff --git a/Tools/gtk/patches/glib-warning-fix.patch b/Tools/gtk/patches/glib-warning-fix.patch
deleted file mode 100644 (file)
index 8faf4d1..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9f90ee5eeccd47f39c7a03dcd786b125a19c195d Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@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