From patchwork Wed Feb 26 14:45:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1245106 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=p5jR3Ubo; 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 48SJXh2fh6z9sNg for ; Thu, 27 Feb 2020 01:46:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DBAC122B6D; Wed, 26 Feb 2020 14:46:42 +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 vl0oRrdkujHS; Wed, 26 Feb 2020 14:46:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id F2E9521FAD; Wed, 26 Feb 2020 14:46:34 +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 271B91BF9AD for ; Wed, 26 Feb 2020 14:46:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2040B8733E for ; Wed, 26 Feb 2020 14:46:22 +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 3aWHJTv78Jig for ; Wed, 26 Feb 2020 14:46:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8D2128742D for ; Wed, 26 Feb 2020 14:46:17 +0000 (UTC) Received: by mail-wr1-f49.google.com with SMTP id z15so3391146wrl.1 for ; Wed, 26 Feb 2020 06:46:17 -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=5sdxuC7WpjVm1dl0EErpXyeNzQrZhLdOOT/lQIgLgLo=; b=p5jR3Ubo3xGQJEpdFT0jeJu9xp80aFV8zZ+00PPfn4Kkc/0u7c9TU2PZdhdPD6ae4n piktPNin2kmSShYBOk+yk92pr67wZtzZmHFkeycg9tfsdcpGiAtoL/fcdD478k79bkDv waxfe9PsSzlMNYFLkVrpH2LtCo4rvg/R8lCMF9j2Y04JCS2mV4y6VOKharZrSq9PIEz+ P2A8CXxd3JnSmZtd5ltMM8F40RD90UPiUxPOmMFutxSqUpCBxujxyYakM7RWhJETaWAH is9xSzC4Dc2l2GnVnKc8+C09HBXFQzy3CWEOxwW79E8pmYuUn0PrI3PmKFlkF8YaFTbG MRQA== 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=5sdxuC7WpjVm1dl0EErpXyeNzQrZhLdOOT/lQIgLgLo=; b=XtSg9e5ZXKYqLCS8hX6Z+81CDn7Eu0k8C7kIJFcytFJmbBA7KA64wGSD3uXhqj2Y14 8TzQgh3zyxIi866+xzPJMLq63va8IxDSJ9t1Cf0yldcZ+asKX0DfSk4ClZG6CJsZcz4N vXlYyyK+w+N/qTJHJNuBHo9b9BF7vPfcN1fq8gftsVejKJfRx+A+E6LiMhkjCQI0sbl6 kh/t+anPXU9996RlvTfeXFYkbag8BgQxFO/Dxi4BeD/uCQT/GMHvBcsNo9Mh0Xvofxa0 pC7Q5oTaAakU/Mr5p7oDZ7ISgTkC4lqqf7g/uFuaf6LzgfzD1xGu9uvg2bHLCF0SHswf 2xoA== X-Gm-Message-State: APjAAAUO2/DT02ECRwJ8r8QRCqTeI41z2onD3ZdF0VplQhWiRzxOtNZT t9maxL/jCkWTK2Ymlba/cNWTXDXY X-Google-Smtp-Source: APXvYqxPd/Di9KVAEDTvLaavZ+qw+arIPU9r3m9LuVuF8xH/vANakPhlF9VaEdIWOOgk7e0GHVmFOw== X-Received: by 2002:a5d:5745:: with SMTP id q5mr6070299wrw.374.1582728375766; Wed, 26 Feb 2020 06:46:15 -0800 (PST) Received: from dell.be.48ers.dk ([194.12.21.133]) by smtp.gmail.com with ESMTPSA id l8sm3267828wmj.2.2020.02.26.06.46.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2020 06:46:14 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1j6xwz-0003IK-7o; Wed, 26 Feb 2020 15:46:13 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Wed, 26 Feb 2020 15:45:41 +0100 Message-Id: <20200226144608.12529-10-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 10/37] package/qt5imageformats: 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/qt5imageformats/qt5imageformats.hash | 5 ----- package/qt5/qt5imageformats/qt5imageformats.mk | 5 ----- 2 files changed, 10 deletions(-) diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index de977f15ba..3358b6d79c 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,6 +1,3 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtimageformats-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 efe4da3c90c976c9b9a2eb6b081d2b8e1435935695104456276ce98e8a5848c3 qtimageformats-opensource-src-5.6.3.tar.xz - # Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtimageformats-everywhere-src-5.12.7.tar.xz.sha256 sha256 9bd19ee24fb85f249d01c78e637c95377dd738feb61da0deeee6b770fa62f70b qtimageformats-everywhere-src-5.12.7.tar.xz @@ -10,5 +7,3 @@ sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE. sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index fa13ebedaf..b8e581c489 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -10,13 +10,8 @@ QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEF QT5IMAGEFORMATS_DEPENDENCIES = qt5base QT5IMAGEFORMATS_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL -else -QT5IMAGEFORMATS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif define QT5IMAGEFORMATS_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)