From c47471a1776d8616b5e4874e238a03c6f9feac08 Mon Sep 17 00:00:00 2001 From: "Felipe F. Tonello" Date: Sat, 11 May 2013 00:04:22 +0000 Subject: 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 Signed-off-by: Martin Jansa --- ...-to-disable-qml-plugin-and-test-program-t.patch | 37 ------------ .../libconnman-qt/libconnman-qt_0.4.0.bb | 69 ---------------------- .../libconnman-qt/libconnman-qt_1.0.7.bb | 67 +++++++++++++++++++++ 3 files changed, 67 insertions(+), 106 deletions(-) delete mode 100644 meta-oe/recipes-qt/libconnman-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch delete mode 100644 meta-oe/recipes-qt/libconnman-qt/libconnman-qt_0.4.0.bb create mode 100644 meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb (limited to 'meta-oe/recipes-qt') 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 @@ -From 3850acef7d914a22e3fc4130ad43b2cc47338d6f Mon Sep 17 00:00:00 2001 -From: "Felipe F. Tonello" -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 ---- - 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_0.4.0.bb deleted file mode 100644 index 50c149f37..000000000 --- a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_0.4.0.bb +++ /dev/null @@ -1,69 +0,0 @@ -DESCRIPTION = "Qt Library for ConnMan" -HOMEPAGE = "https://github.com/nemomobile/libconnman-qt" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88" - -SECTION = "qt/lib" - -PR = "r0" - -inherit qt4x11 pkgconfig - -RDEPENDS_${PN} = "connman" -RDEPENDS_${PN}-plugin = "${PN}" - -PROVIDES += "${PN}-plugin" - -PACKAGES =+ "${PN}-plugin ${PN}-plugin-dbg" -RRECOMMENDS_${PN} = "${PN}-plugin" - -BRANCH = "master" -# this matches 0.4.0 tag -SRCREV = "3af5bd38d82255942f582398160a5d3354346ca3" - -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" - -QT_IMPORTS_DIR = "${libdir}/qt4/imports" -# the plugin target needs to be the same as 'target.path' and 'qmldir.path' in ${S}/plugin/plugin.pro -PLUGINS_TARGET = "${QT_IMPORTS_DIR}/MeeGo/Connman" - -EXTRA_QMAKEVARS_PRE = " \ - CONFIG+=notest \ -" - -do_configure_prepend() { - # Hack *.pro variables - find ${S}/plugin/*.pro -exec sed -i -e 's,$$\[QT_INSTALL_IMPORTS\],${QT_IMPORTS_DIR},g' '{}' ';' -} - -do_install() { - export INSTALL_ROOT=${D} - oe_runmake install -} - -FILES_${PN} = " \ - ${libdir}/libconnman-qt4${SOLIBS} \ -" - -FILES_${PN}-dev = " \ - ${includedir}/connman-qt/* \ - ${libdir}/libconnman-qt4${SOLIBSDEV} \ - ${libdir}/libconnman-qt4.prl \ - ${libdir}/pkgconfig/connman-qt4.pc \ - ${libdir}/connman-qt4.pc \ -" - -FILES_${PN}-plugin = " \ - ${PLUGINS_TARGET}/qmldir \ - ${PLUGINS_TARGET}/lib*.so \ -" - -FILES_${PN}-plugin-dbg = " \ - ${PLUGINS_TARGET}/.debug \ - ${PLUGINS_TARGET}/.debug/* \ -" diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb new file mode 100644 index 000000000..65a27319f --- /dev/null +++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb @@ -0,0 +1,67 @@ +DESCRIPTION = "Qt Library for ConnMan" +HOMEPAGE = "https://github.com/nemomobile/libconnman-qt" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88" + +SECTION = "qt/lib" + +PR = "r0" + +inherit qt4x11 pkgconfig + +RDEPENDS_${PN} = "connman" +RDEPENDS_${PN}-plugin = "${PN}" + +PROVIDES += "${PN}-plugin" + +PACKAGES =+ "${PN}-plugin ${PN}-plugin-dbg" +RRECOMMENDS_${PN} = "${PN}-plugin" + +BRANCH = "master" +SRCREV = "6a5e4f981112a90a8c19d82bd671da389d2af993" + +SRC_URI = " \ + git://github.com/nemomobile/${PN}.git;branch=${BRANCH} \ +" + +S = "${WORKDIR}/git" + +QT_IMPORTS_DIR = "${libdir}/qt4/imports" +# the plugin target needs to be the same as 'target.path' and 'qmldir.path' in ${S}/plugin/plugin.pro +PLUGINS_TARGET = "${QT_IMPORTS_DIR}/MeeGo/Connman" + +EXTRA_QMAKEVARS_PRE = " \ + CONFIG+=notest \ +" + +do_configure_prepend() { + # Hack *.pro variables + find ${S}/plugin/*.pro -exec sed -i -e 's,$$\[QT_INSTALL_IMPORTS\],${QT_IMPORTS_DIR},g' '{}' ';' +} + +do_install() { + export INSTALL_ROOT=${D} + oe_runmake install +} + +FILES_${PN} = " \ + ${libdir}/libconnman-qt4${SOLIBS} \ +" + +FILES_${PN}-dev = " \ + ${includedir}/connman-qt/* \ + ${libdir}/libconnman-qt4${SOLIBSDEV} \ + ${libdir}/libconnman-qt4.prl \ + ${libdir}/pkgconfig/connman-qt4.pc \ + ${libdir}/connman-qt4.pc \ +" + +FILES_${PN}-plugin = " \ + ${PLUGINS_TARGET}/qmldir \ + ${PLUGINS_TARGET}/lib*.so \ +" + +FILES_${PN}-plugin-dbg = " \ + ${PLUGINS_TARGET}/.debug \ + ${PLUGINS_TARGET}/.debug/* \ +" -- cgit v1.2.3-54-g00ecf