From 8f10e7c3cb4e593235e578d3bb303bae93d2e89d Mon Sep 17 00:00:00 2001
From: Přemysl Eric Janouch <p@janouch.name>
Date: Wed, 14 Jun 2023 09:26:23 +0200
Subject: Make xF a first-class citizen

---
 README.adoc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'README.adoc')

diff --git a/README.adoc b/README.adoc
index eae2c82..172224a 100644
--- a/README.adoc
+++ b/README.adoc
@@ -33,8 +33,9 @@ including link:xC.adoc#_key_bindings[keyboard shortcuts].
 
 image::xP.webp[align="center"]
 
-xA, xW, xM
-----------
+<<<<<<< HEAD
+xA, xF, xW, xM
+--------------
 The native frontends for 'xC'.  Using them is not recommended.
 
 xD
@@ -85,16 +86,17 @@ or as a https://git.janouch.name/p/nixexprs[Nix derivation].
 Building
 --------
 Build-only dependencies: CMake, pkg-config, awk, liberty (included),
- asciidoctor or asciidoc (recommended but optional) +
+ asciidoctor or asciidoc (recommended but optional), rsvg-convert (for 'xF') +
 Common runtime dependencies: openssl +
 Additionally for 'xC': curses, libffi, readline >= 6.0 or libedit >= 2013-07-12,
  lua >= 5.3 (optional) +
+Additionally for 'xF': x11, xrender, xft, fontconfig, libpng
 
  $ git clone --recursive https://git.janouch.name/p/xK.git
  $ mkdir xK/build
  $ cd xK/build
  $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DWANT_READLINE=ON -DWANT_LIBEDIT=OFF -DWITH_LUA=ON
+            -DWANT_READLINE=ON -DWANT_LIBEDIT=OFF -DWITH_LUA=ON -DWITH_XF=OFF
  $ make
 
 To install the application, you can do either the usual:
-- 
cgit v1.2.3-70-g09d2