diff options
| author | Herman van Hazendonk <github.com@herrie.org> | 2020-07-17 09:49:48 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-07-20 16:55:40 +0200 |
| commit | 862ba32a70cd938b8a7789c150ed3a60d34798fb (patch) | |
| tree | 1c9a709311dc83a0251d9757f0701d1c1aebcfe8 | |
| parent | 3713bcfaa084b99e2b29142ffcc5911b4596ccdd (diff) | |
libconnman-qt: Update to v1.2.34 from upstream and drop patch
Upstream finally supports multilib properly, so bumping our version and dropping the patch for this.
Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
| -rw-r--r-- | recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Fix-library-path-for-multilib-setups.patch | 25 | ||||
| -rw-r--r-- | recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb | 5 |
2 files changed, 2 insertions, 28 deletions
diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Fix-library-path-for-multilib-setups.patch b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Fix-library-path-for-multilib-setups.patch deleted file mode 100644 index 1e37bf55..00000000 --- a/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Fix-library-path-for-multilib-setups.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9692239a31f0e47ea75b60388d5491d5155a888d Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter <obi@saftware.de> -Date: Mon, 17 Dec 2018 14:00:44 +0100 -Subject: [PATCH] Fix library path for multilib setups. - -Upstream-Status: Pending - -Signed-off-by: Andreas Oberritter <obi@saftware.de> ---- - libconnman-qt/libconnman-qt.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libconnman-qt/libconnman-qt.pro b/libconnman-qt/libconnman-qt.pro -index 8cd58e8..bad8a5e 100644 ---- a/libconnman-qt/libconnman-qt.pro -+++ b/libconnman-qt/libconnman-qt.pro -@@ -71,7 +71,7 @@ SOURCES += \ - networksession.cpp \ - counter.cpp - --target.path = $$INSTALL_ROOT$$PREFIX/lib -+target.path = $$[QT_INSTALL_LIBS] - - headers.files = $$PUBLIC_HEADERS - diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb index f9fa27cd..06e3bbd4 100644 --- a/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb +++ b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb @@ -5,12 +5,11 @@ HOMEPAGE = "https://git.merproject.org/mer-core/libconnman-qt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88" DEPENDS += "qtbase qtdeclarative" -PV = "1.2.7+git${SRCPV}" +PV = "1.2.34+git${SRCPV}" -SRCREV = "ad7fef1c35a3e897913965f73b879a14d65043dd" +SRCREV = "a0b6b0d9a63f28ab41747892f415c89866d62e4a" SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https \ file://0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch \ - file://0001-Fix-library-path-for-multilib-setups.patch \ " S = "${WORKDIR}/git" |