Title: [185550] trunk/Tools
- Revision
- 185550
- Author
- [email protected]
- Date
- 2015-06-15 06:09:39 -0700 (Mon, 15 Jun 2015)
Log Message
[GTK] Fix deprecated-register warning in the generated WebKitMarshal.cpp
https://bugs.webkit.org/show_bug.cgi?id=145922
Reviewed by Carlos Garcia Campos.
* gtk/jhbuild.modules:
* gtk/patches/glib-warning-fix.patch: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (185549 => 185550)
--- trunk/Tools/ChangeLog 2015-06-15 11:20:34 UTC (rev 185549)
+++ trunk/Tools/ChangeLog 2015-06-15 13:09:39 UTC (rev 185550)
@@ -1,3 +1,13 @@
+2015-06-15 Csaba Osztrogonác <[email protected]>
+
+ [GTK] Fix deprecated-register warning in the generated WebKitMarshal.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=145922
+
+ Reviewed by Carlos Garcia Campos.
+
+ * gtk/jhbuild.modules:
+ * gtk/patches/glib-warning-fix.patch: Added.
+
2015-06-12 Alexey Proskuryakov <[email protected]>
Update springLoadingHighlight type
Modified: trunk/Tools/gtk/jhbuild.modules (185549 => 185550)
--- trunk/Tools/gtk/jhbuild.modules 2015-06-15 11:20:34 UTC (rev 185549)
+++ trunk/Tools/gtk/jhbuild.modules 2015-06-15 13:09:39 UTC (rev 185550)
@@ -172,7 +172,9 @@
<branch module="/pub/GNOME/sources/glib/2.41/glib-2.41.2.tar.xz" version="2.41.2"
repo="ftp.gnome.org"
hash="sha256:da1f7258655f0e196b9304cb9515784634f3797437923e236bb3466348811c96"
- md5sum="9636f60e99b98fd0fdb5239f905ac008"/>
+ md5sum="9636f60e99b98fd0fdb5239f905ac008">
+ <patch file="glib-warning-fix.patch" strip="1"/>
+ </branch>
</autotools>
<autotools id="glib-networking">
Added: trunk/Tools/gtk/patches/glib-warning-fix.patch (0 => 185550)
--- trunk/Tools/gtk/patches/glib-warning-fix.patch (rev 0)
+++ trunk/Tools/gtk/patches/glib-warning-fix.patch 2015-06-15 13:09:39 UTC (rev 185550)
@@ -0,0 +1,34 @@
+From 9f90ee5eeccd47f39c7a03dcd786b125a19c195d Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <[email protected]>
+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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
