summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>2013-04-08 10:35:48 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-04-21 21:09:32 (GMT)
commitecfee1073251147f3cbdcbaa531eb5e2b61f4824 (patch)
tree80ef9ad091fb5593c5ebc1bb29395cff421f1b38
parent05554f1747bbc2b358819ced2b9d674be6d21db7 (diff)
downloadbuildroot-ecfee1073251147f3cbdcbaa531eb5e2b61f4824.tar.gz
buildroot-ecfee1073251147f3cbdcbaa531eb5e2b61f4824.tar.bz2
qjson: new package
[Peter: misc white space fixes] Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/Config.in1
-rw-r--r--package/qjson/Config.in7
-rw-r--r--package/qjson/qjson-fix-qt4-package-error-in-cmakelists.patch29
-rw-r--r--package/qjson/qjson.mk15
4 files changed, 52 insertions, 0 deletions
diff --git a/package/Config.in b/package/Config.in
index f28cedd..54a9a2b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -144,6 +144,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..c15b12f
--- /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..058973e
--- /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 <mr.zoltan.gyarmati@gmail.com>
+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 <mr.zoltan.gyarmati@gmail.com>
+---
+ 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..d203cd5
--- /dev/null
+++ b/package/qjson/qjson.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# 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))