From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 8 Dec 2018 23:29:07 +0000 (-0800)
Subject: Suppress WebKitGTK+ 2.21.1 diagnostics
X-Git-Tag: emacs-27.0.90~4021
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a9732737f2b48a78de72d67f6ed950495788ed1d;p=emacs.git

Suppress WebKitGTK+ 2.21.1 diagnostics

* src/xwidget.c: Suppress deprecation warnings (Bug#33679).
---

diff --git a/src/xwidget.c b/src/xwidget.c
index 6da7a0bb3f4..5a8b105f2fa 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -30,6 +30,14 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include <webkit2/webkit2.h>
 #include <JavaScriptCore/JavaScript.h>
 
+/* Suppress GCC deprecation warnings starting in WebKitGTK+ 2.21.1 for
+   webkit_javascript_result_get_global_context and
+   webkit_javascript_result_get_value (Bug#33679).
+   FIXME: Use the JavaScriptCore GLib API instead, and remove this hack.  */
+#if WEBKIT_CHECK_VERSION (2, 21, 1) && GNUC_PREREQ (4, 2, 0)
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 static struct xwidget *
 allocate_xwidget (void)
 {