From 6ca52f5500c756f88e0166aa9eaf61151ff96eef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 10 Jan 2022 18:10:20 +0100 Subject: [PATCH] kdoctools: apply meinproc5-patch on native too MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...set-meinproc5-executable-so-that-it-can-be-found-for.patch} | 0 ... => 0003-Make-our-cross-build-find-docbookl10nhelper.patch} | 0 recipes-kde/kf5/tier2/kdoctools/kdoctools.bb | 3 +-- recipes-kde/kf5/tier2/kdoctools/kdoctools.inc | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) rename recipes-kde/kf5/tier2/kdoctools/files/{0003-set-meinproc5-executable-so-that-it-can-be-found-for.patch => 0002-set-meinproc5-executable-so-that-it-can-be-found-for.patch} (100%) rename recipes-kde/kf5/tier2/kdoctools/files/{0002-Make-our-cross-build-find-docbookl10nhelper.patch => 0003-Make-our-cross-build-find-docbookl10nhelper.patch} (100%) diff --git a/recipes-kde/kf5/tier2/kdoctools/files/0003-set-meinproc5-executable-so-that-it-can-be-found-for.patch b/recipes-kde/kf5/tier2/kdoctools/files/0002-set-meinproc5-executable-so-that-it-can-be-found-for.patch similarity index 100% rename from recipes-kde/kf5/tier2/kdoctools/files/0003-set-meinproc5-executable-so-that-it-can-be-found-for.patch rename to recipes-kde/kf5/tier2/kdoctools/files/0002-set-meinproc5-executable-so-that-it-can-be-found-for.patch diff --git a/recipes-kde/kf5/tier2/kdoctools/files/0002-Make-our-cross-build-find-docbookl10nhelper.patch b/recipes-kde/kf5/tier2/kdoctools/files/0003-Make-our-cross-build-find-docbookl10nhelper.patch similarity index 100% rename from recipes-kde/kf5/tier2/kdoctools/files/0002-Make-our-cross-build-find-docbookl10nhelper.patch rename to recipes-kde/kf5/tier2/kdoctools/files/0003-Make-our-cross-build-find-docbookl10nhelper.patch diff --git a/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb b/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb index 169e9d0f..4d90ba1b 100644 --- a/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb +++ b/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb @@ -5,8 +5,7 @@ DEPENDS += "${BPN}-native gettext-native karchive ki18n libxslt libxml2" inherit cmake_lib SRC_URI += " \ - file://0002-Make-our-cross-build-find-docbookl10nhelper.patch \ - file://0003-set-meinproc5-executable-so-that-it-can-be-found-for.patch \ + file://0003-Make-our-cross-build-find-docbookl10nhelper.patch \ file://0004-Add-cmdline-param-to-help-find-xsl.patch \ " diff --git a/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc b/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc index db315705..c80e94e3 100644 --- a/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc +++ b/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc @@ -15,6 +15,7 @@ DEPENDS += "docbook-xml-dtd4 docbook-xsl-stylesheets liburi-perl-native" PV = "${KF5_VERSION}" SRC_URI[sha256sum] = "1a74ff1d5ac8c0639ff8a3430f5226480844119010605f911ed7a2ca684d4ad0" +SRC_URI += "file://0002-set-meinproc5-executable-so-that-it-can-be-found-for.patch" # allarch packages do only install into machine sysroot # for xml4