From 92219bdf2ece2a0ddfbc45691879a03acd5c7442 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:32 -0300 Subject: [PATCH] package/qt5/qt5virtualkeyboard: really configure language layouts Commit "170777f342 package/qt5/qt5virtualkeyboard: convert to qmake infrastructure" changed most but not all _QMAKEFLAGS to _CONF_OPTS. As a consequence, BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS is ignored and all layouts are compiled in. Some layouts have different licenses (e.g. pinying), so the license information for a build that is configured to not include such layouts is wrong. Change the remaining _QMAKEFLAGS entry, fixing the config for which language layouts are compiled and installed. Cc: Giulio Benetti Cc: Julien Corjon Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index c31d455c4e..3fefdc874d 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -16,7 +16,7 @@ QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS = $(call qstrip,$(BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)) ifneq ($(strip $(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) -QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+="$(foreach lang,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS),lang-$(lang))" +QT5VIRTUALKEYBOARD_CONF_OPTS += CONFIG+="$(foreach lang,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS),lang-$(lang))" ifneq ($(filter ja_JP all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (openwnn)