From patchwork Mon Feb 24 22:20: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: 1243617 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.138; helo=whitealder.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=H+U08FmJ; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48RGkf0hcZz9sQt for ; Tue, 25 Feb 2020 09:21:46 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A4CD3864D4; Mon, 24 Feb 2020 22:21:43 +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 2lU+xicsDzua; Mon, 24 Feb 2020 22:21:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1E52C8648E; Mon, 24 Feb 2020 22:21:37 +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 E43AB1BF2A1 for ; Mon, 24 Feb 2020 22:21:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DE747875F9 for ; Mon, 24 Feb 2020 22:21:16 +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 VlEqiXLBLFIt for ; Mon, 24 Feb 2020 22:21:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by hemlock.osuosl.org (Postfix) with ESMTPS id 1767A87598 for ; Mon, 24 Feb 2020 22:21:16 +0000 (UTC) Received: by mail-wr1-f51.google.com with SMTP id e8so12323652wrm.5 for ; Mon, 24 Feb 2020 14:21:15 -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=qxQdiQ2HwUUWezCXU/gRua+9ve9VA7j/Yjl3XZlsdos=; b=H+U08FmJB+c9RI4U4X2iVeGpZ33VBeBfttau/eHjXUSjgIXMnC5qVWgZ/No+Gq3Sgc 2i/Fmz0Ur/HW6md2tM0G2ogc8NnlRqXc5EVRnTHRePTw2XBZgjetBdLsrNyU5JElp469 ERSadi7ZFynh98d/DWsBC6y5X6AtbG7ZBMuT87Maw13WmhxifwnRT+mL1G/oOo9QZY8R 0pLVqpalZ2m7kg+mIJKPY+K+tUWkKH/VtByFhzW7Knt3Xn9mmfZL1KIe1amQnHc4cUJo m9DmnrFnDAAY3lOa3fM82vYh9C7RTE1gJXiy/Qavq/RszKrCz2537lRjnl9h8Y/9YzkZ xi2w== 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=qxQdiQ2HwUUWezCXU/gRua+9ve9VA7j/Yjl3XZlsdos=; b=SHNhao4qV/yh3we3ExUwUqX0ZASuVKudp+7hfBt50czi1e4vDyEGXsGX7P8dPjADLJ KRTk1wUAcKP6g0+lVQ0kd+CKsPEm03U9FtrOyL9/I/Hnm95dDxk/+CYNOLDLYhzsDrKa GCM8J2ufCyHia9qYH1/SOxwkTkMPqLPARfCrrcZTrEZpfDRapyC5MwgBtftVAlsS+ytY GE2PFwzZxB8eLxZHLDwiV8NrVBezdlLRGEHEJCk6NsFe5GtyPd1Uqwhx3GVrf/w6YP8F TSaXyItZBmOAezfIUkD0hjt7+XtThcVL2i26uSzXts6ucgW3QvRRy3p2ewIGwJJXwkKb HDyg== X-Gm-Message-State: APjAAAVGFtokWk32q+7HRxW8cFLhFhmhoRfLikyaKrAEDDnHrTZKdvGv EPYBjF2Y4XIVbYKgg5EnpA5F3cem0ug= X-Google-Smtp-Source: APXvYqzI/xhKbPcwYNsXbjfLHb22DJWNw53zCm4TElt7+7E2452T9MY08K+jzNxoPq0DgTSvvZlQAw== X-Received: by 2002:adf:e884:: with SMTP id d4mr10741230wrm.12.1582582873965; Mon, 24 Feb 2020 14:21:13 -0800 (PST) Received: from dell.be.48ers.dk ([194.12.21.133]) by smtp.gmail.com with ESMTPSA id a3sm16564677wrq.63.2020.02.24.14.21.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2020 14:21:11 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1j6M67-0000kQ-VI; Mon, 24 Feb 2020 23:21:07 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Mon, 24 Feb 2020 23:20:45 +0100 Message-Id: <20200224222054.2686-28-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 28/36] package/qt5websockets: 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/qt5websockets/qt5websockets.hash | 7 ------- package/qt5/qt5websockets/qt5websockets.mk | 7 +------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 3bb6297f3e..230aab232c 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,6 +1,3 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebsockets-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 a2439045616c89dfe06333734ff4726075c92e01db6e6b6863bc138e39c028eb qtwebsockets-opensource-src-5.6.3.tar.xz - # Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwebsockets-everywhere-src-5.12.7.tar.xz.sha256 sha256 6fd13c2558f532a32f20d977b44c0146107a0e93861df84978e4fd72af283b17 qtwebsockets-everywhere-src-5.12.7.tar.xz @@ -9,7 +6,3 @@ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE. sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 79949ee74297883df6e4e7c4bfe1e75a6e7695376b4a87ffc013e27bda509cb2 LGPL_EXCEPTION.txt -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index 6e734a3bf3..bd4d49940a 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -9,14 +9,9 @@ QT5WEBSOCKETS_SITE = $(QT5_SITE) QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz QT5WEBSOCKETS_DEPENDENCIES = qt5base QT5WEBSOCKETS_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 -else -QT5WEBSOCKETS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0 -QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 -endif + ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) endif