From patchwork Thu Jun 2 16:16:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Gyarmati X-Patchwork-Id: 629357 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rLC621l02z9t8B for ; Fri, 3 Jun 2016 02:16:42 +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=F0EOMRjQ; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BB6623147A; Thu, 2 Jun 2016 16:16:40 +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 1ZxTHTLOMfzQ; Thu, 2 Jun 2016 16:16:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A880A3140B; Thu, 2 Jun 2016 16:16:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 1D54B1C1178 for ; Thu, 2 Jun 2016 16:16:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 187EB8AFC1 for ; Thu, 2 Jun 2016 16:16:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JkRCaXPiHsQ5 for ; Thu, 2 Jun 2016 16:16:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id C0AD887CF3 for ; Thu, 2 Jun 2016 16:16:35 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id a136so17166008wme.0 for ; Thu, 02 Jun 2016 09:16:35 -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=a42+yXXVqQV14bvodxn2dznIgMQYTom7CawrxbfD1XE=; b=F0EOMRjQJMs/dUhNhOWGXD9POq/h/M+Tt1Za3D3pk2939UsAC4qDIrEs4IQttYzk7L zrKEUDDYABTMa/2iZdcmbVeE+X734UWUPVlPzQotns7FZDcj97Clmp1R6YH5DCnolj41 fVv6YiTxMY92/BLGt4bBWWWcbBhr+6kghy/pGyYbHtdJRKAIPxdSUdRmjQjdFmXMvNUI Wl70HoOkcq6StfbZsPZ3ifboUSUKcPrgcWkW2H6sU/D3PfZh/f4YRNrj08YpEi8fNDVt A3o9EotR27sLM5AS6eBZxHuROlTEswAS4TgHN6ycB1DziGIVofhQxzLm87JQw/JAg4FF 3K7Q== 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=a42+yXXVqQV14bvodxn2dznIgMQYTom7CawrxbfD1XE=; b=A4Y3R9Tiaoec2kwSm3WgwKo9lgkW/tYQjDU3o/Yg2mAqxaIjQ8F+WuZciscuyPuCOA 3FbkOYD3xFbFGJLFtOGQuBka3tCriSZBxRfUGITufqLgspWMgAS9VhlE19DpaOzW64uG 4dKa+9SOY+OlZfnfrKAJPmOABKauO+Jr+jTG7OMeBMMBfxb/yRDaBHlroMiHXqC8Rf12 CpvrvkyK7Zv9ZsWhjEBDowH85CS82oPA9CXP94Tn1q6BgNYPotaCWtw/r0byV8+NbQKT 6Jhgbjq8g4VFUBwjpYmf9HZnvjUIEsm1Q9R/hXf0NJrR8ZfmWi2np4DNEu6rF5AILo6W gzWQ== X-Gm-Message-State: ALyK8tKYFpA5EzTca5gBNK6IfkE9AggVqUWhg758wdT9JIu9KySeVcMyFMWaVLs3LPOdew== X-Received: by 10.28.111.29 with SMTP id k29mr5462795wmc.58.1464884194299; Thu, 02 Jun 2016 09:16:34 -0700 (PDT) Received: from zgyarmati-ThinkPad-T510.lan (dsl51B7DCB4.fixip.t-online.hu. [81.183.220.180]) by smtp.gmail.com with ESMTPSA id m8sm1286573wjd.34.2016.06.02.09.16.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 Jun 2016 09:16:33 -0700 (PDT) From: Zoltan Gyarmati To: buildroot@buildroot.org Date: Thu, 2 Jun 2016 18:16:08 +0200 Message-Id: <1464884168-24478-1-git-send-email-mr.zoltan.gyarmati@gmail.com> X-Mailer: git-send-email 2.5.0 Subject: [Buildroot] [PATCH 1/1] 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 --- In upstream the Qt4 build is not supported since 2 releases, earlier we built the latest Qt4 supporting version if Qt4 was built, but IMHO if the upstream has stopped supporting Qt4 we also safe to do so. Hopefully this transition period was enough for the dependecies to migrate to Qt5. If somebody still uses Grantlee with Qt4 though, pls let me know and i'll post an other patch with keeping Qt4 support. package/grantlee/Config.in | 13 ++++--------- package/grantlee/grantlee.hash | 3 +-- package/grantlee/grantlee.mk | 11 +---------- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package/grantlee/Config.in b/package/grantlee/Config.in index 7895c7e..77e50e6 100644 --- a/package/grantlee/Config.in +++ b/package/grantlee/Config.in @@ -1,16 +1,12 @@ 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_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 + select BR2_PACKAGE_QT5SCRIPT + select BR2_PACKAGE_QT5BASE_GUI help Qt implementation of the Django template framework @@ -19,6 +15,5 @@ config BR2_PACKAGE_GRANTLEE 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) || \ + depends on (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))