Hello community, here is the log from the commit of package libbluedevil for openSUSE:Factory checked in at 2014-12-21 12:00:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libbluedevil (Old) and /work/SRC/openSUSE:Factory/.libbluedevil.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libbluedevil" Changes: -------- --- /work/SRC/openSUSE:Factory/libbluedevil/libbluedevil.changes 2013-12-23 12:33:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libbluedevil.new/libbluedevil.changes 2014-12-21 12:00:35.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Dec 5 21:40:14 UTC 2014 - [email protected] + +- Update to 2.0 Final: + * Do not set the Adapter back to powered, kde#329411 + * Check adapter for nullptr in + interfacesAdded/interfacesRemoved slots, kde#340577 +- Added 0001-Adapter-name-now-returns-alias-of-adapter.patch + +------------------------------------------------------------------- +Sat Dec 21 16:43:15 UTC 2013 - [email protected] + +- Replace the tarball generated from tag, to the official one, from + KDE mirrors + +------------------------------------------------------------------- Old: ---- libbluedevil-v2.0-rc1.tar.xz New: ---- 0001-Adapter-name-now-returns-alias-of-adapter.patch libbluedevil-2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libbluedevil.spec ++++++ --- /var/tmp/diff_new_pack.2jNU1O/_old 2014-12-21 12:00:36.000000000 +0100 +++ /var/tmp/diff_new_pack.2jNU1O/_new 2014-12-21 12:00:36.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libbluedevil # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Raymond Wooninck <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -18,15 +18,15 @@ Name: libbluedevil -Version: 2.0~rc1 +Version: 2.0 Release: 0 -%define rversion 2.0-rc1 Summary: Qt Bluetooth client library License: LGPL-2.0+ Group: System/Libraries Url: http://www.kde.org -#Source0: http://download.kde.org/stable/libbluedevil/%{name}-v%{version}.tar.xz -Source0: %{name}-v%{rversion}.tar.xz +Source: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM 0001-Adapter-name-now-returns-alias-of-adapter.patch +Patch0: 0001-Adapter-name-now-returns-alias-of-adapter.patch BuildRequires: cmake BuildRequires: kde4-filesystem BuildRequires: libqt4-devel @@ -51,7 +51,8 @@ Qt wrapper for BlueZ. This wrapper is used by KDE's Bluetooth layer. %prep -%setup -q -n %{name}-v%{rversion} +%setup -q -n %{name}-%{version} +%patch0 -p1 %build %cmake_kde4 -d build ++++++ 0001-Adapter-name-now-returns-alias-of-adapter.patch ++++++ >From ec29ea82fd8e06ddebffd9c1dbdb53ec6872c3f2 Mon Sep 17 00:00:00 2001 From: David Rosca <[email protected]> Date: Sat, 13 Dec 2014 12:57:15 +0100 Subject: [PATCH 1/1] Adapter::name() now returns alias of adapter According to Bluez docs, Alias property should be used as a name for adapter. If no alias for adapter was set, it returns original system name. Added new method Adapter::systemName() that returns system name (hostname) of the adapter. --- bluedevil/bluedeviladapter.cpp | 12 ++++++------ bluedevil/bluedeviladapter.h | 17 +++++++++++------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/bluedevil/bluedeviladapter.cpp b/bluedevil/bluedeviladapter.cpp index 668934aa783daa8a92ff89f6749294b0d0474953..e8d0abf9db424de9de732efd159626889a324572 100644 --- a/bluedevil/bluedeviladapter.cpp +++ b/bluedevil/bluedeviladapter.cpp @@ -89,7 +89,7 @@ void Adapter::Private::_k_propertyChanged(const QString &interface_name, const Q for(i = changed_properties.constBegin(); i != changed_properties.constEnd(); ++i) { QVariant value = i.value(); QString property = i.key(); - if (property == "Name") { + if (property == "Alias") { emit m_q->nameChanged(value.toString()); } else if (property == "Powered") { emit m_q->poweredChanged(value.toBool()); @@ -141,12 +141,12 @@ QString Adapter::address() const QString Adapter::name() const { - return d->m_bluezAdapterInterface->name(); + return d->m_bluezAdapterInterface->alias(); } -QString Adapter::alias() const +QString Adapter::systemName() const { - return d->m_bluezAdapterInterface->alias(); + return d->m_bluezAdapterInterface->name(); } quint32 Adapter::adapterClass() const @@ -214,9 +214,9 @@ QStringList Adapter::UUIDs() return UUIDs; } -void Adapter::setAlias(const QString& alias) +void Adapter::setName(const QString& name) { - d->m_bluezAdapterInterface->setAlias(alias); + d->m_bluezAdapterInterface->setAlias(name); } void Adapter::setPowered(bool powered) diff --git a/bluedevil/bluedeviladapter.h b/bluedevil/bluedeviladapter.h index ccb17f916a6df7b737ebf5dccdbf4683b899106c..11cd2118994d9fe275c55f4c897899b50e1b6f1b 100644 --- a/bluedevil/bluedeviladapter.h +++ b/bluedevil/bluedeviladapter.h @@ -49,8 +49,8 @@ class BLUEDEVIL_EXPORT Adapter Q_OBJECT Q_PROPERTY(QString address READ address) - Q_PROPERTY(QString name READ name) - Q_PROPERTY(QString alias READ alias WRITE setAlias) + Q_PROPERTY(QString name READ name WRITE setName) + Q_PROPERTY(QString systemName READ systemName) Q_PROPERTY(quint32 adapterClass READ adapterClass) Q_PROPERTY(bool powered READ isPowered WRITE setPowered) Q_PROPERTY(bool discoverable READ isDiscoverable WRITE setDiscoverable) @@ -75,14 +75,19 @@ public: QString address() const; /** + * Returns the friendly name of the adapter. + * + * Friendly name is alias of the adapter. If no alias is set, it returns + * the system name. + * * @return The friendly name of the adapter. */ QString name() const; /** - * @return The alias of the adapter + * @return The system name (hostname) of the adapter. */ - QString alias() const; + QString systemName() const; /** * @return The class of the adapter. @@ -147,9 +152,9 @@ public: public Q_SLOTS: /** - * Set the alias of the adapter + * Set the name (alias) of the adapter */ - void setAlias(const QString &alias); + void setName(const QString &name); /** * Sets whether this adapter is consuming energy or not. -- 2.2.0 ++++++ libbluedevil-v2.0-rc1.tar.xz -> libbluedevil-2.0.tar.xz ++++++ ++++ 87756 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
