diff options
Diffstat (limited to 'recipes-connectivity')
6 files changed, 69 insertions, 43 deletions
diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Add-missing-declarations-for-operator-overloads.patch b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Add-missing-declarations-for-operator-overloads.patch new file mode 100644 index 00000000..1f7ec0c8 --- /dev/null +++ b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Add-missing-declarations-for-operator-overloads.patch @@ -0,0 +1,31 @@ +From 09fcee5c5750a3345e4378cd462cbb9aeba5e269 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 11 Aug 2020 22:20:17 -0700 +Subject: [PATCH] Add missing declarations for operator overloads + +This fixes clang-11 errors e.g. + +| ../../recipe-sysroot/usr/include/QtDBus/qdbusargument.h:276:13: error: invalid operands to binary expression ('const QDBusArgument' and 'RouteStructure') +| arg >> item; +| ~~~ ^ ~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libconnman-qt/marshalutils.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/libconnman-qt/marshalutils.cpp ++++ b/libconnman-qt/marshalutils.cpp +@@ -36,6 +36,11 @@ + + #include "marshalutils.h" + ++#if defined(__clang__) && __clang_major__ >= 11 ++Q_DBUS_EXPORT const QDBusArgument &operator>>(const QDBusArgument &a, RouteStructure &v); ++Q_DBUS_EXPORT QDBusArgument &operator<<(QDBusArgument &a, const RouteStructure &v); ++#endif ++ + // Empty namespace for local static functions + namespace { + diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch index 7a67c744..028e3f5c 100644 --- a/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch +++ b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch @@ -12,11 +12,9 @@ Signed-off-by: Herman van Hazendonk <github.com@herrie.org> plugin/qmldir | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/plugin/plugin.cpp b/plugin/plugin.cpp -index a383482..451c95f 100644 --- a/plugin/plugin.cpp +++ b/plugin/plugin.cpp -@@ -24,7 +24,7 @@ +@@ -34,7 +34,7 @@ static QObject *singleton_api_factory(QQ class ConnmanPlugin: public QQmlExtensionPlugin { Q_OBJECT @@ -25,27 +23,21 @@ index a383482..451c95f 100644 public: void registerTypes(const char *uri); -diff --git a/plugin/plugin.pro b/plugin/plugin.pro -index c4f54cf..3763f57 100644 --- a/plugin/plugin.pro +++ b/plugin/plugin.pro -@@ -17,7 +17,7 @@ LIBS += -l$$qtLibraryTarget(connman-$$TARGET_SUFFIX) +@@ -17,7 +17,7 @@ LIBS += -l$$qtLibraryTarget(connman-$$TA QT += qml - OTHER_FILES += plugin.json qmldirs + OTHER_FILES += plugin.json plugins.qmltypes qmldirs -MODULENAME = MeeGo/Connman +MODULENAME = Connman TARGETPATH = $$[QT_INSTALL_QML]/$$MODULENAME target.path = $$TARGETPATH -diff --git a/plugin/qmldir b/plugin/qmldir -index 5db82b7..de56688 100644 --- a/plugin/qmldir +++ b/plugin/qmldir -@@ -1,2 +1,2 @@ +@@ -1,3 +1,3 @@ -module MeeGo.Connman +module Connman plugin ConnmanQtDeclarative --- -2.11.0.windows.3 - + typeinfo plugins.qmltypes 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..bc84224e 100644 --- a/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb +++ b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb @@ -5,12 +5,12 @@ 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 \ + file://0001-Add-missing-declarations-for-operator-overloads.patch \ " S = "${WORKDIR}/git" diff --git a/recipes-connectivity/libqofono/libqofono_git.bb b/recipes-connectivity/libqofono/libqofono_git.bb index 7de0e49b..6ed5511c 100644 --- a/recipes-connectivity/libqofono/libqofono_git.bb +++ b/recipes-connectivity/libqofono/libqofono_git.bb @@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS += "qtbase qtdeclarative qtxmlpatterns" -SRCREV = "3581a6e85561da85858e1b90bef9be88b87acc4d" +SRCREV = "4eec0c726844b8293eeab7312c96956a77d40e90" SRC_URI = "git://git.merproject.org/mer-core/libqofono.git \ file://0001-also-emit-modemRemoved-and-modemAdded.patch \ " S = "${WORKDIR}/git" -PV = "0.98+gitr${SRCPV}" +PV = "0.100+gitr${SRCPV}" inherit qmake5 diff --git a/recipes-connectivity/libqofono/libqofonoext_git.bb b/recipes-connectivity/libqofono/libqofonoext_git.bb new file mode 100644 index 00000000..b14aca5f --- /dev/null +++ b/recipes-connectivity/libqofono/libqofonoext_git.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Qt 5 bindings for the ofono dbus API for Jolla's oFono extensions" +SECTION = "libs" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://src/qofonoext.cpp;;beginline=1;endline=14;md5=e78738e9230b2e0f55eb7f63e3444df5" + +DEPENDS += "qtbase qtdeclarative qtxmlpatterns libqofono" + +SRCREV = "bd0999247f3c6446463f83b1f86c3de39c1a5425" +SRC_URI = "git://git.sailfishos.org/mer-core/libqofonoext.git;protocol=https;" +S = "${WORKDIR}/git" + +PV = "1.025+gitr${SRCPV}" + +inherit qmake5 + +do_install_append() { + if ls ${D}${libdir}/pkgconfig/qofono-qt5.pc >/dev/null 2>/dev/null; then + sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/qofono-qt5.pc + fi +} + +PACKAGES += "${PN}-tests" + +FILES_${PN} += " \ + ${OE_QMAKE_PATH_QML}/org/nemomobile/ofono/qmldir \ + ${OE_QMAKE_PATH_QML}/org/nemomobile/ofono/plugins.qmltypes \ + ${OE_QMAKE_PATH_QML}/org/nemomobile/ofono/libqofonoextdeclarative.so \ +" |