From patchwork Mon Feb 24 22:20:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1243614 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=dhukeV0e; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48RGkW2Hjjz9sP7 for ; Tue, 25 Feb 2020 09:21:39 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C717620770; Mon, 24 Feb 2020 22:21:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8uUnr6q1tcfM; Mon, 24 Feb 2020 22:21:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id D635720519; Mon, 24 Feb 2020 22:21:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id EB6F31BF97A for ; Mon, 24 Feb 2020 22:21:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E3CDA85625 for ; Mon, 24 Feb 2020 22:21:13 +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 j9ll9oQAoJWD for ; Mon, 24 Feb 2020 22:21:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 9BC4F85DF9 for ; Mon, 24 Feb 2020 22:21:10 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id a9so1039989wmj.3 for ; Mon, 24 Feb 2020 14:21:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jk8cYZ7oJM50DuEzLZzPgOWkHId8BU4FN7QxMNdtTYg=; b=dhukeV0e6fpvV5R/caPC+kGipfN+wNGKeSI26BVCk4PdgSpar0nNXSbO4h755EEYqw u+g9PQG+vn9Wr/wP3PYAE3PkjWvySRSoox5iWNYp0den7rC4buAnjNQUg6JMvtB/SDqy Yz4Vo805qWGYJVo6G/t/h5o166mVd8BZ3ykK1ulUEayG64ihwX860fy70hA6SrpGcfr3 h7ERSyrMGFXVaG3Bq+tacVpNjequ5b8jFdm6LRitAu59P7zdcGNdhSi4sGmcqFHaA9ri juyHMPOV74a4UCfGRkKTfmBVQKxNi4AQOTT88FICWbwMYRkYI4/79Zky4aUrnzUwzgdd Dl2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=jk8cYZ7oJM50DuEzLZzPgOWkHId8BU4FN7QxMNdtTYg=; b=GmPaMmImLJzMqYuuW7Zr8PXQZjN5adZUB8hYiuobcLgfjRmi345PFZBzv9L8E+/PqF MTh87tNXSRoH3NWJmGLD5+PRqOjNlryWSY+bTLEp5TsdQfevSpOZFFzRVca6SaXeO0nc tozOvfotRva0knjpTjf4WWX487jEtGo26JwCtHD0eYvShAFD0lKUeBCGJ05ll0HzC08i /uEGyAQ+MvRHX0/OHmLH77TWFRbsnfayllyLJkmTj89zMbUC5TV7gNQ5saBuRspaHK4O mzcljeP9jt1THwWBsuoVK++q8ndFKJBJ52cBlBRrO3ygtjX/v76j+i5awRyu9uC64Bln Veiw== X-Gm-Message-State: APjAAAXU0gumOlvp7gD6Vvy7JFkqHinsX+j+tFK9kh2fqwM5MF+DSt0p 7iDpqcc1b4SeRMh/627I7E7GhyXZ9zw= X-Google-Smtp-Source: APXvYqyslo1DX6bjp3odiM2WT0lmVsSiKceJX/NJh935QyL+wOey4zmOR7dV7tRsVafgGSiqrUyZjQ== X-Received: by 2002:a1c:6085:: with SMTP id u127mr1187146wmb.144.1582582868543; Mon, 24 Feb 2020 14:21:08 -0800 (PST) Received: from dell.be.48ers.dk ([194.12.21.133]) by smtp.gmail.com with ESMTPSA id f65sm1159767wmf.29.2020.02.24.14.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2020 14:21:06 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1j6M62-0000j9-3J; Mon, 24 Feb 2020 23:21:02 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Mon, 24 Feb 2020 23:20:30 +0100 Message-Id: <20200224222054.2686-13-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200224222054.2686-1-peter@korsgaard.com> References: <20200224222054.2686-1-peter@korsgaard.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 13/36] package/qt5quickcontrols: drop qt 5.6 support 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: Peter Korsgaard , Peter Seiderer , Julien Corjon Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Peter Korsgaard --- package/qt5/qt5quickcontrols/Config.in | 5 ----- package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 6 ------ package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 12 ------------ 3 files changed, 23 deletions(-) diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in index 59f6ca4114..56fcaf7053 100644 --- a/package/qt5/qt5quickcontrols/Config.in +++ b/package/qt5/qt5quickcontrols/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS bool "qt5quickcontrols" - depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK @@ -12,7 +11,3 @@ config BR2_PACKAGE_QT5QUICKCONTROLS that can be used to build complete interfaces in Qt Quick. http://doc.qt.io/qt-5/qtquickcontrols-index.html - -comment "qt5quickcontrols needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 9ae6ac76d7..a0f8dab10b 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,13 +1,7 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 31bb0fc8f21b855af6ff02c415be3246128b523d0ef7c05e248e92281ab0db8e qtquickcontrols-opensource-src-5.6.3.tar.xz - # Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtquickcontrols-everywhere-src-5.12.7.tar.xz.sha256 sha256 1038bbc76bba53f9634f40cd9c8ebf0ed8ae82e791f727b228bd81bdcf1859e5 qtquickcontrols-everywhere-src-5.12.7.tar.xz # Hashes for license files: -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 3e0c5effb3..a3b3a3f64a 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -11,12 +11,7 @@ QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) - -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL -else -QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL -endif define QT5QUICKCONTROLS_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) @@ -42,18 +37,11 @@ define QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS endef endif -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -define QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Layouts $(TARGET_DIR)/usr/qml/QtQuick -endef -endif - define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick $(QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS) - $(QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS) $(QT5QUICKCONTROLS_INSTALL_TARGET_EXAMPLES) endef