From patchwork Mon Apr 8 20:35:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Gyarmati X-Patchwork-Id: 234889 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 0DAE82C00AA for ; Tue, 9 Apr 2013 06:36:23 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 82CEAA0251; Mon, 8 Apr 2013 20:36:21 +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 p5WLN+eUPOEI; Mon, 8 Apr 2013 20:36:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3F2C0A0101; Mon, 8 Apr 2013 20:36:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 1DC588F75E for ; Mon, 8 Apr 2013 20:36:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 83D378C907 for ; Mon, 8 Apr 2013 20:36:16 +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 2anOSFUbrz9T for ; Mon, 8 Apr 2013 20:36:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-bk0-f54.google.com (mail-bk0-f54.google.com [209.85.214.54]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5DCF28C6E2 for ; Mon, 8 Apr 2013 20:36:15 +0000 (UTC) Received: by mail-bk0-f54.google.com with SMTP id q16so3322074bkw.13 for ; Mon, 08 Apr 2013 13:36:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=rDmZ0l4sRNI53PFRjcwluteZkV1jtOzaFDTgqqYzFYY=; b=iz46Iqv6eA1ycyARhrFOLIsZaDofYVzFk5KvC9mOEMyVWj9niHVhawQvv9pXg/N68y ZKhbeNGE+6wdZix99hfVjV74450TDxFzjZTDNkvvLKMrsL0diAfzWzqJCGHA9x7XnzDi l168ofUMWR67ALSv7dqwYZx/a+XdUQMKLL1vCzDK6XtqZ/gsXhvCO8JSflBAa9k+vvsV Y4uMIly8nTxQLI5oM4uHcYSF316nOB2L2fWwVNKgPlQ4SxXD8f+76JkPe3mq+hMGTBOT HMmGwuWPDjP6+QHRxyANYK+DzU4CRdvsWTDULr8BUry66ugJLva1ZRSwzGVFf1/H6rGn Jxow== X-Received: by 10.204.162.8 with SMTP id t8mr11770062bkx.95.1365453373587; Mon, 08 Apr 2013 13:36:13 -0700 (PDT) Received: from localhost.localdomain (g230147005.adsl.alicedsl.de. [92.230.147.5]) by mx.google.com with ESMTPS id da16sm4170897bkb.2.2013.04.08.13.36.11 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Apr 2013 13:36:12 -0700 (PDT) From: Zoltan Gyarmati To: buildroot@busybox.net Date: Mon, 8 Apr 2013 22:35:48 +0200 Message-Id: <1365453348-21409-1-git-send-email-mr.zoltan.gyarmati@gmail.com> X-Mailer: git-send-email 1.7.10.4 Subject: [Buildroot] [PATCH resend] qjson: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net Signed-off-by: Zoltan Gyarmati --- package/Config.in | 1 + package/qjson/Config.in | 7 +++++ ...qjson-fix-qt4-package-error-in-cmakelists.patch | 29 ++++++++++++++++++++ package/qjson/qjson.mk | 16 +++++++++++ 4 files changed, 53 insertions(+) create mode 100644 package/qjson/Config.in create mode 100644 package/qjson/qjson-fix-qt4-package-error-in-cmakelists.patch create mode 100644 package/qjson/qjson.mk diff --git a/package/Config.in b/package/Config.in index 69d87f0..f84d8d0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -143,6 +143,7 @@ if BR2_PACKAGE_QT comment "QT libraries and helper libraries" source "package/grantlee/Config.in" source "package/qextserialport/Config.in" +source "package/qjson/Config.in" source "package/qtuio/Config.in" source "package/qwt/Config.in" endif diff --git a/package/qjson/Config.in b/package/qjson/Config.in new file mode 100644 index 0000000..145fc3d --- /dev/null +++ b/package/qjson/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_QJSON + bool "qjson" + help + QJson is a Qt-based library that maps JSON data to + QVariant objects and vice versa. + + http://qjson.sourceforge.net diff --git a/package/qjson/qjson-fix-qt4-package-error-in-cmakelists.patch b/package/qjson/qjson-fix-qt4-package-error-in-cmakelists.patch new file mode 100644 index 0000000..f2559e4 --- /dev/null +++ b/package/qjson/qjson-fix-qt4-package-error-in-cmakelists.patch @@ -0,0 +1,29 @@ +From 529e50939316abc3c4190f89a482b17a4d4b3355 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. + +Signed-off-by: Zoltan Gyarmati +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 13e65f1..447f209 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,7 +32,7 @@ SET(FRAMEWORK_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/Library/Frameworks" + SET(QT_USE_IMPORTED_TARGETS TRUE) + + # Find Qt4 +-FIND_PACKAGE( Qt4 REQUIRED ) ++find_package(Qt4 COMPONENTS QtCore REQUIRED ) + + IF (NOT WIN32) + SET( QT_DONT_USE_QTGUI TRUE ) +-- +1.7.10.4 + diff --git a/package/qjson/qjson.mk b/package/qjson/qjson.mk new file mode 100644 index 0000000..e856d47 --- /dev/null +++ b/package/qjson/qjson.mk @@ -0,0 +1,16 @@ +############################################################# +# +# qjson +# +############################################################# + +QJSON_VERSION = 0.8.1 + +QJSON_SITE = http://github.com/flavio/qjson/tarball/$(QJSON_VERSION) +QJSON_INSTALL_STAGING = YES +QJSON_DEPENDENCIES = qt +QJSON_LICENSE = LGPLv2.1 +QJSON_LICENSE_FILES = COPYING.lib + +$(eval $(cmake-package)) +