From patchwork Fri Mar 13 20:44:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1254673 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=Bj8qx+fs; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48fHkH1ktjz9sP7 for ; Sat, 14 Mar 2020 07:44:39 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A932489820; Fri, 13 Mar 2020 20:44:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cJDrGoeR4f4W; Fri, 13 Mar 2020 20:44:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6712B8981B; Fri, 13 Mar 2020 20:44:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 1C31B1BF2C2 for ; Fri, 13 Mar 2020 20:44:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 478FE87EF0 for ; Fri, 13 Mar 2020 20:44:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3ymSYbCcKXSG for ; Fri, 13 Mar 2020 20:44:23 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by whitealder.osuosl.org (Postfix) with ESMTPS id A394C87EE6 for ; Fri, 13 Mar 2020 20:44:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1584132257; bh=kmh0b7QO03etHKlyNNde3VGvSUZwDBA6ssn2y4t7/6Q=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=Bj8qx+fsFxXuaO6X7crd5RuStGYUL6Iu63OKw7E8bizu2rdzqE2fw2XGzwO+5ZQo2 M/YuVLiNRVJsn1pzjYYjwngnYf7DcaovD6/1X95d471OCGsIU+qBbG7YuzE6Gw9X+e MkGphiD7V/vBkU7AiuYdMClNBymEkPLncixU3PMU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.9]) by mail.gmx.com (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MeU4y-1jn1KX2o7Q-00aS1U; Fri, 13 Mar 2020 21:44:17 +0100 From: Peter Seiderer To: buildroot@busybox.net Date: Fri, 13 Mar 2020 21:44:15 +0100 Message-Id: <20200313204415.2036-1-ps.report@gmx.net> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:hiZI9uotHPSr+Sqpts0wCHNgyBJ1H/A6RR9vI21liij1qFKoR3s Y199H+rqjn18BhSqWbMO59UNW1HowEj55w+BtIgF1VP05H7g3UHPIA8o36Hiy0NRB4+48n/ rJIBxnItqNNPCD49JfccEaPci5PFre1LyRygXc9vnv9iCwFlEYplNoc/ufgxNFnJOEMz75C nheobL9qarkEOdJDJl/fQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:+BSF9ZWKUhs=:3NTd5ppE4FokInT2529uRZ VnOaESj7jJH+vWSMiVurn52eeZ5WqxLbpgOVUe74uay1FCtExFCtZAqs4XMMYcNQTvG6wvtfv rXH4b5t5DC/hmFBbjRMNNZD48qHAkHScj2Yzpphc+eFBlZ/zCU2zOmax8s1cNUp7GtfvNtW69 dQmITzWCywKXyTI97JzBfb9gNloLMHhnpmtQgmJKWnV974Qb9QCV99ND3IKJRcnexj/LJj0Hz +f6CoCpA39QeriBW8pQp5lNVTxGsB8mOAtXPB+nQUnaRP58ItxR2m4ZwDlhBgNcTTzBRAqIlg AM/1s1jnJPbwlHuSMNdfxX9Q/GeLaontgiZMv98SA+Gf7shoHnlzN8gSo/V1ZD0OjNqzyLKKJ mACMJpx8u69hJPW8OKPME7hHhgSZsahkMm05XRvVDOsu/x9bFtsrLtVx7RrPpG2GcViU3sLaL mS2+n8FmyurChzInJ2pOBOvNoJ9IC+3kSKU2fqBopcvFNT1Y/gquKYIFNkdOkEQSzRDTKn2RM hdmnpCFKgex2E7byPPPLtz9RA83QEkxopFM/iCfw6t5e6Lg+Uwq/D3F2HysytBoNqU5yzeeZl cJJPJJ6ny/j3DVdKy/UTWsJbUBNreOwekduRI9wPz/PkdRKy4ZbhzRQgk7xM9U3syx936f6WG 027imKAVPqLcdfEMELtBFGXWH9Pa3ntRJEtbRTpeBYOdefQAS4PROFHKbqZ4A1FFYzcPrjfB3 wanzHsgXJd/bKGgZopEHwwXeYkfhQ6gfFgTw8skxuBzjjZOzVb/qrVBrpIsxMklGv0xpgnLRo Z8YnBgnfECvgSrwLCcIBg63Kg4XqTpbZ3UHt4qijKFabQjhGwrapu2vUbBVEObAgN7yPJVQ6w vwZCXUz5YCt5w/785GoJw7bpNiqpN94XSLr3ldgY512eJZzNQxR6YEoBteHGdLh1+Rt0l/O6y AGlb/DBcE8r0PU39i7k1+10qJtWrEynC7/r+jEPvmCzTyDcWB6KO2y+KcLmP8BLPZwnS1DPh+ b/IZJYkBvwzsWDZB/J0ZN59o/uSg11qufmRU4shWu1CcKetDXeIbtW2l5YFb/12YyqRGrawvs dWxK82T+3Rj/NgM/96mRqdt7QpnxxZnOFJmQlN7ZwSzqNCP9oPMuzXK3oeBHBoP5kY34XambF aaKX2k5ltG0H/7RRxZbV0vorceDheSuEu7nv9HqhyV5oKrJp9w+bdzQHpIkUhjzQvyjyjBV0e eEslQ8P3UkoiJo2CE Subject: [Buildroot] [PATCH-for-2020.02.x v2] package/qt5xmlpatterns: enable qml module X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nimaim , Julien Corjon Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" qt5declarative: - remove unneded dependency on qt5mlpatterns qt5xmlpatterns: - add optional dependency on qt5declarative - add target install step of the optional qml files Reported-by: Nimai Mahajan Signed-off-by: Peter Seiderer Tested-by: Nimai Mahajan --- Changes v1 -> v2: - add Reported-by - s/=/+=/ for qt5declarative dependency --- package/qt5/qt5declarative/Config.in | 1 - package/qt5/qt5declarative/qt5declarative.mk | 2 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 11 +++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in index 3a353a8326..d85f4c7136 100644 --- a/package/qt5/qt5declarative/Config.in +++ b/package/qt5/qt5declarative/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_QT5DECLARATIVE bool "qt5declarative" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - select BR2_PACKAGE_QT5XMLPATTERNS select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI help diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 6210611961..200a5578f8 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -7,7 +7,7 @@ QT5DECLARATIVE_VERSION = $(QT5_VERSION) QT5DECLARATIVE_SITE = $(QT5_SITE) QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz -QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns +QT5DECLARATIVE_DEPENDENCIES = qt5base QT5DECLARATIVE_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 6ed247fd59..5ce4064cb6 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -21,6 +21,10 @@ ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5XMLPATTERNS_LICENSE += , BSD-3-Clause (examples) endif +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) +QT5XMLPATTERNS_DEPENDENCIES += qt5declarative +endif + define QT5XMLPATTERNS_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) endef @@ -39,6 +43,12 @@ define QT5XMLPATTERNS_INSTALL_TARGET_LIBS endef endif +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) +define QT5XMLPATTERNS_INSTALL_TARGET_QMLS + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/XmlListModel $(TARGET_DIR)/usr/qml/QtQuick +endef +endif + ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) define QT5XMLPATTERNS_INSTALL_TARGET_EXAMPLES cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/xmlpatterns $(TARGET_DIR)/usr/lib/qt/examples/ @@ -47,6 +57,7 @@ endif define QT5XMLPATTERNS_INSTALL_TARGET_CMDS $(QT5XMLPATTERNS_INSTALL_TARGET_LIBS) + $(QT5XMLPATTERNS_INSTALL_TARGET_QMLS) $(QT5XMLPATTERNS_INSTALL_TARGET_EXAMPLES) endef