From patchwork Fri Dec 2 22:27:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Gyarmati X-Patchwork-Id: 702168 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 3tVpgh4GqXz9sR9 for ; Sat, 3 Dec 2016 09:27:44 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EjiL+HWQ"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3CACC2D63B; Fri, 2 Dec 2016 22:27:41 +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 FXZXtVjCXP4E; Fri, 2 Dec 2016 22:27:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id C435B2C8B4; Fri, 2 Dec 2016 22:27: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 E005D1BFB22 for ; Fri, 2 Dec 2016 22:27:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DB7BA85B67 for ; Fri, 2 Dec 2016 22:27:36 +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 hY5fknPOMCmG for ; Fri, 2 Dec 2016 22:27:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wj0-f194.google.com (mail-wj0-f194.google.com [209.85.210.194]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 178E185B5F for ; Fri, 2 Dec 2016 22:27:36 +0000 (UTC) Received: by mail-wj0-f194.google.com with SMTP id j10so4493769wjb.3 for ; Fri, 02 Dec 2016 14:27:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=giUkXZvKTDIF+GZeti/iXU6GTDSM7XAo6QP3LV2q0jc=; b=EjiL+HWQyBztfoY+UdF6wAMPvy+/txOVHQSnbmtVx3ne1o9c3BeB5YJBHeE9f18Xs5 Yn7qyFnmQfwbymdIiesxZFvp9r72w8301eiiKXDEJwVr2GY1Z4zSJVDRBLPsykeUuTb0 bHHB7GDkpJ94US4JLQPlYRhQeobzk0t4rW2vFy8www/6U6XcpLOhs52vQDHw10Z3hrpn uOfyQ8L31o1x/0c5DqFRvDTLr+LfEYsYdbRx4PXzF1jmk1a8HFgMv4WeOfATXk7wVSpN 5H5xfKN0QDfdnTW+sxuQi8IsNRyqpyT82+lO+HUFrI6YhwUaMOG2naaf+M20oJ+5S6G1 l5IA== 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=giUkXZvKTDIF+GZeti/iXU6GTDSM7XAo6QP3LV2q0jc=; b=AHLBS8sY4JOPQNQIvncWuIsRdzDqJOY1tSvf7i+eNEmrJeFWRRBhiotOH74591cDEP p2iKRWNRtCkRnrnAjzxpV2XQplF+Pnv/ZGlmpNOhizWoMEtchafJbAtew2lsgQgjIW8d JwytenrSyYyMr+UN7faef8bU7B5TXBP0R6//hgjI1Z8+lHC5g+AA9Rrz/qHiHo4i3j9H Gc2lA8z4p5TGNItjQlZ31Aet6iY6xa+vtMuP4IymspZFfat8m5IJ6afmJGH4awrOTfC2 BQN2RLcYnPhbQOdCnjMVE9ZSojKaJ1nh9wFcqmW8aQnnZu/peVhs5Ij8nB5B5EeWlLUg GDWQ== X-Gm-Message-State: AKaTC02yXLiY+VUxqPw7UqxhtZ3DVSePvNhRztJ5LVpXSW0PhWQrtY7bq0ZOPeaZqNpvyA== X-Received: by 10.194.246.69 with SMTP id xu5mr40768177wjc.85.1480717654527; Fri, 02 Dec 2016 14:27:34 -0800 (PST) Received: from localhost.localdomain (563BDAAD.dsl.pool.telekom.hu. [86.59.218.173]) by smtp.gmail.com with ESMTPSA id l74sm5329006wmg.2.2016.12.02.14.27.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 02 Dec 2016 14:27:33 -0800 (PST) From: Zoltan Gyarmati To: buildroot@buildroot.org Date: Fri, 2 Dec 2016 23:27:26 +0100 Message-Id: <1480717646-7525-1-git-send-email-mr.zoltan.gyarmati@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH] package/qjson: upgrade to upstream 0.9.0, update CMakeLists.txt patch to properly apply 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 --- CMakeLists.txt patch is sent to upstream ...1-fix-Qt4-package-error-in-CMakeLists.txt.patch | 25 ++++++++++------------ package/qjson/qjson.hash | 2 +- package/qjson/qjson.mk | 2 +- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/package/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch b/package/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch index 6f7a9ba..a9e34e4 100644 --- a/package/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch +++ b/package/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch @@ -1,10 +1,7 @@ -From 45ec86156819c0872d023b05001682a8d2d2dc25 Mon Sep 17 00:00:00 2001 +From 254858bbf443bded2e80480e9f9032ce166b923e Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati -Date: Sat, 6 Apr 2013 16:54:25 +0200 -Subject: [PATCH] fix Qt4 package error in CMakeLists.txt - -Avoid checking for uic executable by cmake as it results configure -time error if QtGui isn't installed. +Date: Fri, 2 Dec 2016 23:00:58 +0100 +Subject: [PATCH] CMake, Qt4: check specifically for QtCore, fixes #96 Signed-off-by: Zoltan Gyarmati --- @@ -12,18 +9,18 @@ Signed-off-by: Zoltan Gyarmati 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index adb65e9..81854b1 100644 +index 31d9987..2fde79f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -52,7 +52,7 @@ IF (Qt5Core_FOUND) +@@ -62,7 +62,7 @@ IF (Qt5Core_FOUND) ELSE() MESSAGE ("Qt5 not found, searching for Qt4") # Find Qt4 -- FIND_PACKAGE( Qt4 REQUIRED ) -+ FIND_PACKAGE( Qt4 COMPONENTS QtCore REQUIRED ) - - # Include the cmake file needed to use qt4 - INCLUDE( ${QT_USE_FILE} ) +- FIND_PACKAGE( Qt4 4.5 REQUIRED ) ++ FIND_PACKAGE( Qt4 4.5 REQUIRED QtCore) + # QStringBuilder is supported since Qt 4.8 for both QString and QByteArray + IF (NOT (${QT_VERSION_MINOR} STRLESS "8")) + MESSAGE ("Enable QStringBuilder") -- -2.1.1 +2.7.4 diff --git a/package/qjson/qjson.hash b/package/qjson/qjson.hash index 6282227..d794b48 100644 --- a/package/qjson/qjson.hash +++ b/package/qjson/qjson.hash @@ -1,2 +1,2 @@ # locally computed -sha256 863f0dd6b7199f84acf1e2487735830fab316a9a3a5e1651130ad153a231f2ed qjson-ba273682a9d33a7b3090e74f4742b5f3bf6c9b02.tar.gz +sha256 e812617477f3c2bb990561767a4cd8b1d3803a52018d4878da302529552610d4 qjson-0.9.0.tar.gz diff --git a/package/qjson/qjson.mk b/package/qjson/qjson.mk index 6a16617..dab2381 100644 --- a/package/qjson/qjson.mk +++ b/package/qjson/qjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -QJSON_VERSION = ba273682a9d33a7b3090e74f4742b5f3bf6c9b02 +QJSON_VERSION = 0.9.0 QJSON_SITE = $(call github,flavio,qjson,$(QJSON_VERSION)) QJSON_INSTALL_STAGING = YES QJSON_DEPENDENCIES = \