From 80d5f326e8e48d7ce396426e1eea65631246a1dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 8 Nov 2018 18:53:45 +0100
Subject: [PATCH] clutter: Assume XGE is available at build time

Almost a decade old, lets just assume it's there. This makes the button
on cally-atktext-example work again when building with meson, and
probably other things too.
---
 clutter/clutter/x11/clutter-event-x11.c | 10 ----------
 clutter/configure.ac                    |  8 --------
 2 files changed, 18 deletions(-)

diff --git a/clutter/clutter/x11/clutter-event-x11.c b/clutter/clutter/x11/clutter-event-x11.c
index 3636ff344..1ced9a477 100644
--- a/clutter/clutter/x11/clutter-event-x11.c
+++ b/clutter/clutter/x11/clutter-event-x11.c
@@ -167,11 +167,9 @@ clutter_x11_handle_event (XEvent *xevent)
   ClutterBackend *backend;
   ClutterEvent *event;
   gint spin = 1;
-#ifdef HAVE_XGE
   ClutterBackendX11 *backend_x11;
   Display *xdisplay;
   gboolean allocated_event;
-#endif
 
   /* The return values here are someone approximate; we return
    * CLUTTER_X11_FILTER_REMOVE if a clutter event is
@@ -190,12 +188,10 @@ clutter_x11_handle_event (XEvent *xevent)
 
   event = clutter_event_new (CLUTTER_NOTHING);
 
-#ifdef HAVE_XGE
   backend_x11 = CLUTTER_BACKEND_X11 (backend);
   xdisplay = backend_x11->xdpy;
 
   allocated_event = XGetEventData (xdisplay, &xevent->xcookie);
-#endif
 
   if (_clutter_backend_translate_event (backend, xevent, event))
     {
@@ -226,10 +222,8 @@ clutter_x11_handle_event (XEvent *xevent)
     }
 
 out:
-#ifdef HAVE_XGE
   if (allocated_event)
     XFreeEventData (xdisplay, &xevent->xcookie);
-#endif
 
   _clutter_threads_release_lock ();
 
@@ -286,18 +280,14 @@ events_queue (ClutterBackendX11 *backend_x11)
 
       event = clutter_event_new (CLUTTER_NOTHING);
 
-#ifdef HAVE_XGE
       XGetEventData (xdisplay, &xevent.xcookie);
-#endif
 
       if (_clutter_backend_translate_event (backend, &xevent, event))
         _clutter_event_push (event, FALSE);
       else
         clutter_event_free (event);
 
-#ifdef HAVE_XGE
       XFreeEventData (xdisplay, &xevent.xcookie);
-#endif
     }
 }
 
diff --git a/clutter/configure.ac b/clutter/configure.ac
index 6e44e0165..d37374417 100644
--- a/clutter/configure.ac
+++ b/clutter/configure.ac
@@ -320,14 +320,6 @@ AS_IF([test "x$SUPPORT_X11" = "x1"],
         clutter_save_LIBS="$LIBS"
         LIBS="$LIBS $X11_LIBS"
 
-        have_xge=no
-        AC_CHECK_FUNC([XGetEventData],
-                      [
-                        AC_DEFINE([HAVE_XGE], [1], [Define to 1 if X Generic Extensions is available])
-                        have_xge=yes
-                        X11_EXTS="$X11_EXTS xge"
-                      ])
-
         CPPFLAGS="$clutter_save_CPPFLAGS"
         LIBS="$clutter_save_LIBS"