From 170777f342467bf932e48c1946477f913e8c0dff Mon Sep 17 00:00:00 2001 From: Andreas Naumann Date: Mon, 17 Feb 2020 22:23:30 +0100 Subject: [PATCH] package/qt5/qt5virtualkeyboard: convert to qmake infrastructure It seems the old method was missing some files from the install step since after the conversion the following additional files appear in target after a build with all config options selected: usr/lib/qt/plugins/lipi_toolkit/libactivedtw.so usr/lib/qt/plugins/lipi_toolkit/libboxfld.so usr/lib/qt/plugins/lipi_toolkit/libl7.so usr/lib/qt/plugins/lipi_toolkit/liblipiengine.so usr/lib/qt/plugins/lipi_toolkit/liblogger.so usr/lib/qt/plugins/lipi_toolkit/libneuralnet.so usr/lib/qt/plugins/lipi_toolkit/libnn.so usr/lib/qt/plugins/lipi_toolkit/libnpen.so usr/lib/qt/plugins/lipi_toolkit/libpointfloat.so usr/lib/qt/plugins/lipi_toolkit/libpreproc.so usr/lib/qt/plugins/lipi_toolkit/libsubstroke.so usr/lib/qt/plugins/virtualkeyboard/libqtvirtualkeyboard_lipi.so Signed-off-by: Andreas Naumann Signed-off-by: Thomas Petazzoni --- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 54 ++----------------- 1 file changed, 4 insertions(+), 50 deletions(-) diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 3823b8e017..3984c9866e 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -7,7 +7,7 @@ QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz -QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5base qt5declarative qt5svg +QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 @@ -34,59 +34,13 @@ endif endif ifeq ($(BR2_PACKAGE_QT5VIRTUALKEYBOARD_HANDWRITING),y) -QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES -QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+=handwriting +QT5VIRTUALKEYBOARD_CONF_OPTS += CONFIG+=handwriting QT5VIRTUALKEYBOARD_LICENSE += , MIT (lipi-toolkit) QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/MIT_LICENSE.txt endif ifeq ($(BR2_PACKAGE_QT5VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION),y) -QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+=arrow-key-navigation +QT5VIRTUALKEYBOARD_CONF_OPTS += CONFIG+=arrow-key-navigation endif -ifeq ($(QT5VIRTUALKEYBOARD_3RDPARTY_PARTS),YES) -define QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS - cp -dpfr $(STAGING_DIR)/usr/qtvirtualkeyboard $(TARGET_DIR)/usr -endef -endif - -define QT5VIRTUALKEYBOARD_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake $(QT5VIRTUALKEYBOARD_QMAKEFLAGS)) -endef - -define QT5VIRTUALKEYBOARD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5VIRTUALKEYBOARD_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML - mkdir -p $(TARGET_DIR)/usr/qml/QtQuick - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick/ -endef - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/virtualkeyboard $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifeq ($(BR2_STATIC_LIBS),) -define QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5VirtualKeyboard*.so.* $(TARGET_DIR)/usr/lib -endef -endif - -define QT5VIRTUALKEYBOARD_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so \ - $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts - $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS) - $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML) - $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS) - $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) -- 2.30.2