[arch-commits] CVS update of extra/kde/kdebluetooth (3 files)
Thomas Baechler
thomas at archlinux.org
Fri Sep 21 08:24:19 UTC 2007
Date: Friday, September 21, 2007 @ 04:24:19
Author: thomas
Path: /home/cvs-extra/extra/kde/kdebluetooth
Modified: PKGBUILD (1.6 -> 1.7)
Removed: ChangeLog (1.3) kdebluetooth-trayicon-state.patch (1.1)
upgpkg: kdebluetooth 1.0_beta8-1
-----------------------------------+
ChangeLog | 10 ---
PKGBUILD | 23 +++----
kdebluetooth-trayicon-state.patch | 104 ------------------------------------
3 files changed, 9 insertions(+), 128 deletions(-)
Index: extra/kde/kdebluetooth/ChangeLog
diff -u extra/kde/kdebluetooth/ChangeLog:1.3 extra/kde/kdebluetooth/ChangeLog:removed
--- extra/kde/kdebluetooth/ChangeLog:1.3 Thu Jun 14 06:14:19 2007
+++ extra/kde/kdebluetooth/ChangeLog Fri Sep 21 04:24:19 2007
@@ -1,10 +0,0 @@
-
-kdebluetooth 1.0_beta2-2
- - removed xmms dependency
-
-kdebluetooth 1.0_beta3-1
- - updated to beta3
- - supports new dbus API
-
-kdebluetooth 1.0_beta3-2
- - fixed tray icon state
Index: extra/kde/kdebluetooth/PKGBUILD
diff -u extra/kde/kdebluetooth/PKGBUILD:1.6 extra/kde/kdebluetooth/PKGBUILD:1.7
--- extra/kde/kdebluetooth/PKGBUILD:1.6 Thu Jun 14 06:14:19 2007
+++ extra/kde/kdebluetooth/PKGBUILD Fri Sep 21 04:24:19 2007
@@ -1,26 +1,21 @@
-# $Id: PKGBUILD,v 1.6 2007/06/14 10:14:19 thomas Exp $
+# $Id: PKGBUILD,v 1.7 2007/09/21 08:24:19 thomas Exp $
# Contributor: Giovanni Scafora <linuxmania at gmail.com>
# Maintainer: Thomas Baechler <thomas at archlinux.org>
pkgname=kdebluetooth
-_realver=1.0-beta3
-pkgver=1.0_beta3
-pkgrel=2
+pkgver=1.0_beta8
+pkgrel=1
pkgdesc="A collection of Bluetooth utilities and modules for KDE based on BlueZ"
arch=('i686' 'x86_64')
url="http://bluetooth.kmobiletools.org/"
license=('GPL')
-depends=('obexftp' 'dbus-qt3' 'kdelibs')
-makedepends=('bluez-utils' 'pkgconfig')
-source=(http://mesh.dl.sourceforge.net/sourceforge/kde-bluetooth/$pkgname-${_realver}.tar.bz2
- kdebluetooth-trayicon-state.patch)
-md5sums=('fd1c45a393b8724fbb0de493e923bcd8'
- '533a8dcd7ca77b1044c201dc7891666f')
+depends=('openobex' 'dbus-qt3' 'kdelibs' 'bluez-utils')
+makedepends=('pkgconfig')
+#source=(http://mesh.dl.sourceforge.net/sourceforge/kde-bluetooth/${pkgname}-${pkgver}.tar.bz2)
+source=(http://tomstar.ath.cx/load/kdebluetooth/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('f760d98d2e59c12567927c19ccc1d27d')
build() {
- cd $startdir/src/$pkgname-${_realver}
- cd kdebluetooth
- patch -p0 -i ../../kdebluetooth-trayicon-state.patch || return 1
- cd ..
+ cd $startdir/src/$pkgname-${pkgver}
./configure --prefix=/opt/kde
make || return 1
make DESTDIR=$startdir/pkg install
Index: extra/kde/kdebluetooth/kdebluetooth-trayicon-state.patch
diff -u extra/kde/kdebluetooth/kdebluetooth-trayicon-state.patch:1.1 extra/kde/kdebluetooth/kdebluetooth-trayicon-state.patch:removed
--- extra/kde/kdebluetooth/kdebluetooth-trayicon-state.patch:1.1 Thu Jun 14 12:28:25 2007
+++ extra/kde/kdebluetooth/kdebluetooth-trayicon-state.patch Fri Sep 21 04:24:19 2007
@@ -1,104 +0,0 @@
-Index: kbluetooth/trayicon.cpp
-===================================================================
---- kbluetooth/trayicon.cpp (Revision 674824)
-+++ kbluetooth/trayicon.cpp (Revision 674945)
-@@ -20,6 +20,9 @@
- iconConnectingBlinkState = false;
- this->helpMenu = new KHelpMenu(this, KApplication::kApplication()->aboutData());
- this->app = app;
-+
-+ manager = app->manager;
-+
- //iconState = IDLE;
- KConfig *config = KGlobal::config();
- config->setGroup("UI");
-@@ -129,10 +132,19 @@
- connect(this, SIGNAL(quitSelected()),
- this, SLOT(slotQuitSelected()));
-
-+ // Connection state
-+ adapter = new Adapter(manager->defaultAdapter(), app->conn);
-+ connect(adapter, SIGNAL(remoteDeviceConnected(const QString&)), SLOT(slotIconConnected(const QString&)));
-+ connect(adapter, SIGNAL(remoteDeviceDisconnected(const QString&)), SLOT(slotIconDisconnected(const QString&)));
-+
-+ connect(manager, SIGNAL(adapterRemoved(const QString&)), SLOT(slotIconAdapterChanged(const QString&)));
-+ connect(manager, SIGNAL(adapterAdded(const QString&)), SLOT(slotIconAdapterChanged(const QString&)));
-+
- }
-
- TrayIcon::~TrayIcon()
- {
-+ delete adapter;
- }
-
- void TrayIcon::setAlwaysShowIcon(bool state) {
-@@ -160,7 +172,6 @@
- {
- QString oldText = QToolTip::textFor(this);
- QString newText = "";
-- manager = app->manager;
- Adapter::ConnectionList connList;
- if (alwaysVisible) {
- if (manager->listAdapters().count() > 0) {
-@@ -179,13 +190,8 @@
- Manager::AdapterList list = manager->listAdapters();
- Manager::AdapterList::iterator it;
- for (it = list.begin(); it != list.end(); ++it) {
-- if (*it == manager->defaultAdapter()) {
-- adapter = new Adapter((*it), app->conn);
-- connList = adapter->listConnections();
-- } else {
-- Adapter a((*it), app->conn);
-- connList = a.listConnections();
-- }
-+ Adapter a((*it), app->conn);
-+ connList = a.listConnections();
-
- if (connList.size()) {
- setPixmap(iconConnected);
-@@ -385,6 +391,30 @@
- }
- }
-
-+void TrayIcon::slotIconConnected(const QString& /*address*/)
-+{
-+ if (alwaysVisible)
-+ setPixmap(iconConnected);
-+
-+}
-+
-+void TrayIcon::slotIconDisconnected(const QString& /*address*/)
-+{
-+ if (alwaysVisible)
-+ setPixmap(iconIdle);
-+}
-+
-+void TrayIcon::slotIconAdapterChanged(const QString& /*address*/)
-+{
-+ if (!alwaysVisible)
-+ return;
-+
-+ if (!manager->listAdapters().size())
-+ setPixmap(iconNoAdapter);
-+ else
-+ setPixmap(iconIdle);
-+}
-+
- #if 0
- // TODO : make use of KNofityClient
- void TrayIcon::slotConnectionComplete(int status, QString addr)
-Index: kbluetooth/trayicon.h
-===================================================================
---- kbluetooth/trayicon.h (Revision 674824)
-+++ kbluetooth/trayicon.h (Revision 674945)
-@@ -84,6 +84,10 @@
- void slotAbout() { helpMenu->aboutApplication(); };
- void slotShowHelp();
- void updateIcon();
-+ void slotIconConnected(const QString&);
-+ void slotIconDisconnected(const QString&);
-+ void slotIconAdapterChanged(const QString&);
-+
-
- protected:
- void mousePressEvent(QMouseEvent *e);
More information about the arch-commits
mailing list