Hello community,
here is the log from the commit of package libbluedevil5 for openSUSE:Factory
checked in at 2015-03-16 09:28:53
Comparing /work/SRC/openSUSE:Factory/libbluedevil5 (Old)
and /work/SRC/openSUSE:Factory/.libbluedevil5.new (New)
Package is libbluedevil5
Changes:
--- /work/SRC/openSUSE:Factory/libbluedevil5/libbluedevil5.changes
2015-03-01 15:05:19.0 +0100
+++ /work/SRC/openSUSE:Factory/.libbluedevil5.new/libbluedevil5.changes
2015-03-16 09:28:54.0 +0100
@@ -1,0 +2,7 @@
+Tue Mar 10 19:14:38 UTC 2015 - hrvoje.sen...@gmail.com
+
+- Added adaptername-now-returns-alias-of-adapter.patch and
+ add-back-alias-and-setAliasy.patch from upstream, needed for
+ newer bluedevil5
+
+---
New:
adaptername-now-returns-alias-of-adapter.patch
add-back-alias-and-setAliasy.patch
Other differences:
--
++ libbluedevil5.spec ++
--- /var/tmp/diff_new_pack.mRB7XO/_old 2015-03-16 09:28:55.0 +0100
+++ /var/tmp/diff_new_pack.mRB7XO/_new 2015-03-16 09:28:55.0 +0100
@@ -25,6 +25,10 @@
Group: System/Libraries
Url:http://www.kde.org
Source: libbluedevil-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM adaptername-now-returns-alias-of-adapter.patch
+Patch0: adaptername-now-returns-alias-of-adapter.patch
+# PATCH-FIX-UPSTREAM add-back-alias-and-setAliasy.patch
+Patch1: add-back-alias-and-setAliasy.patch
BuildRequires: cmake = 2.8.11
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
@@ -45,6 +49,8 @@
%prep
%setup -q -n libbluedevil-%{version}
+%patch0 -p1
+%patch1 -p1
%build
mkdir -p build
++ adaptername-now-returns-alias-of-adapter.patch ++
From: David Rosca now...@gmail.com
Date: Sat, 13 Dec 2014 11:57:15 +
Subject: Adapter::name() now returns alias of adapter
X-Git-Tag: v2.1
X-Git-Url:
http://quickgit.kde.org/?p=libbluedevil.gita=commitdiffh=ec29ea82fd8e06ddebffd9c1dbdb53ec6872c3f2
---
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.
---
--- a/bluedevil/bluedeviladapter.cpp
+++ b/bluedevil/bluedeviladapter.cpp
@@ -89,7 +89,7 @@
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::name() const
{
+return d-m_bluezAdapterInterface-alias();
+}
+
+QString Adapter::systemName() const
+{
return d-m_bluezAdapterInterface-name();
-}
-
-QString Adapter::alias() const
-{
-return d-m_bluezAdapterInterface-alias();
}
quint32 Adapter::adapterClass() const
@@ -214,9 +214,9 @@
return UUIDs;
}
-void Adapter::setAlias(const QString alias)
-{
-d-m_bluezAdapterInterface-setAlias(alias);
+void Adapter::setName(const QString name)
+{
+d-m_bluezAdapterInterface-setAlias(name);
}
void Adapter::setPowered(bool powered)
--- a/bluedevil/bluedeviladapter.h
+++ b/bluedevil/bluedeviladapter.h
@@ -49,8 +49,8 @@
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 @@
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
- */
-QString alias() const;
+ * @return The system name (hostname) of the adapter.
+ */
+QString systemName() const;
/**
* @return The class of the adapter.
@@ -147,9 +152,9 @@
public Q_SLOTS:
/**
- * Set the alias of the adapter
- */
-void setAlias(const QString alias);
+ * Set the name (alias) of the adapter
+ */
+void setName(const QString name);
/**
* Sets whether this adapter is
