Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=74690b6039f6e4de7917e0cab797f95894f66ccc
commit 74690b6039f6e4de7917e0cab797f95894f66ccc Author: centuri0 <[email protected]> Date: Fri Oct 19 21:24:05 2012 +0200 bluedevil-1.2.4-1-i686 * version bump * dropping useless patch diff --git a/source/kde-extra/bluedevil/FrugalBuild b/source/kde-extra/bluedevil/FrugalBuild index d53e81b..97dfc87 100644 --- a/source/kde-extra/bluedevil/FrugalBuild +++ b/source/kde-extra/bluedevil/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: Kapolnasi Tamas <[email protected]> pkgname=bluedevil -pkgver=1.2.3 -pkgrel=3 +pkgver=1.2.4 +pkgrel=1 pkgdesc="KDE Bluetooth Framework" groups=('kde-extra') archs=('i686' 'x86_64') @@ -18,8 +18,7 @@ url="http://www.afiestas.org/"; depends=('libkfile' 'libbluedevil>=1.9.2' 'libnepomuk' 'attica>=0.4.0' 'phonon' 'obex-data-server' 'obexftp') makedepends=(${makedepends[@]} "kdelibs-compiletime>=$_F_kde_ver" \ "ksgmltools2>=$_F_kde_ver" "kdelibs>=$_F_kde_ver" "libkdeclarative>=$_F_kde_ver") -source=($source fix_sending_files.patch) -sha1sums=('ae5fc1fe538e36861c127a75261f13254f9ee8fe' \ - '4dfea6bb62bee3d7359f1ea7fd4caf104a813f45') +source=($source) +sha1sums=('3f832a94359a5f61275bd1d07f5b9cd68d2738fd') # optimization OK diff --git a/source/kde-extra/bluedevil/fix_sending_files.patch b/source/kde-extra/bluedevil/fix_sending_files.patch deleted file mode 100644 index c39f5d2..0000000 --- a/source/kde-extra/bluedevil/fix_sending_files.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 6b16ef1223940eef7c2553409df81d16217209a4 Mon Sep 17 00:00:00 2001 -From: Francisco Gonzalez <[email protected]> -Date: Wed, 27 Jun 2012 19:05:05 +0200 -Subject: [PATCH] Try to fix sending files. Error in reply not valid - ---- - src/actionplugins/sendfile/helper/sendfilesjob.cpp | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/actionplugins/sendfile/helper/sendfilesjob.cpp b/src/actionplugins/sendfile/helper/sendfilesjob.cpp -index 3ef8fe4..19b8aec 100644 ---- a/src/actionplugins/sendfile/helper/sendfilesjob.cpp -+++ b/src/actionplugins/sendfile/helper/sendfilesjob.cpp -@@ -85,14 +85,20 @@ void SendFilesJob::doStart() - OrgOpenobexClientInterface *client = new OrgOpenobexClientInterface("org.openobex.client", "/", QDBusConnection::sessionBus(), this); - QDBusPendingReply <void > reply = client->SendFiles(map, m_filesToSend, QDBusObjectPath("/BlueDevil_sendAgent")); - -- QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply); -+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this); - connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(sendFileResult(QDBusPendingCallWatcher*))); - } - - void SendFilesJob::sendFileResult(QDBusPendingCallWatcher *call) - { - const QDBusPendingReply<QDBusObjectPath> reply = *call; -- call->deleteLater(); -+ //call->deleteLater(); -+ if (!reply.isValid()) { -+ return; -+ } -+ if (!reply.isFinished()) { -+ return; -+ } - if (!reply.isError()) { - return; - } --- -1.7.11.1 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
