summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Fix-library-path-for-multilib-setups.patch25
-rw-r--r--recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb5
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 @@
1From 9692239a31f0e47ea75b60388d5491d5155a888d Mon Sep 17 00:00:00 2001
2From: Andreas Oberritter <obi@saftware.de>
3Date: Mon, 17 Dec 2018 14:00:44 +0100
4Subject: [PATCH] Fix library path for multilib setups.
5
6Upstream-Status: Pending
7
8Signed-off-by: Andreas Oberritter <obi@saftware.de>
9---
10 libconnman-qt/libconnman-qt.pro | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/libconnman-qt/libconnman-qt.pro b/libconnman-qt/libconnman-qt.pro
14index 8cd58e8..bad8a5e 100644
15--- a/libconnman-qt/libconnman-qt.pro
16+++ b/libconnman-qt/libconnman-qt.pro
17@@ -71,7 +71,7 @@ SOURCES += \
18 networksession.cpp \
19 counter.cpp
20
21-target.path = $$INSTALL_ROOT$$PREFIX/lib
22+target.path = $$[QT_INSTALL_LIBS]
23
24 headers.files = $$PUBLIC_HEADERS
25
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"
5LICENSE = "Apache-2.0" 5LICENSE = "Apache-2.0"
6LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88" 6LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
7DEPENDS += "qtbase qtdeclarative" 7DEPENDS += "qtbase qtdeclarative"
8PV = "1.2.7+git${SRCPV}" 8PV = "1.2.34+git${SRCPV}"
9 9
10SRCREV = "ad7fef1c35a3e897913965f73b879a14d65043dd" 10SRCREV = "a0b6b0d9a63f28ab41747892f415c89866d62e4a"
11SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https \ 11SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https \
12 file://0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch \ 12 file://0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch \
13 file://0001-Fix-library-path-for-multilib-setups.patch \
14" 13"
15 14
16S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"