From patchwork Wed Jun 29 12:33:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Gyarmati X-Patchwork-Id: 642033 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rfhtt22QQz9ssM for ; Wed, 29 Jun 2016 22:34:14 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=ndi8Hxdw; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 95B8888AE9; Wed, 29 Jun 2016 12:34:12 +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 YPK4nLGZpmzG; Wed, 29 Jun 2016 12:34:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id DA3EF87E64; Wed, 29 Jun 2016 12:34:09 +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 D9AFA1CF666 for ; Wed, 29 Jun 2016 12:34:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D5410957B6 for ; Wed, 29 Jun 2016 12:34:07 +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 OpddQmz4UxCT for ; Wed, 29 Jun 2016 12:34:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by hemlock.osuosl.org (Postfix) with ESMTPS id C327D95792 for ; Wed, 29 Jun 2016 12:34:06 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id c82so14022480wme.3 for ; Wed, 29 Jun 2016 05:34:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=0vGaMVY8EQcBHpvab2m1NOXNWOCmYCOehqUBg+UwEJ4=; b=ndi8HxdwIg3QOILL2v3tbUN0aFJlkYZYPJ/R8ax8DtKfZ3sGCx+NdkP1jFm2wNCOrV HxVcmfgIGKcQNTbdXBVrosV81GzbdZ9E6t67Qz4O1ZcUj9QQ2sgmO/nWDsk4pU2Sfzrm LJGmlqqDeK8R6n3zA77gqrTGPZN3TeSbziuKuOcHKwCS4vMw0CNtvu9dl3749olUfJBk qoo/E3Hw7xOWJkJGrn+FxvNIjFu3avjbbVmQ/Ts/LOywYvxOxz1KTxlUKmMGTITr84qz 5WE+vYcA3RqvRJNjxScTYXfUwvqywuGIWaiUGw91D/yDT4bLJxzlTg/gAx6qveadFnko Tgmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0vGaMVY8EQcBHpvab2m1NOXNWOCmYCOehqUBg+UwEJ4=; b=Snx/6kEUaBsQMokxOsd4Y2x0dr2D5EFyJQt1xNde2hdySOR2wX1la4CeVaqWYXzfJT 5va9ybm5Rxr/j350tu9XU9BXA+IHmzJ+1iGp6IV0+1jaas9RhKCBLzCLNgrUhIrziXtk HBJpp74eAqFCQFFaQZqIev0EHl0IsZjDAgqojTNAmDMZRSkHfu5g/eqROZ4ENGHmBnmE zWP5vXXaebNxMz1C0WNO8gCYMFdG37So7pT8/C9C+PmuQziCl8WbUs8lhchAhZmTshuG Peqn/feL9j5m2wFLhg6VpSGdQ/QeDRDzilO1JGas+JZng4TMbGYKkJI1p0Pf2FUg7sW4 FfKQ== X-Gm-Message-State: ALyK8tJTevTIjOg8aDDTR1m/nmWxx7bBfThyIVUiiE6YR7kQ8UR5Lfx22UYG2QrlHFzQOg== X-Received: by 10.28.30.23 with SMTP id e23mr10088865wme.66.1467203645284; Wed, 29 Jun 2016 05:34:05 -0700 (PDT) Received: from localhost.localdomain (563BD355.dsl.pool.telekom.hu. [86.59.211.85]) by smtp.gmail.com with ESMTPSA id j4sm3524559wjg.20.2016.06.29.05.34.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Jun 2016 05:34:04 -0700 (PDT) From: Zoltan Gyarmati To: buildroot@buildroot.org Date: Wed, 29 Jun 2016 14:33:40 +0200 Message-Id: <1467203620-11767-1-git-send-email-mr.zoltan.gyarmati@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH v1] package/grantlee: upgrade to 5.1.0, remove obsolote Qt4 build option X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Zoltan Gyarmati --- Changes -> v1: * remove constraints related to binutils bug 19405 * remove constraints related to archs microblaze and nios2 as they are already implicitly present via QT5_JSCORE_AVAILABLE package/grantlee/Config.in | 21 +++------------------ package/grantlee/grantlee.hash | 3 +-- package/grantlee/grantlee.mk | 11 +---------- 3 files changed, 5 insertions(+), 30 deletions(-) diff --git a/package/grantlee/Config.in b/package/grantlee/Config.in index 7895c7e..779306b 100644 --- a/package/grantlee/Config.in +++ b/package/grantlee/Config.in @@ -1,24 +1,9 @@ config BR2_PACKAGE_GRANTLEE bool "grantlee" - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # Qt Script - depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT && BR2_PACKAGE_QT) || \ - (BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module - # https://sourceware.org/bugzilla/show_bug.cgi?id=20173 - depends on !BR2_microblaze && !BR2_nios2 - select BR2_PACKAGE_QT_STL if BR2_PACKAGE_QT - select BR2_PACKAGE_QT_SCRIPT if BR2_PACKAGE_QT - select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT - select BR2_PACKAGE_QT5SCRIPT if BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5SCRIPT + select BR2_PACKAGE_QT5BASE_GUI help Qt implementation of the Django template framework http://www.grantlee.org - -comment "grantlee needs a toolchain with NPTL not affected by Binutils bug 19405" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on !BR2_microblaze && !BR2_nios2 - depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT && BR2_PACKAGE_QT) || \ - (BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 diff --git a/package/grantlee/grantlee.hash b/package/grantlee/grantlee.hash index 7f02bb3..cdff778 100644 --- a/package/grantlee/grantlee.hash +++ b/package/grantlee/grantlee.hash @@ -1,3 +1,2 @@ # Locally calculated after checking pgp signature -sha256 191809bf4c9b7ef877af0fd29345061c2372edfb4506aa7d5df5c71a570fa0ac grantlee-0.5.1.tar.gz -sha256 eaf22ba92e53b8eb5dd8bca045fe81b734d3445445ed9e0c1af2a0a7c375b161 grantlee-5.0.0.tar.gz +sha256 ea2e402466c74bb533eee2c7252209ec61cd93a5d236fecd625b4a0eb13a1478 grantlee-5.1.0.tar.gz diff --git a/package/grantlee/grantlee.mk b/package/grantlee/grantlee.mk index a300106..f8d9f8d 100644 --- a/package/grantlee/grantlee.mk +++ b/package/grantlee/grantlee.mk @@ -3,21 +3,12 @@ # grantlee # ################################################################################ -# qt4 support dropped after 0.5.1, so we use the older version for qt4 -ifeq ($(BR2_PACKAGE_QT),y) -GRANTLEE_VERSION = 0.5.1 -else ifeq ($(BR2_PACKAGE_QT5),y) -GRANTLEE_VERSION = 5.0.0 -endif +GRANTLEE_VERSION = 5.1.0 GRANTLEE_SITE = http://downloads.grantlee.org GRANTLEE_INSTALL_STAGING = YES GRANTLEE_LICENSE = LGPLv2.1+ GRANTLEE_LICENSE_FILES = COPYING.LIB -ifeq ($(BR2_PACKAGE_QT),y) -GRANTLEE_DEPENDENCIES = qt -else ifeq ($(BR2_PACKAGE_QT5),y) GRANTLEE_DEPENDENCIES += qt5base qt5script -endif $(eval $(cmake-package))