From patchwork Wed Feb 26 14:45:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1245103 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=j+gyr7S5; 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 48SJXb0s90z9sNg for ; Thu, 27 Feb 2020 01:46:39 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3E62C22011; Wed, 26 Feb 2020 14:46: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 fTA9NzF0RlDd; Wed, 26 Feb 2020 14:46:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7296122098; Wed, 26 Feb 2020 14:46:27 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 5B22E1BF426 for ; Wed, 26 Feb 2020 14:46:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5772C21F69 for ; Wed, 26 Feb 2020 14:46:21 +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 S9nbgDs6epeG for ; Wed, 26 Feb 2020 14:46:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by silver.osuosl.org (Postfix) with ESMTPS id 3460F2156B for ; Wed, 26 Feb 2020 14:46:16 +0000 (UTC) Received: by mail-wm1-f47.google.com with SMTP id q9so3361580wmj.5 for ; Wed, 26 Feb 2020 06:46:16 -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=NevLCovj5GcB+D6EpPvVNMzI4xk5R5POU3u1O+46sqw=; b=j+gyr7S5m6Ylyu/WW5qPId/n5KZa6kOedlQlDvHwohDXF8g9BURLKpWftpLfoMbUn3 daYdSDiTbtqxMeEuEzxzl7Sjqc/22Kiphdq4bHTKIs1Sew1qtyARfN5QtZx/1sc/DGEG F2e+UaqkcrHEeIAQDDOfhuqzZBdPTrWMwEaS2SJ4JpTl1Izeyid4g6PWHs7MR21viXiC 3aVRFQ3NJAud+/7KAI0liEq6EJe+NR7/7pX2oY5jXaqt3Ylepmhh5z04TCl5rW5Ogl5n vDkj9+U24xhMkThgBjOe+71PnkoCKLBBkYnXvW0vycDorj8NROmIwYrIpers9h9Luc0C UTsA== 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=NevLCovj5GcB+D6EpPvVNMzI4xk5R5POU3u1O+46sqw=; b=KZ9bhf5pu8BuIue4FMobYGzAPBhj5AKeKC4jX2RcVat1LlTU+XyYZeWmcMbnAW1LXr CA2SqNuSNAU/j3HlVovLqRWvUUbOo39JBkyLs/eobZa2mytWkSrysB9I97CU1VMkUICA aIDzocVQi2HWkEIQwm7QerqpeRbxyOFallT6hyXDWEpqvrKs/o+CKXT5xixi8rZ3iJ8h L1ZfI45ZOYKPp3synof3G6b+yC6jKy3QgTOb5Abf4BIRNl+F7i2Z0byQj2LSqZoPrHRL qG2a1+kTsmGmHA+TSRxt9VfE6eS7xWt8cE2j1wEsgGrwSoTz7Ki+wmfLzp8Lbv8GsADa QDCw== X-Gm-Message-State: APjAAAVV6zDHjQjU4JEN7CfYdU1mU34Ni48DPEnMtSV4FE48J7TzDRvK rESnmTxu45e2TpaQcgmFlT4Z03OC X-Google-Smtp-Source: APXvYqwOkCLwRbybZPXTqjz2sDkiLMYn7gMmgx/M6hZwYgwWRUmlzdX9pdqng03mMikByRZAXr0E2A== X-Received: by 2002:a7b:c4d6:: with SMTP id g22mr84399wmk.13.1582728374299; Wed, 26 Feb 2020 06:46:14 -0800 (PST) Received: from dell.be.48ers.dk ([194.12.21.133]) by smtp.gmail.com with ESMTPSA id d18sm3659443wrw.49.2020.02.26.06.46.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2020 06:46:12 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1j6xww-0003Hi-Rt; Wed, 26 Feb 2020 15:46:10 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Wed, 26 Feb 2020 15:45:35 +0100 Message-Id: <20200226144608.12529-4-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 04/37] package/qt5canvas3d: 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/qt5canvas3d/qt5canvas3d.hash | 6 ------ package/qt5/qt5canvas3d/qt5canvas3d.mk | 5 ----- 2 files changed, 11 deletions(-) diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.hash b/package/qt5/qt5canvas3d/qt5canvas3d.hash index 2c7046a87e..c6eca2e779 100644 --- a/package/qt5/qt5canvas3d/qt5canvas3d.hash +++ b/package/qt5/qt5canvas3d/qt5canvas3d.hash @@ -1,6 +1,3 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcanvas3d-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 e99e0e159f2fba539b7947a1921072f6807f20958d32809edbf12aac571f56ff qtcanvas3d-opensource-src-5.6.3.tar.xz - # Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtcanvas3d-everywhere-src-5.12.7.tar.xz.sha256 sha256 b63a513a2ee11548b122e0fd640b1fa22d3eb83cdc51ddfdf3b97c2ecd0d0c50 qtcanvas3d-everywhere-src-5.12.7.tar.xz @@ -9,6 +6,3 @@ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE. sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.mk b/package/qt5/qt5canvas3d/qt5canvas3d.mk index b550ff00f2..2366afb352 100644 --- a/package/qt5/qt5canvas3d/qt5canvas3d.mk +++ b/package/qt5/qt5canvas3d/qt5canvas3d.mk @@ -10,13 +10,8 @@ QT5CANVAS3D_SOURCE = qtcanvas3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CANVAS3D_VERSI QT5CANVAS3D_DEPENDENCIES = qt5base qt5declarative QT5CANVAS3D_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5CANVAS3D_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5CANVAS3D_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 -else -QT5CANVAS3D_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0 -QT5CANVAS3D_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 -endif define QT5CANVAS3D_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)