diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2014-10-28 12:48:03 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2015-04-22 10:07:59 +0200 |
| commit | 7c4f47fb0462628e12df38b022f37bd7e01aec46 (patch) | |
| tree | 534092de443feb43a7dc9529f12afdafc8ce2753 | |
| parent | b869611e829d7686869d9feea68592a2f2749914 (diff) | |
| download | meta-openembedded-contrib-7c4f47fb0462628e12df38b022f37bd7e01aec46.tar.gz | |
libconnman-qt: update to 1.0.83+gita244dd4
Remove patch which was applied upstream.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
3 files changed, 2 insertions, 46 deletions
diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc index 3f91be2a4d..8e46bc9051 100644 --- a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc +++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/nemomobile/libconnman-qt" SECTION = "qt/lib" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88" -SRCREV = "80ac184d859ea90c026403f5a520644945a5081a" -PV = "1.0.50+git${SRCPV}" +SRCREV = "a244dd42eb6526410c9e18b1fe7e486979e58594" +PV = "1.0.83+git${SRCPV}" SRC_URI = "git://github.com/nemomobile/libconnman-qt.git;branch=master" diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qte/plugin.pro-fix-build-with-custom-target-suffix.patch b/meta-oe/recipes-qt/libconnman-qt/libconnman-qte/plugin.pro-fix-build-with-custom-target-suffix.patch deleted file mode 100644 index 3ff68c8dc5..0000000000 --- a/meta-oe/recipes-qt/libconnman-qt/libconnman-qte/plugin.pro-fix-build-with-custom-target-suffix.patch +++ /dev/null @@ -1,42 +0,0 @@ -Upstream-Status: Submitted [https://github.com/nemomobile/libconnman-qt/pull/105] - -From 48da520b971af69d22e691a0ef6ff1c3ce901f0d Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter <obi@opendreambox.org> -Date: Tue, 11 Mar 2014 21:55:37 +0100 -Subject: [PATCH] plugin.pro: fix build with custom target suffix - -This went unnoticed because of a previously installed libconnman-qt4. - -Signed-off-by: Andreas Oberritter <obi@opendreambox.org> ---- - plugin/plugin.pro | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/plugin/plugin.pro b/plugin/plugin.pro -index c9534cf..9cdaa63 100644 ---- a/plugin/plugin.pro -+++ b/plugin/plugin.pro -@@ -8,14 +8,18 @@ INCLUDEPATH += ../libconnman-qt - LIBS += -L../libconnman-qt - QT -= gui - -+isEmpty(TARGET_SUFFIX) { -+ TARGET_SUFFIX = qt$$QT_MAJOR_VERSION -+} -+ -+LIBS += -l$$qtLibraryTarget(connman-$$TARGET_SUFFIX) -+ - equals(QT_MAJOR_VERSION, 4): { - QT += declarative -- LIBS += -lconnman-qt4 - } - - equals(QT_MAJOR_VERSION, 5): { - QT += qml -- LIBS += -lconnman-qt5 - OTHER_FILES += plugin.json qmldirs - } - --- -1.8.3.2 - diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb b/meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb index 9d44957ac2..7ee4bdb081 100644 --- a/meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb +++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb @@ -1,5 +1,3 @@ inherit qt4e require libconnman-qt.inc - -SRC_URI += "file://plugin.pro-fix-build-with-custom-target-suffix.patch" |