summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorFelipe F. Tonello <eu@felipetonello.com>2013-05-11 00:04:22 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-06-20 12:30:48 +0200
commitc47471a1776d8616b5e4874e238a03c6f9feac08 (patch)
treed45d004e71cb53597fb5b95b6ef71a02920b67bb /meta-oe
parent903e7131ba5225b085cd612199e88697f2e9e493 (diff)
downloadmeta-openembedded-c47471a1776d8616b5e4874e238a03c6f9feac08.tar.gz
connman: updated libconnman-qt to 1.0.7
This new recipe version requires the changes in this patch: http://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg38148.html Signed-off-by: Felipe F. Tonello <eu@felipetonello.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-qt/libconnman-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch37
-rw-r--r--meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb (renamed from meta-oe/recipes-qt/libconnman-qt/libconnman-qt_0.4.0.bb)4
2 files changed, 1 insertions, 40 deletions
diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
deleted file mode 100644
index 6ec084d90..000000000
--- a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 3850acef7d914a22e3fc4130ad43b2cc47338d6f Mon Sep 17 00:00:00 2001
2From: "Felipe F. Tonello" <ftonello@cercacor.com>
3Date: Mon, 7 Jan 2013 17:13:22 -0800
4Subject: [PATCH] added flags to disable qml plugin and test program to
5 compile
6
7This is usefull when there is no need to compile test program and qml plugin.
8
9Upstream-Status: Accepted
10
11Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com>
12---
13 connman-qt.pro | 11 ++++++++++-
14 1 file changed, 10 insertions(+), 1 deletion(-)
15
16diff --git a/connman-qt.pro b/connman-qt.pro
17index 7d9ec99..425c41f 100644
18--- a/connman-qt.pro
19+++ b/connman-qt.pro
20@@ -1,4 +1,13 @@
21 TEMPLATE = subdirs
22-SUBDIRS += libconnman-qt test plugin
23+SUBDIRS += libconnman-qt
24 CONFIG += ordered
25
26+# CONFIG flag to disable test program
27+!notest {
28+ SUBDIRS += test
29+}
30+
31+# CONFIG flag to disable qml plugin
32+!noplugin {
33+ SUBDIRS += plugin
34+}
35--
361.7.9.5
37
diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_0.4.0.bb b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb
index 50c149f37..65a27319f 100644
--- a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_0.4.0.bb
+++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb
@@ -18,12 +18,10 @@ PACKAGES =+ "${PN}-plugin ${PN}-plugin-dbg"
18RRECOMMENDS_${PN} = "${PN}-plugin" 18RRECOMMENDS_${PN} = "${PN}-plugin"
19 19
20BRANCH = "master" 20BRANCH = "master"
21# this matches 0.4.0 tag 21SRCREV = "6a5e4f981112a90a8c19d82bd671da389d2af993"
22SRCREV = "3af5bd38d82255942f582398160a5d3354346ca3"
23 22
24SRC_URI = " \ 23SRC_URI = " \
25 git://github.com/nemomobile/${PN}.git;branch=${BRANCH} \ 24 git://github.com/nemomobile/${PN}.git;branch=${BRANCH} \
26 file://0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch \
27" 25"
28 26
29S = "${WORKDIR}/git" 27S = "${WORKDIR}/git"