From 51fb0d69feb046acdfb14c27dfbccf9822ba7496 Mon Sep 17 00:00:00 2001 From: Andreas Cord-Landwehr Date: Sat, 5 Oct 2024 11:06:50 +0200 Subject: [PATCH] poppler: adapt to new qt6 build option in 24.04.x --- recipes-support/poppler/poppler_%.bbappend | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes-support/poppler/poppler_%.bbappend b/recipes-support/poppler/poppler_%.bbappend index 7aea21c..ba07f3e 100644 --- a/recipes-support/poppler/poppler_%.bbappend +++ b/recipes-support/poppler/poppler_%.bbappend @@ -1,6 +1,9 @@ -# SPDX-FileCopyrightText: 2020 Andreas Cord-Landwehr +# SPDX-FileCopyrightText: 2020-2024 Andreas Cord-Landwehr # # SPDX-License-Identifier: MIT -PACKAGECONFIG:append = " qt5" +# scarthgap poppler packaging only provides qt5 build option that is conflicting with +# qt6 option for later versions; yet due to the inherit hack the old version builds against qt6 +QT_CONFIG = "${@bb.utils.contains('PV', '23.04.0', 'qt5', 'qt6', d)}" +PACKAGECONFIG:append = " ${QT_CONFIG}" inherit qt6-cmake