From patchwork Fri Mar 13 20:27:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1254668 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.137; helo=fraxinus.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=HJRg7avu; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48fHLT5dyyz9sNg for ; Sat, 14 Mar 2020 07:27:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D4B3787A1B; Fri, 13 Mar 2020 20:27:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NcVobHN7orWR; Fri, 13 Mar 2020 20:27:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4B2AE87A09; Fri, 13 Mar 2020 20:27:22 +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 B7BE21BF2C2 for ; Fri, 13 Mar 2020 20:27:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AF70F87E5F for ; Fri, 13 Mar 2020 20:27:21 +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 g7AmqgDGvmEM for ; Fri, 13 Mar 2020 20:27:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3358C87E5E for ; Fri, 13 Mar 2020 20:27:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1584131235; bh=aSN7RJyexe2JIJz+/ei0+Y/C9uKJ3YNi/KInclaxH9k=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=HJRg7avuwQ4g+hOsLPT+tT4XqjvSCXyZYnlOSz21FNn3Oisoug306GaIyRk5vfPvJ izhdgpxIq4Z436wPWQcOLplOLZ+W673N+t+iWBGXqA1irN/pRbjcorgALVrXw71KoU qrh+kc2aInCJyPiVY1+kEBDtwYv9nz1TIi6CNFKs= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.9]) by mail.gmx.com (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MAfUe-1j1oGx0Pyy-00B8Qe; Fri, 13 Mar 2020 21:27:15 +0100 From: Peter Seiderer To: buildroot@busybox.net Date: Fri, 13 Mar 2020 21:27:12 +0100 Message-Id: <20200313202712.32587-1-ps.report@gmx.net> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:8QGb+f4vv/9ug4BaGifDQpayZukzy/2YhmWtVvMwrRaxjO4dC7F uS9dhti8jBc+EZAbCVZ6tnDua+NJeLc3zRQr9NJjP7xc5w2/hA2pB+u5Nn2+x/IJ+6mFykp BJREJfxJ7OQzHItWs8CLlJJ+eu+YFJwsISiQHrrSQ0bUnyxfr3TfEp8/FgbrT4dunfbuhz0 zopgk35nQCYObs9+DwDMQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:diN8vaZ6KQI=:MN1TKl2itqBoT+EQdEc2Cl xKDchhnMMpcwlPdkpmRPrHFAhCCiuktlcbWLLQPzy22PYgJo7wZCaom556JOnVzqHJ+ajJjSy 9FFfhImieJPgGLxYG7dl6W0G8KrK9IrJjkkjt5JytB7jesb1DQzUXQxQFtyQ9vGdIDLPku1Qe 0tMaF041N/1YaFjMMtlB4SM4HBytdzzdQXdLEqzqD5oJ6Bje342QHnakZFZOeSvCExNeIKwZR PB1D65iw84N/yEeDPRaIz+Q8kIcLVZsP2yZ3WG1srazTj572wBuIgTH6givf5nBucTYeQzIY6 jsNggW4wFErOdaa4D5IWqp7gigmyRn/eXbLdxqf2rtNYfqjEuT/5G1WlhMLu3DZWQMDFutz5q jpdI2pXmJM5m45xA/I9A1Pr2ER2mQ4GxzZn/ryUFAheMrofX7K03zSr6uARXn7FPFPsuMhDnD R554DLNAxXVGEgbZA3Zoxna/F4o+a3utn7NDB897jd3E7qAOGb2isrZvX2pS2TgbU9PwPKTZX wKimjgJHiO+dH8SmG8A1kf1vRP663QYJV3Rmwduu9OG9OCLjVQcF4pAHalDc+bhCpaBkQcK2l smC/REa5fXKHOonZG6x32NM/sw5F0ALZ6oz2MuwEPyl8Mm+c3xW9Z9Aj9pvO8+hYHFW23iNna atdKNy1EUH+mhOKsHVmnAWEze3vwva/WqEL4JdNTYk/9jY2nkBOVJIZWY2OkYVGRNKaXjo7x0 bxJcXE/XKi76CPrAvrRjt8xgD6/Zu9We6gh7Ut29Q36kKKNhXtvpta9n5KNE3nM1oW1u9jIot PKwDAPsyDHJlQHDL976mF8wbf5ZImjMgNmQHGjA6e8S49/zHxVks+JqbCOcqKCMWIp0VfJtlV pqJ526YorRr9Gtu6eIbm/LJvJNei9hU6cjctyXcnTt0jRYlx3TocCSYcvLlBeRtZlmxa1Fusx Cnkd8wd+UEj2PSvznVZnOqZGXVJGWPLUo2Y3kMP9q+NTS5vfmN7aHWg6PMCoo1J6i1dicIOCL aLk5IH2KoSZBuSrqPdZCzkY2YNHcOGiGaV0/TWlu6tGgPxiZURTh8v9BCWoq5u1ynShT44PQQ 3xiPMudMA4d+vd6j/60dr2lZAG7uLO0exGaD0Ob8WjhNN+7NZsvJHyVRlGj/9ud8ykKCNCnsr hcXgwHH65bNQGFXQuOTwUh5X2eGLRSI2nT52U+qR3u1pHg4bIVSyMgFodsZnJTHxnwVrH/SMj J+kih9ebn6z2llZel Subject: [Buildroot] [PATCH-for-2020.02.x v1] 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 Signed-off-by: Peter Seiderer --- 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..50f0c58931 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