x11: Remove XDamage dependency

It's not used.

diff --git a/config.h.meson b/config.h.meson
index ebafd3eac6f6f5dd8ae1d74ffd1d5982534ccf38..175d3a5c433e6b3a34a8bd4216ef34d9b9940e0c 100644 (file)
--- 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 865021bb558035cf725ba6a724696ec8dfdde562..ce7a463996e9b9aefdfe6880f693a605436bd3bd 100644 (file)
--- 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 4495a8b1a21d0d6d2a5da57e69da1c849c9c2268..272646b65f989917bb4df2ddce02cc5762ddbc3b 100644 (file)
--- 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 2e5113346b635628ca65f827afcd5bb9bb920c72..3ad63bfa0ad4a7f0e74d53117add62cd2d2d02c5 100644 (file)
--- 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 13f74f66a4030a085296c7b989eba9ea7bf429a6..627864b3d6cfba66c341ef50ac3c0b7abab110bc 100644 (file)
--- 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 f846450c3bfa0910c06ca63fa23249198f5f75b2..c3f2c54b7313c8fc86e4b8653070d4d102329339 100644 (file)
--- 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 fcd3fe20521ea840de418f8707b4cf9bc9ca5457..d615368630ecfd9e1dfb12c568830656a0cd943b 100644 (file)
--- 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())