From e7851526638b8e7ea6497997cade47f2d775c2be Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Fri, 18 Jun 2021 10:56:15 +0200
Subject: [PATCH] foot: make use of scdoc

---
 ...1-meson.build-avoid-scdoc-dependency.patch | 28 ----------------
 recipes-support/foot/fcft_git.bb              |  2 +-
 ...1-meson.build-avoid-scdoc-dependency.patch | 33 -------------------
 recipes-support/foot/foot_git.bb              |  2 +-
 4 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 recipes-support/foot/fcft/0001-meson.build-avoid-scdoc-dependency.patch
 delete mode 100644 recipes-support/foot/foot/0001-meson.build-avoid-scdoc-dependency.patch

diff --git a/recipes-support/foot/fcft/0001-meson.build-avoid-scdoc-dependency.patch b/recipes-support/foot/fcft/0001-meson.build-avoid-scdoc-dependency.patch
deleted file mode 100644
index 029c48c..0000000
--- a/recipes-support/foot/fcft/0001-meson.build-avoid-scdoc-dependency.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8b19cc784d4f0b56e45e22c911b7f9671ae92ca4 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Sun, 6 Jun 2021 18:23:06 +0200
-Subject: [PATCH] meson.build: avoid scdoc dependency
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
----
- meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 11ac4cb..8a14738 100644
---- a/meson.build
-+++ b/meson.build
-@@ -123,9 +123,8 @@ if not meson.is_subproject()
- 
-   install_data(
-     'LICENSE', 'README.md', 'CHANGELOG.md',
--    install_dir: join_paths(get_option('datadir'), 'doc', 'fcft'))
-+    install_dir: join_paths(get_option('datadir'), 'fcft'))
- 
--  subdir('doc')
- endif
- 
- summary(
--- 
-2.25.1
-
diff --git a/recipes-support/foot/fcft_git.bb b/recipes-support/foot/fcft_git.bb
index 471372e..1a89840 100644
--- a/recipes-support/foot/fcft_git.bb
+++ b/recipes-support/foot/fcft_git.bb
@@ -12,11 +12,11 @@ DEPENDS = " \
 	harfbuzz \
 	pixman \
 	tllist \
+	scdoc-native \
 "
 
 SRC_URI = " \
 	git://codeberg.org/dnkl/fcft.git;protocol=https \
-	file://0001-meson.build-avoid-scdoc-dependency.patch \
 "
 
 S = "${WORKDIR}/git"
diff --git a/recipes-support/foot/foot/0001-meson.build-avoid-scdoc-dependency.patch b/recipes-support/foot/foot/0001-meson.build-avoid-scdoc-dependency.patch
deleted file mode 100644
index c5207de..0000000
--- a/recipes-support/foot/foot/0001-meson.build-avoid-scdoc-dependency.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From bd5d23cc82e9f7c065571b6695fe024c6f51051e Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Sun, 6 Jun 2021 18:25:08 +0200
-Subject: [PATCH] meson.build: avoid scdoc dependency
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
----
- meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 50cc9eb..993b7fd 100644
---- a/meson.build
-+++ b/meson.build
-@@ -220,14 +220,13 @@ endif
- 
- install_data(
-   'LICENSE', 'README.md', 'CHANGELOG.md',
--  install_dir: join_paths(get_option('datadir'), 'doc', 'foot'))
-+  install_dir: join_paths(get_option('datadir'), 'foot'))
- install_data(
-   'foot.desktop', 'foot-server.desktop',
-   install_dir: join_paths(get_option('datadir'), 'applications'))
- install_data('foot.ini', install_dir: join_paths(get_option('datadir'), 'foot'))
- 
- subdir('completions')
--subdir('doc')
- subdir('icons')
- 
- summary(
--- 
-2.25.1
-
diff --git a/recipes-support/foot/foot_git.bb b/recipes-support/foot/foot_git.bb
index ab8066f..5076c8a 100644
--- a/recipes-support/foot/foot_git.bb
+++ b/recipes-support/foot/foot_git.bb
@@ -16,13 +16,13 @@ DEPENDS = " \
 	pixman \
 	wayland \
 	wayland-native \
+	scdoc-native \
 "
 
 RRECOMMENDS_${PN} = "xdg-utils"
 
 SRC_URI = " \
 	git://codeberg.org/dnkl/foot.git;protocol=https \
-	file://0001-meson.build-avoid-scdoc-dependency.patch \
 "
 
 S = "${WORKDIR}/git"