Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package bluez-qt for openSUSE:Factory checked in at 2021-12-13 20:40:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bluez-qt (Old) and /work/SRC/openSUSE:Factory/.bluez-qt.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bluez-qt" Mon Dec 13 20:40:20 2021 rev:84 rq:939182 version:5.89.0 Changes: -------- --- /work/SRC/openSUSE:Factory/bluez-qt/bluez-qt.changes 2021-11-15 15:24:45.869796009 +0100 +++ /work/SRC/openSUSE:Factory/.bluez-qt.new.2520/bluez-qt.changes 2021-12-13 20:42:24.828470507 +0100 @@ -1,0 +2,10 @@ +Sat Dec 4 22:56:14 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.89.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.89.0 +- Changes since 5.88.0: + * Add functions that allow setting the discovery filter based on Bluez Adapter APIs + +------------------------------------------------------------------- Old: ---- bluez-qt-5.88.0.tar.xz bluez-qt-5.88.0.tar.xz.sig New: ---- bluez-qt-5.89.0.tar.xz bluez-qt-5.89.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-qt.spec ++++++ --- /var/tmp/diff_new_pack.Yliar8/_old 2021-12-13 20:42:25.384470575 +0100 +++ /var/tmp/diff_new_pack.Yliar8/_new 2021-12-13 20:42:25.388470575 +0100 @@ -18,7 +18,7 @@ %define sonum 6 %define _libname KF5BluezQt -%define _tar_path 5.88 +%define _tar_path 5.89 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -26,7 +26,7 @@ # Only needed for the package signature condition %bcond_without lang Name: bluez-qt -Version: 5.88.0 +Version: 5.89.0 Release: 0 Summary: Async Bluez wrapper library License: LGPL-2.1-or-later ++++++ bluez-qt-5.88.0.tar.xz -> bluez-qt-5.89.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.88.0/CMakeLists.txt new/bluez-qt-5.89.0/CMakeLists.txt --- old/bluez-qt-5.88.0/CMakeLists.txt 2021-11-03 07:45:29.000000000 +0100 +++ new/bluez-qt-5.89.0/CMakeLists.txt 2021-12-04 17:55:11.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.88.0") # handled by release scripts +set(KF_VERSION "5.89.0") # handled by release scripts project(BluezQt VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.87.0 NO_MODULE) +find_package(ECM 5.89.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.88.0/LICENSES/CC0-1.0.txt new/bluez-qt-5.89.0/LICENSES/CC0-1.0.txt --- old/bluez-qt-5.88.0/LICENSES/CC0-1.0.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/bluez-qt-5.89.0/LICENSES/CC0-1.0.txt 2021-12-04 17:55:11.000000000 +0100 @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.88.0/autotests/adaptertest.cpp new/bluez-qt-5.89.0/autotests/adaptertest.cpp --- old/bluez-qt-5.88.0/autotests/adaptertest.cpp 2021-11-03 07:45:29.000000000 +0100 +++ new/bluez-qt-5.89.0/autotests/adaptertest.cpp 2021-12-04 17:55:11.000000000 +0100 @@ -341,6 +341,90 @@ } } +static bool isFilterValid(const QStringList &filters, const QVariantMap &filter) +{ + auto i = filter.constBegin(); + while (i != filter.constEnd()) { + if (!filters.contains(i.key())) { + return false; + } + i++; + } + return true; +} + +void AdapterTest::discoveryFilterTest_data() { + QTest::addColumn<QVariantMap>("filter"); + QTest::addColumn<bool>("isValid"); + QTest::addColumn<bool>("shouldBeDiscoverable"); + + + QTest::newRow("valid-non-discoverable") << QVariantMap({ + { QStringLiteral("UUIDs"), QStringList() }, + { QStringLiteral("RSSI"), QVariant::fromValue(qint16(-100)) }, + { QStringLiteral("Transport"), QStringLiteral("auto") }, + { QStringLiteral("DuplicateData"), true }, + { QStringLiteral("Discoverable"), false }, + { QStringLiteral("Pattern"), QLatin1String("")} + }) << true << false; + + QTest::newRow("valid-discoverable") << QVariantMap({ + { QStringLiteral("UUIDs"), QStringList() }, + { QStringLiteral("RSSI"), QVariant::fromValue(qint16(-100)) }, + { QStringLiteral("Transport"), QStringLiteral("auto") }, + { QStringLiteral("DuplicateData"), true }, + { QStringLiteral("Discoverable"), true }, + { QStringLiteral("Pattern"), QLatin1String("")} + }) << true << true; + + QTest::newRow("invalid") << QVariantMap({ + { QStringLiteral("SomeKey"), QStringList() } + }) << false << false; +} + +void AdapterTest::discoveryFilterTest() +{ + QFETCH(QVariantMap, filter); + QFETCH(bool, isValid); + QFETCH(bool, shouldBeDiscoverable); + + for (const AdapterUnit &unit : m_units) { + + // Get available discovery filters + PendingCall* p = unit.adapter->getDiscoveryFilters(); p->waitForFinished(); + Q_ASSERT(p->isFinished()); + QCOMPARE(p->error(), PendingCall::NoError); + const QStringList filters = p->value().toStringList(); + + // Verify filter + QCOMPARE(isFilterValid(filters, filter), isValid); + + // Make sure adapter is powered and not discoverable + unit.adapter->setPowered(true)->waitForFinished(); + unit.adapter->setDiscoverable(false); + QTRY_COMPARE(unit.adapter->isDiscoverable(), false); + QTRY_COMPARE(unit.dbusAdapter->discoverable(), false); + + QSignalSpy adapterSpy(unit.adapter.data(), SIGNAL(discoverableChanged(bool))); + QSignalSpy dbusSpy(unit.dbusProperties, SIGNAL(PropertiesChanged(QString, QVariantMap, QStringList))); + + // Set discovery filter + unit.adapter->setDiscoveryFilter(filter); + + if (shouldBeDiscoverable) { + // Check if adapter became discoverable + QTRY_COMPARE(adapterSpy.count(), 1); + + const QList<QVariant> adapterArguments = adapterSpy.takeFirst(); + QCOMPARE(adapterArguments.at(0).toBool(), true); + Autotests::verifyPropertiesChangedSignal(dbusSpy, QStringLiteral("Discoverable"), true); + + QCOMPARE(unit.adapter->isDiscoverable(), true); + QCOMPARE(unit.dbusAdapter->discoverable(), true); + } + } +} + void AdapterTest::adapterRemovedTest() { for (const AdapterUnit &unit : m_units) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.88.0/autotests/adaptertest.h new/bluez-qt-5.89.0/autotests/adaptertest.h --- old/bluez-qt-5.88.0/autotests/adaptertest.h 2021-11-03 07:45:29.000000000 +0100 +++ new/bluez-qt-5.89.0/autotests/adaptertest.h 2021-12-04 17:55:11.000000000 +0100 @@ -37,6 +37,8 @@ void discoveryTest(); void removeDeviceTest(); + void discoveryFilterTest_data(); + void discoveryFilterTest(); void adapterRemovedTest(); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.88.0/autotests/fakebluez/adapterinterface.cpp new/bluez-qt-5.89.0/autotests/fakebluez/adapterinterface.cpp --- old/bluez-qt-5.88.0/autotests/fakebluez/adapterinterface.cpp 2021-11-03 07:45:29.000000000 +0100 +++ new/bluez-qt-5.89.0/autotests/fakebluez/adapterinterface.cpp 2021-12-04 17:55:11.000000000 +0100 @@ -175,6 +175,28 @@ manager->removeObject(manager->objectByPath(device)); } +void AdapterInterface::SetDiscoveryFilter(const QVariantMap &filter) +{ + // Bluez makes adapter discoverable while discovering if 'Discoverable' option is set + if (filter.contains(QStringLiteral("Discoverable")) && filter.value(QStringLiteral("Discoverable")).toBool()) + { + Object::changeProperty(QStringLiteral("Discoverable"), true); + } +} + +QStringList AdapterInterface::GetDiscoveryFilters() +{ + return { + QStringLiteral("UUIDs"), + QStringLiteral("RSSI"), + QStringLiteral("Pathloss"), + QStringLiteral("Transport"), + QStringLiteral("DuplicateData"), + QStringLiteral("Discoverable"), + QStringLiteral("Pattern") + }; +} + void AdapterInterface::resetPairable() { setPairable(false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.88.0/autotests/fakebluez/adapterinterface.h new/bluez-qt-5.89.0/autotests/fakebluez/adapterinterface.h --- old/bluez-qt-5.88.0/autotests/fakebluez/adapterinterface.h 2021-11-03 07:45:29.000000000 +0100 +++ new/bluez-qt-5.89.0/autotests/fakebluez/adapterinterface.h 2021-12-04 17:55:11.000000000 +0100 @@ -83,6 +83,8 @@ void StartDiscovery(); void StopDiscovery(); void RemoveDevice(const QDBusObjectPath &device); + void SetDiscoveryFilter(const QVariantMap &filter); + QStringList GetDiscoveryFilters(); private Q_SLOTS: void resetPairable(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.88.0/autotests/interfaces/org.bluez.Adapter1.xml new/bluez-qt-5.89.0/autotests/interfaces/org.bluez.Adapter1.xml --- old/bluez-qt-5.88.0/autotests/interfaces/org.bluez.Adapter1.xml 2021-11-03 07:45:29.000000000 +0100 +++ new/bluez-qt-5.89.0/autotests/interfaces/org.bluez.Adapter1.xml 2021-12-04 17:55:11.000000000 +0100 @@ -7,6 +7,14 @@ <method name="RemoveDevice"> <arg name="device" type="o" direction="in"/> </method> + <method name="SetDiscoveryFilter"> + <arg name="options" type="a{sv}" direction="in"/> + <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/> + </method> + <method name="GetDiscoveryFilters"> + <arg name="value" type="as" direction="out"/> + <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringList"/> + </method> <property name="Address" type="s" access="read"/> <property name="Name" type="s" access="read"/> <property name="Alias" type="s" access="readwrite"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.88.0/src/adapter.cpp new/bluez-qt-5.89.0/src/adapter.cpp --- old/bluez-qt-5.88.0/src/adapter.cpp 2021-11-03 07:45:29.000000000 +0100 +++ new/bluez-qt-5.89.0/src/adapter.cpp 2021-12-04 17:55:11.000000000 +0100 @@ -169,4 +169,14 @@ return new PendingCall(d->m_bluezAdapter->RemoveDevice(QDBusObjectPath(device->ubi())), PendingCall::ReturnVoid, this); } +PendingCall* Adapter::setDiscoveryFilter(const QVariantMap& filter) +{ + return new PendingCall(d->m_bluezAdapter->SetDiscoveryFilter(filter), PendingCall::ReturnVoid, this); +} + +PendingCall* Adapter::getDiscoveryFilters() +{ + return new PendingCall(d->m_bluezAdapter->GetDiscoveryFilters(), PendingCall::ReturnStringList, this); +} + } // namespace BluezQt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.88.0/src/adapter.h new/bluez-qt-5.89.0/src/adapter.h --- old/bluez-qt-5.88.0/src/adapter.h 2021-11-03 07:45:29.000000000 +0100 +++ new/bluez-qt-5.89.0/src/adapter.h 2021-12-04 17:55:11.000000000 +0100 @@ -285,6 +285,31 @@ */ PendingCall *removeDevice(DevicePtr device); + /** + * Set the discovery filter for the caller. + * + * When this method is called with no filter parameter, the filter is removed. + * + * For details and available filter options, see [Bluez documentation for Adapter object](https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/doc/adapter-api.txt) + * + * Possible errors: PendingCall::InvalidArguments, PendingCall::Failed + * + * @param filter options dictionary + * @return void pending call + */ + PendingCall *setDiscoveryFilter(const QVariantMap& filter); + + /** + * Get the discovery filters for the caller. + * + * This returns the available filters that can be given to setDiscoveryFilter, for details see [Bluez documentation for Adapter object](https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/doc/adapter-api.txt) + * + * Possible errors: PendingCall::Failed + * + * @return string list pending call + */ + PendingCall *getDiscoveryFilters(); + Q_SIGNALS: /** * Indicates that the adapter was removed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.88.0/src/interfaces/org.bluez.Adapter1.xml new/bluez-qt-5.89.0/src/interfaces/org.bluez.Adapter1.xml --- old/bluez-qt-5.88.0/src/interfaces/org.bluez.Adapter1.xml 2021-11-03 07:45:29.000000000 +0100 +++ new/bluez-qt-5.89.0/src/interfaces/org.bluez.Adapter1.xml 2021-12-04 17:55:11.000000000 +0100 @@ -7,6 +7,14 @@ <method name="RemoveDevice"> <arg name="device" type="o" direction="in"/> </method> + <method name="SetDiscoveryFilter"> + <arg name="options" type="a{sv}" direction="in"/> + <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/> + </method> + <method name="GetDiscoveryFilters"> + <arg name="value" type="as" direction="out"/> + <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringList"/> + </method> <!-- <property name="Address" type="s" access="read"/> <property name="Name" type="s" access="read"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.88.0/src/pendingcall.cpp new/bluez-qt-5.89.0/src/pendingcall.cpp --- old/bluez-qt-5.88.0/src/pendingcall.cpp 2021-11-03 07:45:29.000000000 +0100 +++ new/bluez-qt-5.89.0/src/pendingcall.cpp 2021-12-04 17:55:11.000000000 +0100 @@ -67,6 +67,7 @@ void processVoidReply(const QDBusPendingReply<> &reply); void processUint32Reply(const QDBusPendingReply<quint32> &reply); void processStringReply(const QDBusPendingReply<QString> &reply); + void processStringListReply(const QDBusPendingReply<QStringList> &reply); void processObjectPathReply(const QDBusPendingReply<QDBusObjectPath> &reply); void processFileTransferListReply(const QDBusPendingReply<QVariantMapList> &reply); void processTransferWithPropertiesReply(const QDBusPendingReply<QDBusObjectPath, QVariantMap> &reply); @@ -111,6 +112,10 @@ processStringReply(*call); break; + case PendingCall::ReturnStringList: + processStringListReply(*call); + break; + case PendingCall::ReturnObjectPath: processObjectPathReply(*call); break; @@ -149,6 +154,14 @@ { processError(reply.error()); if (!reply.isError()) { + m_value.append(reply.value()); + } +} + +void PendingCallPrivate::processStringListReply(const QDBusPendingReply<QStringList> &reply) +{ + processError(reply.error()); + if (!reply.isError()) { m_value.append(reply.value()); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.88.0/src/pendingcall.h new/bluez-qt-5.89.0/src/pendingcall.h --- old/bluez-qt-5.88.0/src/pendingcall.h 2021-11-03 07:45:29.000000000 +0100 +++ new/bluez-qt-5.89.0/src/pendingcall.h 2021-12-04 17:55:11.000000000 +0100 @@ -171,6 +171,7 @@ ReturnVoid, ReturnUint32, ReturnString, + ReturnStringList, ReturnObjectPath, ReturnFileTransferList, ReturnTransferWithProperties,
