mako: update, remove unneeded patch

This commit is contained in:
Markus Volk 2022-01-19 13:31:18 +01:00
parent 7a368ae7bd
commit 3b463656cd
2 changed files with 1 additions and 28 deletions

View File

@ -1,26 +0,0 @@
From a8fa47e90bddccfe6dd9f267dd7a189793c8adca Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Mon, 2 Aug 2021 06:59:38 +0200
Subject: [PATCH] meson.build: fix scdoc not to be found
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 180f0fb..0973213 100644
--- a/meson.build
+++ b/meson.build
@@ -130,7 +130,7 @@ configure_file(
install_dir: datadir + '/dbus-1/services',
)
-scdoc = dependency('scdoc', required: get_option('man-pages'), version: '>= 1.9.7')
+scdoc = dependency('scdoc', native: true, required: get_option('man-pages'), version: '>= 1.9.7')
if scdoc.found()
sh = find_program('sh')
--
2.25.1

View File

@ -9,7 +9,6 @@ REQUIRED_DISTRO_FEATURES = "wayland"
SRC_URI = " \ SRC_URI = " \
git://github.com/emersion/mako.git;protocol=https;branch=master \ git://github.com/emersion/mako.git;protocol=https;branch=master \
file://0001-meson.build-fix-scdoc-not-to-be-found.patch \
" "
DEPENDS = " \ DEPENDS = " \
@ -41,7 +40,7 @@ PACKAGECONFIG ?= " \
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
PV = "1.6" PV = "1.6"
SRCREV = "v${PV}" SRCREV = "ddc1849804c8703ec749140e3a55febb5250e934"
EXTRA_OEMESON += "--buildtype release" EXTRA_OEMESON += "--buildtype release"