From patchwork Wed Feb 26 14:45:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1245114 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=DzpKBmic; 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 48SJXw5LkCz9sNg for ; Thu, 27 Feb 2020 01:46:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A02A822875; Wed, 26 Feb 2020 14:46:52 +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 6t0faCY7Dubv; Wed, 26 Feb 2020 14:46:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 514D72202E; Wed, 26 Feb 2020 14:46:46 +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 061731BF426 for ; Wed, 26 Feb 2020 14:46:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 023F0876C0 for ; Wed, 26 Feb 2020 14:46:32 +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 zJxZEq9r7KtP for ; Wed, 26 Feb 2020 14:46:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id E5542872E9 for ; Wed, 26 Feb 2020 14:46:25 +0000 (UTC) Received: by mail-wr1-f43.google.com with SMTP id j7so3303287wrp.13 for ; Wed, 26 Feb 2020 06:46:25 -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=myn1iumKqE2aPz74FC/vek8rVTtVdgYGXX4wT2+0Voc=; b=DzpKBmicjIyn9v018mAIAm9fL3y25Buxgiu5lFU2ared2NNanRKNsoouiYDNsEqe84 zvkqt/F2COW32DqPCjaz545z/RxGVUNJXVIA9xZgKaii1vPPSprhc0SxwsjLPBZd1CQ1 NCT3SWuFhZEIoCXtqrQDcoAj6jk9SOP4U+4CfZEogGZGdPtIteSFNim/Vi0KEsYhjmxX 5TyLVZubmFYE2ky9208YJFvLGOPsn9W/RUiA8MYlDQ/85YBzAb6qHa+Uv3CGV4pYn6Mt GGfWlimGaDzXyRnQwwBJsG0huhwnR7IoPkvABWZIC6H36f7KgOOUm51PwZyAo3FGKkjW qf6g== 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=myn1iumKqE2aPz74FC/vek8rVTtVdgYGXX4wT2+0Voc=; b=hcX7NxRmydyCx63GE3Dtzo/KB1oDASlnE8/0Qx92vNjyKQzp6wSp1lJ0LCXdbT8Okk rbcV5edPoC/Xku0U2IAgz40kkDeMCJGnf9YOMqt+V5A8y1KgiJViCZp94XBElTLhVl8G bMol+XYEFP//zJtC8RuE/IQDOqaytIbl3Pd57MC7jwRzIscWdIm33vzlACnMD2ruJxIn 2g2ITFTO5FFuP31AjhAG7Ax1bt2q+9K8b7r2yGF/1ei/1dQT7+KgRs8XxPR34zHAe3yH xCzYGGyoa6l95+Xi83dJAjZRo54dgBVKFfBeUZ48cAhq5Ia47wcutH5dUGZZWqnMD9P9 bEng== X-Gm-Message-State: APjAAAVKQTIitcw2WNeXWlEdFS2xw7MU3megDGYmrqlU2PuJBHG2njYd 3AumaqNM2atPZCQ/X7sB7RiE+GUg X-Google-Smtp-Source: APXvYqxBjUqM7/Adi/BWsJV9GnugJDwoSK0pCaaKLtkAitwdU4qAdiQ/n1Sh/8oN+/S6LAfKCt22Og== X-Received: by 2002:a5d:5007:: with SMTP id e7mr6000861wrt.228.1582728384127; Wed, 26 Feb 2020 06:46:24 -0800 (PST) Received: from dell.be.48ers.dk ([194.12.21.133]) by smtp.gmail.com with ESMTPSA id r3sm3443705wrn.34.2020.02.26.06.46.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2020 06:46:22 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1j6xx6-0003Jj-Bx; Wed, 26 Feb 2020 15:46:20 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Wed, 26 Feb 2020 15:45:55 +0100 Message-Id: <20200226144608.12529-24-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 24/37] package/qt5webchannel: 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/qt5webchannel/qt5webchannel.hash | 8 -------- package/qt5/qt5webchannel/qt5webchannel.mk | 14 +------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index c863a6ea60..d45f293821 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,6 +1,3 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebchannel-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 8eb1b0ac2286653c7932758c21e7760788a5d7cfd6162da09afa926d5be50713 qtwebchannel-opensource-src-5.6.3.tar.xz - # Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwebchannel-everywhere-src-5.12.7.tar.xz.sha256 sha256 b0ae72e5957aa4b281a37d2e169fcf91f92382bc36bd0cf09c80b2bb961bce75 qtwebchannel-everywhere-src-5.12.7.tar.xz @@ -10,8 +7,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE. sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 22523036e7..0f1b3bafbf 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -9,14 +9,9 @@ QT5WEBCHANNEL_SITE = $(QT5_SITE) QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL -else -QT5WEBCHANNEL_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif + ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) endif @@ -37,17 +32,10 @@ define QT5WEBCHANNEL_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install endef -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) define QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT $(INSTALL) -m 0644 -D $(@D)/examples/webchannel/shared/qwebchannel.js \ $(TARGET_DIR)/var/www/qwebchannel.js endef -else -define QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT - $(INSTALL) -m 0644 -D $(@D)/src/webchannel/qwebchannel.js \ - $(TARGET_DIR)/var/www/qwebchannel.js -endef -endif ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) define QT5WEBCHANNEL_INSTALL_TARGET_QMLS