Commit b3df4781 authored by Jenkins's avatar Jenkins

New upstream version 0.94

parent eb836939
build
run
libqofono.pro.user*
*~
*.a
*.la
*.core
*.moc
*.o
*.obj
*.orig
*.swp
*.rej
*.so
*.pbxuser
*.mode1
*.mode1v3
*_pch.h.cpp
*_resource.rc
.#*
*.*#
core
.qmake.cache
.qmake.vars
config.log
*.prl
tags
.DS_Store
*.debug
Makefile*
*.app
*.pro.user
*.qmlproject.user
*.gcov
moc_*.cpp
ui_*.h
qrc_*.cpp
This diff is collapsed.
qofono
======
A library for accessing the ofono daemon, and a declarative plugin for it. This allows accessing ofono in qtquick and friends.
- audio settings API
- cdma* API
- dundee API
- simtoolkit API
include: 'https://gitlab.com/debian-pm/tools/build/raw/master/docker/gitlab-ci-base.yml'
image: jbbgameich/build
libqofono (0.94-1) UNRELEASED; urgency=medium
* New upstream release
-- Jonah Brüchert <jbb@kaidan.im> Sun, 24 Jun 2018 17:20:52 +0200
libqofono (0.92-1) unstable; urgency=medium
* New upstream release
* Standards version 4.1.3
* compat 11
-- Jonah Brüchert <jbb.mail@gmx.de> Tue, 03 Apr 2018 15:33:31 +0200
libqofono (0.90+16.10.20160901-0ubuntu1) yakkety; urgency=medium
* New upstream release
* debian/control
- Dropped recommends for ofono to a suggests
- Renamed QML module to follow qml-module-ofono naming (LP: #1342031)
-- Ken VanDine <ken.vandine@canonical.com> Thu, 01 Sep 2016 14:59:50 +0000
libqofono (0.82+16.04.20160127-0ubuntu1) xenial; urgency=medium
* Make ofono dependency optional (LP: #1521142)
-- Pete Woods <ci-train-bot@canonical.com> Wed, 27 Jan 2016 14:19:53 +0000
libqofono (0.82+15.10.20150925-0ubuntu1) wily; urgency=medium
* libqofono-dev should depend on libqofono-qt5-0 (= ${binary:Version}
-- Ken VanDine <ken.vandine@canonical.com> Fri, 25 Sep 2015 13:57:19 +0000
libqofono (0.82+15.10.20150911-0ubuntu1) wily; urgency=medium
[ Ken VanDine ]
* New upstream release.
* -debian/patches/expose_modem_tech.patch
- Dropped, upstream now provides availableTechnologies
* debian/control
- Bumped ofono depends to 1.16 for availableTechnologies
* added packaging added: .bzr-builddeb/ .bzr-builddeb/default.conf
debian/ debian/changelog debian/compat debian/control
debian/copyright debian/libqofono-dev.install debian/libqofono-qt5-
0.install debian/patches/ debian/patches/connman-resetcontexts.patch
debian/patches/context-preferred.patch
debian/patches/mtk_settings_binding.patch debian/patches/series
debian/qtdeclarative5-ofono0.2.install debian/rules debian/source/
debian/source/format
-- Tony Espy <ci-train-bot@canonical.com> Fri, 11 Sep 2015 12:50:11 +0000
libqofono (0.79-0ubuntu2~gcc5.1) wily; urgency=medium
* No-change test rebuild for g++5 ABI transition
-- Steve Langasek <steve.langasek@ubuntu.com> Fri, 17 Jul 2015 22:20:07 +0000
libqofono (0.79-0ubuntu1) wily; urgency=medium
* New upstream release.
* debian/patchescontext-preferred.patch
debian/patches/connman-resetcontexts.patch
debian/patches/mtk_settings_binding.patch
debian/patches/expose_modem_tech.patch: Updated
-- Ken VanDine <ken.vandine@canonical.com> Fri, 26 Jun 2015 10:16:02 -0400
libqofono (0.70-0ubuntu4) wily; urgency=medium
[ Jonas Drange ]
* debian/patches/connman-resetcontexts.patch
- Added bindings to Ofono's reset context API (LP: #1338758)
-- Ken VanDine <ken.vandine@canonical.com> Thu, 21 May 2015 16:16:51 -0400
libqofono (0.70-0ubuntu3) vivid; urgency=medium
* debian/patches/context-preferred.patch
- Added bindings to the Ofono ConnectionContext's "Preferred" property,
patch thanks to Jonas Drange
* debian/control
- depend on ofono >= 1.12.bzr6892+15.04.20150407, required for the
preferred property
-- Ken VanDine <ken.vandine@canonical.com> Wed, 22 Apr 2015 10:58:17 -0400
libqofono (0.70-0ubuntu2) vivid; urgency=medium
* debian/control
- fixed typo in breaks
-- Ken VanDine <ken.vandine@canonical.com> Wed, 14 Jan 2015 09:36:03 -0500
libqofono (0.70-0ubuntu1) vivid; urgency=medium
* New upstream release.
* Dropped patches applied upstream, service_numbers.patch and
fix_multiarch.patch
* Refreshed expose_modem_tech.patch and mtk_settings_binding.patch
-- Ken VanDine <ken.vandine@canonical.com> Mon, 12 Jan 2015 11:32:24 -0500
libqofono (0.53-0ubuntu3) vivid; urgency=medium
* debian/patches/mtk_settings_binding.patch
- add mtk (mediatek) settings binding which allows consumer
to set which modem to allow 3G communication (LP: #1373388)
-- Ken VanDine <ken.vandine@canonical.com> Fri, 21 Nov 2014 10:07:54 -0500
libqofono (0.53-0ubuntu2) utopic; urgency=medium
* debian/patches/expose_modem_tech.patch
- radiosettings: expose modemtechnologies (LP: #1346790)
-- Ken VanDine <ken.vandine@canonical.com> Wed, 20 Aug 2014 11:17:52 -0400
libqofono (0.53-0ubuntu1) utopic; urgency=low
[ Ken VanDine ]
* New package
[ Łukasz 'sil2100' Zemczak ]
* debian/patches/fix_multiarch.patch:
- Fix qmake files to enable proper multiarch support during package build.
* Prepare proper copyright information
-- Ken VanDine <ken.vandine@canonical.com> Wed, 18 Jun 2014 13:02:42 -0400
Source: libqofono
Section: libs
Priority: extra
Maintainer: Ken VanDine <ken.vandine@ubuntu.com>
Build-Depends: debhelper (>= 11),
libqt5xmlpatterns5-dev,
pkg-config,
qml-module-qtquick2,
qtbase5-dev,
qtchooser,
qtdeclarative5-dev
Standards-Version: 4.2.1
Homepage: https://git.merproject.org/mer-core/libqofono
Vcs-Git: https://gitlab.com/debian-pm/libs/libqofono.git
Vcs-Browser: https://gitlab.com/debian-pm/libs/libqofono
Package: libqofono-qt5-0
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: ofono (>= 1.16)
Description: Qt library for Ofono
A library for accessing the ofono daemon, and a declarative plugin for
it. This allows accessing ofono in qtquick and friends.
Package: libqofono-dev
Section: libdevel
Architecture: any
Depends: libqofono-qt5-0 (= ${binary:Version}), ${misc:Depends}
Description: Qt library for Ofono
A library for accessing the ofono daemon, and a declarative plugin for
it. This allows accessing ofono in qtquick and friends.
Package: qml-module-ofono
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: qtdeclarative5-ofono0.2, ubuntu-system-settings (<< 0.3+15.04.20150114)
Replaces: qtdeclarative5-ofono0.2
Description: QML bindings for libqofono
A library for accessing the ofono daemon, and a declarative plugin for
it. This allows accessing ofono in qtquick and friends.
Package: libqofono-tests
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: QML bindings for libqofono
A library for accessing the ofono daemon, and a declarative plugin for
it. This allows accessing ofono in qtquick and friends.
This package contains tests.
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: libqofono
Source: https://git.merproject.org/mer-core/libqofono
Files: *
Copyright: 2013, Jolla Ltd.
License: LGPL-2.1
Files: plugin/*
Copyright: 2013-2017, Jolla Ltd.
License: LGPL-2.1
Files: plugin/qmldir
Copyright: 2013, Jolla Ltd.
License: LGPL-2.1
Files: src/*
Copyright: 2013-2017, Jolla Ltd.
License: LGPL-2.1
Files: src/dbus/*
Copyright: 2012, Nokia Corporation and/or its subsidiary(-ies)
License: LGPL-2.1
Files: test/*
Copyright: 2013, Jolla Ltd
License: LGPL-2.1
Files: test/auto/tests/*
Copyright: 2010, 2011, Nokia Corporation and/or its subsidiary(-ies).
License: LGPL-2.1
Files: test/auto/tests/runtest.sh
Copyright: 2010, 2011, Nokia Corporation and/or its subsidiary(-ies)
License: LGPL-2.1
Files: test/auto/tests/tst_qofonocellbroadcast.cpp
Copyright: 2012, Jolla
License: LGPL-2.1
Files: test/auto/tests/tst_qofonomultipartycall.cpp
Copyright: 2011, Nokia Corporation and/or its subsidiary(-ies).
2011, Intel Corporation
License: LGPL-2.1
Files: test/auto/tests/tst_qofonoradiosettings.cpp
test/auto/tests/tst_qofonosimmanager.cpp
Copyright: 2014, 2015, Jolla Ltd.
2010, Nokia Corporation and/or its subsidiary(-ies).
License: LGPL-2.1
License: LGPL-2.1
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; version 2.1.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
On Debian systems, the complete text of the GNU Lesser General Public
License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
usr/include
usr/lib/*/*ofono*.so
usr/lib/*/pkgconfig
usr/share/qt5/mkspecs
usr/lib/*/libqofono-qt5/tests/
--- a/src/dbus/ofono_connection_manager.xml
+++ b/src/dbus/ofono_connection_manager.xml
@@ -18,6 +18,7 @@
<arg type="o" direction="in"/>
</method>
<method name="DeactivateAll"/>
+ <method name="ResetContexts"/>
<method name="GetContexts">
<arg type="a(oa{sv})" direction="out"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="ObjectPathPropertiesList"/>
--- a/src/qofonoconnectionmanager.cpp
+++ b/src/qofonoconnectionmanager.cpp
@@ -143,6 +143,21 @@ void QOfonoConnectionManager::removeCont
}
}
+void QOfonoConnectionManager::resetContexts()
+{
+ OfonoConnectionManager *iface = (OfonoConnectionManager*)dbusInterface();
+ if (iface) {
+ QDBusPendingReply<> deactivate = iface->DeactivateAll();
+ deactivate.waitForFinished();
+ QDBusPendingReply<> reset = iface->ResetContexts();
+ reset.waitForFinished();
+ if (reset.isError()) {
+ qDebug() << reset.error();
+ Q_EMIT reportError(reset.error().message());
+ }
+ }
+}
+
bool QOfonoConnectionManager::attached() const
{
return getBool("Attached");
--- a/src/qofonoconnectionmanager.h
+++ b/src/qofonoconnectionmanager.h
@@ -79,6 +79,7 @@ public slots:
void deactivateAll();
void addContext(const QString &type);
void removeContext(const QString &path);
+ void resetContexts();
private slots:
void onAddContextFinished(QDBusPendingCallWatcher *watch);
--- a/test/auto/tests/tst_qofonoconnman.cpp
+++ b/test/auto/tests/tst_qofonoconnman.cpp
@@ -107,8 +107,45 @@ private slots:
QCOMPARE(rem.count(), 0);
}
+ void testResetContexts()
+ {
+ Q_FOREACH (QString context, m->contexts()) {
+ m->removeContext(context);
+ }
+ QTRY_VERIFY(m->contexts().isEmpty());
+
+ QSignalSpy pow(m, SIGNAL(poweredChanged(bool)));
+ QSignalSpy add(m, SIGNAL(contextAdded(QString)));
+ QSignalSpy rem(m, SIGNAL(contextRemoved(QString)));
+
+ // Add new context.
+ m->addContext(QString("internet"));
+ QTRY_COMPARE(add.count(), 1);
+ QString path = add.takeFirst().at(0).toString();
+ QOfonoConnectionContext* contextInternet = new QOfonoConnectionContext(this);
+ contextInternet->setContextPath(path);
+
+ // We activate context to make sure connman is deactivating on reset.
+ contextInternet->setActive(true);
+ QTRY_VERIFY(contextInternet->active());
+
+ // Connman needs to be powered down before calling reset.
+ m->setPowered(false);
+ QTRY_COMPARE(pow.count(), 1);
+ QCOMPARE(pow.takeFirst().at(0).toBool(), false);
+ QCOMPARE(m->powered(), false);
+
+ m->resetContexts();
+ QTRY_COMPARE(rem.count(), 1);
+ }
+
void cleanupTestCase()
{
+ QSignalSpy pow(m, SIGNAL(poweredChanged(bool)));
+ m->setPowered(true);
+ QTRY_COMPARE(pow.count(), 1);
+ QCOMPARE(pow.takeFirst().at(0).toBool(), true);
+ QCOMPARE(m->powered(), true);
}
private:
--- a/src/qofonoconnectioncontext.cpp
+++ b/src/qofonoconnectioncontext.cpp
@@ -117,6 +117,8 @@ void QOfonoConnectionContext::propertyCh
SUPER::propertyChanged(property, value);
if (property == QLatin1String("Active")) {
Q_EMIT activeChanged(value.value<bool>());
+ } else if (property == QLatin1String("Preferred")) {
+ Q_EMIT preferredChanged(value.value<bool>());
} else if (property == QLatin1String("Name")) {
Q_EMIT nameChanged(value.value<QString>());
} else if (property == QLatin1String("AccessPointName")) {
@@ -147,6 +149,11 @@ bool QOfonoConnectionContext::active() c
return getBool("Active");
}
+bool QOfonoConnectionContext::preferred() const
+{
+ return getBool("Preferred");
+}
+
QString QOfonoConnectionContext::accessPointName() const
{
return getString("AccessPointName");
@@ -211,6 +218,11 @@ void QOfonoConnectionContext::setActive(
setProperty("Active", value);
}
+void QOfonoConnectionContext::setPreferred(const bool value)
+{
+ setProperty("Preferred", value);
+}
+
void QOfonoConnectionContext::setAccessPointName(const QString &value)
{
setProperty("AccessPointName", value);
--- a/src/qofonoconnectioncontext.h
+++ b/src/qofonoconnectioncontext.h
@@ -28,6 +28,7 @@ class QOFONOSHARED_EXPORT QOfonoConnecti
{
Q_OBJECT
Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
+ Q_PROPERTY(bool preferred READ preferred WRITE setPreferred NOTIFY preferredChanged)
Q_PROPERTY(bool provisioning READ provisioning NOTIFY provisioningChanged)
Q_PROPERTY(QString accessPointName READ accessPointName WRITE setAccessPointName NOTIFY accessPointNameChanged)
Q_PROPERTY(QString type READ type WRITE setType NOTIFY typeChanged)
@@ -56,6 +57,9 @@ public:
bool provisioning() const;
+ bool preferred() const;
+ void setPreferred(bool);
+
QString accessPointName() const;
void setAccessPointName(const QString &);
@@ -104,6 +108,7 @@ public:
Q_SIGNALS:
void disconnectRequested();
void activeChanged(bool active);
+ void preferredChanged(bool preferred);
void provisioningChanged(bool provisioning);
void accessPointNameChanged(const QString &apn);
void nameChanged(const QString &name);
--- a/test/auto/tests/tst_qofonoconnmancontext.cpp
+++ b/test/auto/tests/tst_qofonoconnmancontext.cpp
@@ -61,6 +61,7 @@ private slots:
QTRY_COMPARE(context->isValid(), true);
QSignalSpy active(context, SIGNAL(activeChanged(bool)));
+ QSignalSpy preferred(context, SIGNAL(preferredChanged(bool)));
QSignalSpy apn(context,SIGNAL(accessPointNameChanged(QString)));
QSignalSpy name(context, SIGNAL(nameChanged(QString)));
QSignalSpy type (context, SIGNAL(typeChanged(QString)));
@@ -93,6 +94,10 @@ private slots:
QTRY_COMPARE(active.count(), 1);
QCOMPARE(active.takeFirst().at(0).toBool(), true);
+ context->setPreferred(true);
+ QTRY_COMPARE(preferred.count(), 1);
+ QCOMPARE(preferred.takeFirst().at(0).toBool(), true);
+
QTRY_COMPARE(sett6.count(), 1);
QCOMPARE(sett6.takeFirst().at(0).toMap()["Interface"].value<QString>().left(5),
QString("dummy")); // "dummy" plus number
@@ -109,11 +114,16 @@ private slots:
QCOMPARE(sett.count(), 0);
QCOMPARE(proto.count(), 0);
QCOMPARE(active.count(), 0);
+ QCOMPARE(preferred.count(), 0);
context->setActive(false);
QTRY_COMPARE(active.count(), 1);
QCOMPARE(active.takeFirst().at(0).toBool(), false);
+ context->setPreferred(false);
+ QTRY_COMPARE(preferred.count(), 1);
+ QCOMPARE(preferred.takeFirst().at(0).toBool(), false);
+
delete context;
m->removeContext(contextid);
This diff is collapsed.
context-preferred.patch
connman-resetcontexts.patch
mtk_settings_binding.patch
#!/usr/bin/make -f
# -*- makefile -*-
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
# FIXME: disable tests for now. These require ofono to be running and probably
# need more love before they can be ran during build-time (LP: #1334652)
override_dh_auto_test:
# LD_LIBRARY_PATH=../../../src dh_auto_test
export QT_SELECT=qt5
%:
dh $@ --list-missing
version=4
https://git.merproject.org/mer-core/libqofono/tags .*?(\d\S+)/.*.tar\.gz
TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS += src \
plugin \
test
equals(QT_MAJOR_VERSION, 4):{
SUBDIRS += ofonotest
}
equals(QT_MAJOR_VERSION, 4): {
OTHER_FILES += rpm/libqofono.spec \
rpm/libqofono.yaml
}
equals(QT_MAJOR_VERSION, 5): {
OTHER_FILES += rpm/libqofono-qt5.spec \
rpm/libqofono-qt5.yaml \
TODO \
README
}
#!/bin/bash
# Determine project name based on current directory
#PROJECT=$(basename $PWD)
PROJECT=libqofono
# NOTE: Don't like this? Then uncomment one of the following as appropriate
#
# Just set it explictly to whatever you like:
# PROJECT=libseaside
#
# Parse it from any Qt *.pro or *.pri files in CWD:
# PROJECT=$(grep -E "TARGET ?= ?" *.pr[io]|cut -d' ' -f3)
while getopts qht: o
do case $o in
h) head=1;;
t) TAG="$OPTARG";;
q) PROJECT=libqofono-qt5;;
?) printf >&2 "Usage: $0 [-h] [-t TAG]\n"
exit 2;;
esac
done
# Grab most recent tag from git unless TAG is set
if [ -z "$TAG" ] ; then
TAG=$(git describe --tags --abbrev=0)
fi
# Parse out just the version number
#PARTS=(${TAG//-/ })
#VERSION=${PARTS[1]}
VERSION=${TAG}
# Set name of toplevel directory for the archive
PREFIX="${PROJECT}-${VERSION}/"
# Set name of resulting release archive file
ARCHIVE=${PROJECT}-${VERSION}.tar.bz2
[ -e ${ARCHIVE} ] && rm -rf ${ARCHIVE} && echo "Removed: ${ARCHIVE}"
if [ ! -z "$head" ] ; then
TAG="HEAD"
fi
git archive --format=tar --prefix=${PREFIX} $TAG | bzip2 -c -- > ${ARCHIVE} && {
echo "Created: ${ARCHIVE}"
} || {
echo "Creation of release archive ${ARCHIVE} failed. Reason unknown."
}
#include <QApplication>
#include "qmlapplicationviewer.h"
Q_DECL_EXPORT int main(int argc, char *argv[])
{
QScopedPointer<QApplication> app(createApplication(argc, argv));
QmlApplicationViewer viewer;
viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
viewer.setMainQmlFile(QLatin1String("qml/ofonotest/main.qml"));
viewer.showExpanded();
return app->exec();
}
[Desktop Entry]
Encoding=UTF-8
Version=1.0
Type=Application
Terminal=false
Name=ofonotest
Exec=/opt/ofonotest/bin/ofonotest
Icon=ofonotest64
X-Window-Icon=
X-HildonDesk-ShowInToolbar=true
X-Osso-Type=application/x-executable
# Add more folders to ship with the application, here
folder_01.source = qml/ofonotest
folder_01.target = qml
DEPLOYMENTFOLDERS = folder_01
# Additional import path used to resolve QML modules in Creator's code model
QML_IMPORT_PATH =
# If your application uses the Qt Mobility libraries, uncomment the following
# lines and add the respective components to the MOBILITY variable.
# CONFIG += mobility
# MOBILITY +=
# Speed up launching on MeeGo/Harmattan when using applauncherd daemon
CONFIG += qdeclarative-boostable
# The .cpp file which was generated for your project. Feel free to hack it.
SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
include(qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
[Desktop Entry]
Encoding=UTF-8