| Message ID | 20230101233653.487175-9-ricardo.martincoski@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | check-package: warn about symbols not recognized by a package infra | expand |
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes: > Commit "170777f342 package/qt5/qt5virtualkeyboard: convert to qmake > infrastructure" changed most but not all <pkg>_QMAKEFLAGS to > <pkg>_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 <giulio.benetti@benettiengineering.com> > Cc: Julien Corjon <corjon.j@ecagroup.com> > Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> Committed, thanks.
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes: > Commit "170777f342 package/qt5/qt5virtualkeyboard: convert to qmake > infrastructure" changed most but not all <pkg>_QMAKEFLAGS to > <pkg>_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 <giulio.benetti@benettiengineering.com> > Cc: Julien Corjon <corjon.j@ecagroup.com> > Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> Committed to 2022.11.x and 2022.02.x, thanks.
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)
Commit "170777f342 package/qt5/qt5virtualkeyboard: convert to qmake infrastructure" changed most but not all <pkg>_QMAKEFLAGS to <pkg>_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 <giulio.benetti@benettiengineering.com> Cc: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> --- Tested using this minimal config: BR2_x86_i686=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5VIRTUALKEYBOARD=y that is expected to compile/install only en_GB layout. |--- output.before/build/packages-file-list.txt.sorted |+++ output.after/build/packages-file-list.txt.sorted |@@ -3647,5 +3646,0 @@ |-qt5virtualkeyboard,./usr/lib/cmake/Qt5VirtualKeyboard/Qt5VirtualKeyboard_QtVirtualKeyboardHangulPlugin.cmake |-qt5virtualkeyboard,./usr/lib/cmake/Qt5VirtualKeyboard/Qt5VirtualKeyboard_QtVirtualKeyboardOpenWnnPlugin.cmake |-qt5virtualkeyboard,./usr/lib/cmake/Qt5VirtualKeyboard/Qt5VirtualKeyboard_QtVirtualKeyboardPinyinPlugin.cmake |-qt5virtualkeyboard,./usr/lib/cmake/Qt5VirtualKeyboard/Qt5VirtualKeyboard_QtVirtualKeyboardTCImePlugin.cmake |-qt5virtualkeyboard,./usr/lib/cmake/Qt5VirtualKeyboard/Qt5VirtualKeyboard_QtVirtualKeyboardThaiPlugin.cmake |@@ -3660,5 +3654,0 @@ |-qt5virtualkeyboard,./usr/lib/qt/plugins/virtualkeyboard/libqtvirtualkeyboard_hangul.so |-qt5virtualkeyboard,./usr/lib/qt/plugins/virtualkeyboard/libqtvirtualkeyboard_openwnn.so |-qt5virtualkeyboard,./usr/lib/qt/plugins/virtualkeyboard/libqtvirtualkeyboard_pinyin.so |-qt5virtualkeyboard,./usr/lib/qt/plugins/virtualkeyboard/libqtvirtualkeyboard_tcime.so |-qt5virtualkeyboard,./usr/lib/qt/plugins/virtualkeyboard/libqtvirtualkeyboard_thai.so build test: 44 builds, 29 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/731801232 test-pkg config: BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5VIRTUALKEYBOARD=y --- package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)