From 86a5ab90360c664e4c92e7acc4143cc30c2da71b Mon Sep 17 00:00:00 2001
From: Jaimos Skriletz <jaimosskriletz@gmail.com>
Date: Sat, 2 Nov 2024 09:06:54 -0600
Subject: [PATCH] Make xkbcommon required in meson.

Make xkbcommon a required dependency in meson. Move xext output into
the dependencies block (missed when it was made required). Update
INSTALL.md with this change and include some missing dependencies.
---
 dev-docs/INSTALL.md |  3 +++
 meson.build         | 15 +++++++--------
 meson.options       |  6 ------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/dev-docs/INSTALL.md b/dev-docs/INSTALL.md
index 165f19203..b684dc085 100644
--- a/dev-docs/INSTALL.md
+++ b/dev-docs/INSTALL.md
@@ -29,6 +29,7 @@ system in use.
 * libx11-dev
 * libxext-dev
 * libxft-dev
+* libxkbcommon-dev
 * libxrandr-dev (>= 1.5)
 * libxrender-dev
 * libxt-dev
@@ -37,6 +38,7 @@ system in use.
 ## Optional dependencies
 
 * asciidoctor
+* golang
 * libfribidi-dev
 * libncurses5-dev
 * libpng-dev
@@ -44,6 +46,7 @@ system in use.
 * librsvg-dev
 * libsm-dev
 * libxcursor-dev
+* libxfixes-dev
 * libxi-dev
 * libxpm-dev
 * sharutils
diff --git a/meson.build b/meson.build
index df88939b1..9f85adcd4 100644
--- a/meson.build
+++ b/meson.build
@@ -188,6 +188,7 @@ endif
 all_found_deps = []
 
 # Required dependencies, we can easily iterate over these.
+
 summary_depvals = {}
 all_req_deps = ['fontconfig', 'ice', 'libevent', 'x11', 'xft', 'xrandr', 'xt']
 foreach rd : all_req_deps
@@ -199,8 +200,14 @@ endforeach
 
 xext = dependency('xext', required: true)
 all_found_deps += xext
+summary_depvals += {'xext': xext}
 conf.set10('SHAPE', true)
 
+xkbcommon = dependency('xkbcommon', required: true)
+all_found_deps += xkbcommon
+summary_depvals += {'xkbcommon': xkbcommon}
+conf.set10('HAVE_X11_XKBLIB_H', true)
+
 # Python is a required dependency, we generate shebangs at buildtime
 # This will error by default if there is no python interpreter found
 py_mod = import('python')
@@ -354,12 +361,6 @@ if xfixes.found()
     conf.set10('HAVE_XFIXES', true)
 endif
 
-xkbcommon = dependency('xkbcommon', required: get_option('xkbcommon'))
-if xkbcommon.found()
-    all_found_deps += xkbcommon
-    conf.set10('HAVE_X11_XKBLIB_H', true)
-endif
-
 xpm = dependency('xpm', required: get_option('xpm'))
 if xpm.found()
     all_found_deps += xpm
@@ -571,11 +572,9 @@ featurevals = {
     'NLS': libintl.found(),
     'PNG support': libpng.found() ? libpng : false,
     'Session Management': sm.found() ? sm : false,
-    'Shaped Windows': xext.found() ? xext : false,
     'SVG support': librsvg.found() ? librsvg : false,
     'Xcursor': xcursor.found() ? xcursor : false,
     'XFixes': xfixes.found() ? xfixes : false,
-    'xkbcommon': xkbcommon.found() ? xkbcommon : false,
     'XPM support': xpm.found() ? xpm : false,
     'XRender': xrender.found() ? xrender : false,
 }
diff --git a/meson.options b/meson.options
index 838e4d8d0..17823077b 100644
--- a/meson.options
+++ b/meson.options
@@ -94,12 +94,6 @@ option(
     value: 'auto',
     description: 'Enable XFixes support',
 )
-option(
-    'xkbcommon',
-    type: 'feature',
-    value: 'auto',
-    description: 'Enable xkbcommon support',
-)
 option(
     'xrender',
     type: 'feature',