From patchwork Wed Feb 26 14:45:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1245110 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=YrbVN/+V; 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 48SJXn5DxHz9sPK for ; Thu, 27 Feb 2020 01:46:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 102A322C6B; Wed, 26 Feb 2020 14:46:48 +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 nAQKPhGbvn8D; Wed, 26 Feb 2020 14:46:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 6215922920; Wed, 26 Feb 2020 14:46:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id D5B271BF426 for ; Wed, 26 Feb 2020 14:46:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D2F9087999 for ; Wed, 26 Feb 2020 14:46:24 +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 2EweyYTrvBIe for ; Wed, 26 Feb 2020 14:46:20 +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 hemlock.osuosl.org (Postfix) with ESMTPS id 390E6879A3 for ; Wed, 26 Feb 2020 14:46:20 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id a9so3411517wmj.3 for ; Wed, 26 Feb 2020 06:46:20 -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=2/mSmSrIihjh/ZnjjGKBCSnCX/oHI+ThCujjjRHt218=; b=YrbVN/+VIImiedRVSuLvfD15zTDqIbV/fkKwmnT0guCC83q2R4ASU1TZY98s3dKy0i UzLhrJ42j1ZPf5IIOeHv97SgA3Wj8EJ81ZIEqpthyYXNJ71nCyrz7LrXGQ2yHZkbWtBg PAbNkaFV5/rxHwBfmG/9nONKniXiQURaSeZimDKD7bxPUyu5HvIe01pVHEQEQZJOdLki 9pzCYRjh9t/KA8xugHoWX3MUKKSd8lFRm59A9kbvIyLxFneYeXuf7Jyzj/Zu/CITUHRu zOOnuQooqYkigcUTrpMsQ8YEqBz54ACMtWGrdqxdIFsX31XJnWYpqpQ0TVDQKl4QJlZ0 mi7Q== 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=2/mSmSrIihjh/ZnjjGKBCSnCX/oHI+ThCujjjRHt218=; b=Y3/+GPbJSZWpqPcr7PiCldU9aU2Iya4yzR8b+ZM6Jg0C1AtxU6r1e5C7On0UpgJ9ZP vX9qetOftjLLyGKuNUztHR2sht9Qx0AkCYCrS3KKkK+bTJzf8hi8vPDWbKzSyDd4ciCk PkLCpEUPV0yOELK8tDzv1a6DzraLztJEaC2no1MnE6Fzc4C3iF28Lx0RGVq4sJhMMrjE MLyRa/C+5yq3kWa797OVAC1u18/Zg++wHUu92WYOi6PU1G08dN2taJrCwbBVo+bSafT9 KSlXHY9O5UL/y8wYCB/qe9LWJ3m41tKOnwD6OqlNcq/4RzGSImm1BEmqTqBCCTaYo5VX yM4g== X-Gm-Message-State: APjAAAVK5Bb/1TlSjYo1fy4NZljHhnfAsgmBITKiMQH73idR2lGV/m4X kNNhgke0W2cQVP6/+TAVZklsu1ne X-Google-Smtp-Source: APXvYqzZ/kFZ04OA0p3/jTkovWcZ5rd8Y/dgNJo4bMbV4Sj/Y4Tqu7AUHSagh8Zla9V1moPJ/6ZJpg== X-Received: by 2002:a1c:3906:: with SMTP id g6mr6216564wma.49.1582728378393; Wed, 26 Feb 2020 06:46:18 -0800 (PST) Received: from dell.be.48ers.dk ([194.12.21.133]) by smtp.gmail.com with ESMTPSA id d63sm1257629wmd.44.2020.02.26.06.46.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2020 06:46:16 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1j6xx1-0003Ie-RH; Wed, 26 Feb 2020 15:46:15 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Wed, 26 Feb 2020 15:45:45 +0100 Message-Id: <20200226144608.12529-14-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226144608.12529-1-peter@korsgaard.com> References: <20200226144608.12529-1-peter@korsgaard.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 14/37] package/qt5quickcontrols2: 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 --- .../qt5quickcontrols2/5.12.7/qt5quickcontrols2.hash | 7 ------- .../qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash | 7 ------- package/qt5/qt5quickcontrols2/Config.in | 5 ----- package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 9 +++++++-- package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 10 ---------- 5 files changed, 7 insertions(+), 31 deletions(-) delete mode 100644 package/qt5/qt5quickcontrols2/5.12.7/qt5quickcontrols2.hash delete mode 100644 package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash diff --git a/package/qt5/qt5quickcontrols2/5.12.7/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/5.12.7/qt5quickcontrols2.hash deleted file mode 100644 index 689a7e5284..0000000000 --- a/package/qt5/qt5quickcontrols2/5.12.7/qt5quickcontrols2.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtquickcontrols2-everywhere-src-5.12.7.tar.xz.sha256 -sha256 3a9526e5ad01edbfb796a6631983c391ea1b7e22ae6e07840048156a9e92a237 qtquickcontrols2-everywhere-src-5.12.7.tar.xz - -# Hashes for license files: -sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 -sha256 9e63a04ce021b8bf811b30881fa51c8c3db88afeead942cd59322f2fb69c75bc LICENSE.LGPLv3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash deleted file mode 100644 index 01fe5dcd61..0000000000 --- a/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols2-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 ec5078470abe2da888c2be5d1749b5961ef5132487c180ce4d4aa19ea7ff81cb qtquickcontrols2-opensource-src-5.6.3.tar.xz - -# Hashes for license files: -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 0ec5b37a28dd638c5c05c8cc940276e55c808353fe8d942c7f993c2c8b4cbe62 LICENSE.LGPLv3 diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in index d036f74bab..3f81e20d52 100644 --- a/package/qt5/qt5quickcontrols2/Config.in +++ b/package/qt5/qt5quickcontrols2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 bool "qt5quickcontrols2" - depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST # qt5declarative/quick depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK @@ -14,7 +13,3 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 to a core module in Qt 5.7.0. https://doc.qt.io/qt-5/qtquickcontrols2-index.html - -comment "qt5quickcontrols2 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/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index 5316f03b10..689a7e5284 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,2 +1,7 @@ -# This hash file is not used; instead, update the -# hash files in the per-version sub-directories. +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtquickcontrols2-everywhere-src-5.12.7.tar.xz.sha256 +sha256 3a9526e5ad01edbfb796a6631983c391ea1b7e22ae6e07840048156a9e92a237 qtquickcontrols2-everywhere-src-5.12.7.tar.xz + +# Hashes for license files: +sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 +sha256 9e63a04ce021b8bf811b30881fa51c8c3db88afeead942cd59322f2fb69c75bc LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index c2004c2ee7..632bc47205 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -31,7 +31,6 @@ define QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES endef endif -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib @@ -41,14 +40,5 @@ define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) endef -else -define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs - $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) -endef -endif $(eval $(generic-package))