From: Benjamin Otte <otte@redhat.com>
Date: Sun, 17 May 2020 00:14:16 +0000 (+0200)
Subject: x11: Remove XDamage dependency
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~17^2~16^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=14bf58ec5dfdf19e3ca603b977626608dafc729b;p=gtk4.git

x11: Remove XDamage dependency

It's not used.
---

diff --git a/config.h.meson b/config.h.meson
index ebafd3eac6..175d3a5c43 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -146,9 +146,6 @@
 /* Have the Xcursor library */
 #mesondefine HAVE_XCURSOR
 
-/* Have the XDAMAGE X extension */
-#mesondefine HAVE_XDAMAGE
-
 /* Have the XFIXES X extension */
 #mesondefine HAVE_XFIXES
 
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 865021bb55..ce7a463996 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -73,10 +73,6 @@
 #include <X11/extensions/Xcomposite.h>
 #endif
 
-#ifdef HAVE_XDAMAGE
-#include <X11/extensions/Xdamage.h>
-#endif
-
 #ifdef HAVE_RANDR
 #include <X11/extensions/Xrandr.h>
 #endif
@@ -1485,17 +1481,6 @@ gdk_x11_display_open (const gchar *display_name)
 #endif
     display_x11->have_xcomposite = FALSE;
 
-#ifdef HAVE_XDAMAGE
-  if (XDamageQueryExtension (display_x11->xdisplay,
-			     &display_x11->xdamage_event_base,
-			     &ignore))
-    {
-      display_x11->have_xdamage = TRUE;
-    }
-  else
-#endif
-    display_x11->have_xdamage = FALSE;
-
   display_x11->have_shapes = FALSE;
   display_x11->have_input_shapes = FALSE;
 
diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h
index 4495a8b1a2..272646b65f 100644
--- a/gdk/x11/gdkdisplay-x11.h
+++ b/gdk/x11/gdkdisplay-x11.h
@@ -72,8 +72,6 @@ struct _GdkX11Display
   gint xfixes_event_base;
 
   gboolean have_xcomposite;
-  gboolean have_xdamage;
-  gint xdamage_event_base;
 
   gboolean have_randr12;
   gboolean have_randr13;
diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c
index 2e5113346b..3ad63bfa0a 100644
--- a/gdk/x11/gdksurface-x11.c
+++ b/gdk/x11/gdksurface-x11.c
@@ -71,10 +71,6 @@
 #include <X11/extensions/Xfixes.h>
 #endif
 
-#ifdef HAVE_XDAMAGE
-#include <X11/extensions/Xdamage.h>
-#endif
-
 const int _gdk_x11_event_mask_table[21] =
 {
   ExposureMask,
diff --git a/gdk/x11/gdksurface-x11.h b/gdk/x11/gdksurface-x11.h
index 13f74f66a4..627864b3d6 100644
--- a/gdk/x11/gdksurface-x11.h
+++ b/gdk/x11/gdksurface-x11.h
@@ -31,10 +31,6 @@
 
 #include <X11/Xlib.h>
 
-#ifdef HAVE_XDAMAGE
-#include <X11/extensions/Xdamage.h>
-#endif
-
 #ifdef HAVE_XSYNC
 #include <X11/Xlib.h>
 #include <X11/extensions/sync.h>
@@ -73,10 +69,6 @@ struct _GdkX11Surface
 
   cairo_surface_t *cairo_surface;
 
-#if defined (HAVE_XCOMPOSITE) && defined(HAVE_XDAMAGE) && defined (HAVE_XFIXES)
-  Damage damage;
-#endif
-
   int abs_x;
   int abs_y;
 
diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build
index f846450c3b..c3f2c54b73 100644
--- a/gdk/x11/meson.build
+++ b/gdk/x11/meson.build
@@ -65,7 +65,6 @@ gdk_x11_deps = [
   xext_dep,
   x11_dep,
   xcursor_dep,
-  xdamage_dep,
   xfixes_dep,
   xcomposite_dep,
   xrandr_dep,
diff --git a/meson.build b/meson.build
index fcd3fe2052..d615368630 100644
--- a/meson.build
+++ b/meson.build
@@ -497,7 +497,6 @@ if x11_enabled
   xi_dep         = dependency('xi')
   xext_dep       = dependency('xext')
   xcursor_dep    = dependency('xcursor', required: false)
-  xdamage_dep    = dependency('xdamage', required: false)
   xfixes_dep     = dependency('xfixes', required: false)
   xcomposite_dep = dependency('xcomposite', required: false)
   fontconfig_dep = dependency('fontconfig')
@@ -516,13 +515,9 @@ if x11_enabled
   if xcomposite_dep.found()
     x11_pkgs += ['xcomposite']
   endif
-  if xdamage_dep.found()
-    x11_pkgs += ['xdamage']
-  endif
 
   atk_pkgs += ['atk-bridge-2.0']
 
-  cdata.set('HAVE_XDAMAGE', xdamage_dep.found())
   cdata.set('HAVE_XCURSOR', xcursor_dep.found())
   cdata.set('HAVE_XCOMPOSITE', xcomposite_dep.found())
   cdata.set('HAVE_XFIXES', xfixes_dep.found())