diff --git a/.gitignore b/.gitignore index d38e47d..5f21ffa 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/bluedevil-1.3-rc1.tar.bz2 +/bluedevil-1.3-rc2.tar.bz2 diff --git a/bluedevil-1.3-rc1-kded_crash.patch b/bluedevil-1.3-rc1-kded_crash.patch deleted file mode 100644 index 28428ab..0000000 --- a/bluedevil-1.3-rc1-kded_crash.patch +++ /dev/null @@ -1,53 +0,0 @@ -commit 744ff9bb65162db0ed3f07d5dc0166a20c46f136 -Author: Alex Fiestas -Date: Thu Apr 26 04:46:23 2012 +0200 - - Set a new Object as parent of BlueZAgent - - You can't register a child of a parent exposed with ExportChildObjects, if - you do so the app may crash. - - for not making this patch too big I'm using the parent() reference from - the BlueAgent object itself to delete the parent and this will delete - the agent. I will improve it in BlueDevil 2.0 - - Versions minor to 1.3 are not affected by this bug since they use qApp - as a parent instead of BlueDevilDAemon. - - BUG: 284052 - -diff --git a/src/daemon/kded/BlueDevilDaemon.cpp b/src/daemon/kded/BlueDevilDaemon.cpp -index ac397f5..0cfcc45 100644 ---- a/src/daemon/kded/BlueDevilDaemon.cpp -+++ b/src/daemon/kded/BlueDevilDaemon.cpp -@@ -179,7 +179,7 @@ void BlueDevilDaemon::onlineMode() - return; - } - -- d->m_bluezAgent = new BluezAgent(this); -+ d->m_bluezAgent = new BluezAgent(new QObject()); - connect(d->m_bluezAgent, SIGNAL(agentReleased()), this, SLOT(agentReleased())); - - d->m_adapter = Manager::self()->defaultAdapter(); -@@ -224,7 +224,7 @@ void BlueDevilDaemon::offlineMode() - d->m_adapter = 0; - - if (d->m_bluezAgent) { -- delete d->m_bluezAgent; -+ delete d->m_bluezAgent->parent(); // we meed to delete the parent for not leaking it - d->m_bluezAgent = 0; - } - -diff --git a/src/daemon/kded/bluezagent.cpp b/src/daemon/kded/bluezagent.cpp -index d8e2cda..a948a9f 100644 ---- a/src/daemon/kded/bluezagent.cpp -+++ b/src/daemon/kded/bluezagent.cpp -@@ -54,7 +54,7 @@ void BluezAgent::unregister() - defaultAdapter->unregisterAgent(AGENT_PATH); - } - QDBusConnection::systemBus().unregisterObject(AGENT_PATH); -- deleteLater(); -+ parent()->deleteLater(); - } - - void BluezAgent::Release() diff --git a/bluedevil.spec b/bluedevil.spec index 14820dd..d69b060 100644 --- a/bluedevil.spec +++ b/bluedevil.spec @@ -1,17 +1,18 @@ + +%define pre rc2 + Name: bluedevil Version: 1.3 -Release: 0.3.rc1%{?dist} +Release: 0.4.%{pre}%{?dist} Summary: Bluetooth stack for KDE Group: Applications/Communications License: GPLv2+ URL: http://www.afiestas.org/ -Source0: http://www.afiestas.org/files/bluedevil-%{version}-rc1.tar.bz2 +Source0: http://download.kde.org/unstable/bluedevil/%{version}%{?pre:-%{pre}}/src/bluedevil-%{version}%{?pre:-%{pre}}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## upstream patches -# https://projects.kde.org/projects/extragear/base/bluedevil/repository/revisions/744ff9bb65162db0ed3f07d5dc0166a20c46f136 -Patch100: bluedevil-1.3-rc1-kded_crash.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -42,6 +43,7 @@ BlueDevil is the bluetooth stack for KDE. %package devel Summary: Development files for %{name} Group: Development/Libraries +# Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -49,9 +51,7 @@ Development files for %{name}. %prep -%setup -q -n %{name}-%{version}-rc1 - -%patch100 -p1 -b .kded_crash +%setup -q -n %{name}-%{version}%{?pre:-%{pre}} %build @@ -126,6 +126,9 @@ update-mime-database %{_kde4_datadir}/mime >& /dev/null %changelog +* Sun Apr 29 2012 Rex Dieter 1.3-0.4.rc2 +- update to 1.3-rc2 + * Wed Apr 25 2012 Rex Dieter 1.3-0.3.rc1 - kde daemon crash (kde#284052) diff --git a/sources b/sources index 3720cd2..6803768 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea7e0991f0c213ad52ec82899700bb9d bluedevil-1.3-rc1.tar.bz2 +20452c528ab04c0551f3d8bfc5075c4b bluedevil-1.3-rc2.tar.bz2