diff options
| author |   Felipe F. Tonello <eu@felipetonello.com> | 2013-05-11 00:04:22 +0000 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-06-20 12:30:48 +0200 |
| commit | c47471a1776d8616b5e4874e238a03c6f9feac08 (patch) | |
| tree | d45d004e71cb53597fb5b95b6ef71a02920b67bb /meta-oe/recipes-qt | |
| parent | 903e7131ba5225b085cd612199e88697f2e9e493 (diff) | |
| download | meta-openembedded-contrib-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/recipes-qt')
| -rw-r--r-- | meta-oe/recipes-qt/libconnman-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch | 37 | ||||
| -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 6ec084d90b..0000000000 --- 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 @@ -From 3850acef7d914a22e3fc4130ad43b2cc47338d6f Mon Sep 17 00:00:00 2001 -From: "Felipe F. Tonello" <ftonello@cercacor.com> -Date: Mon, 7 Jan 2013 17:13:22 -0800 -Subject: [PATCH] added flags to disable qml plugin and test program to - compile - -This is usefull when there is no need to compile test program and qml plugin. - -Upstream-Status: Accepted - -Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com> ---- - connman-qt.pro | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/connman-qt.pro b/connman-qt.pro -index 7d9ec99..425c41f 100644 ---- a/connman-qt.pro -+++ b/connman-qt.pro -@@ -1,4 +1,13 @@ - TEMPLATE = subdirs --SUBDIRS += libconnman-qt test plugin -+SUBDIRS += libconnman-qt - CONFIG += ordered - -+# CONFIG flag to disable test program -+!notest { -+ SUBDIRS += test -+} -+ -+# CONFIG flag to disable qml plugin -+!noplugin { -+ SUBDIRS += plugin -+} --- -1.7.9.5 - 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 50c149f374..65a27319ff 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" RRECOMMENDS_${PN} = "${PN}-plugin" BRANCH = "master" -# this matches 0.4.0 tag -SRCREV = "3af5bd38d82255942f582398160a5d3354346ca3" +SRCREV = "6a5e4f981112a90a8c19d82bd671da389d2af993" SRC_URI = " \ git://github.com/nemomobile/${PN}.git;branch=${BRANCH} \ - file://0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch \ " S = "${WORKDIR}/git" |