rpms/kdebase-workspace/F-10 kdebase-workspace-4.2.0-bluetooth-revert.patch, NONE, 1.1 kdebase-workspace.spec, 1.151, 1.152

Kevin Kofler kkofler at fedoraproject.org
Thu Jan 29 21:34:16 UTC 2009 

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12041/F-10

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.0-bluetooth-revert.patch 
Log Message:
Sync the F9 conditionals up to facilitate future merges.

kdebase-workspace-4.2.0-bluetooth-revert.patch:

--- NEW FILE kdebase-workspace-4.2.0-bluetooth-revert.patch ---
diff -ur kdebase-workspace-4.2.0/libs/solid/control/backends/CMakeLists.txt kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/backends/CMakeLists.txt
--- kdebase-workspace-4.2.0/libs/solid/control/backends/CMakeLists.txt	2008-10-17 13:00:21.000000000 +0200
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/backends/CMakeLists.txt	2008-01-05 00:55:29.000000000 +0100
@@ -1,3 +1,3 @@
 add_subdirectory( fakenet )
-#add_subdirectory( fakebluetooth )
+add_subdirectory( fakebluetooth )
 
diff -ur kdebase-workspace-4.2.0/libs/solid/control/backends/fakebluetooth/fakebluetoothinterface.h kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/backends/fakebluetooth/fakebluetoothinterface.h
--- kdebase-workspace-4.2.0/libs/solid/control/backends/fakebluetooth/fakebluetoothinterface.h	2008-07-03 07:05:34.000000000 +0200
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/backends/fakebluetooth/fakebluetoothinterface.h	2008-08-28 10:06:55.000000000 +0200
@@ -134,6 +134,7 @@
     }
     bool isTrusted(const QString& mac)
     {
+	Q_UNUSED(mac)
 	return true;
     }
 
diff -ur kdebase-workspace-4.2.0/libs/solid/control/bluetoothinputdevice.cpp kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinputdevice.cpp
--- kdebase-workspace-4.2.0/libs/solid/control/bluetoothinputdevice.cpp	2008-10-30 15:13:17.000000000 +0100
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinputdevice.cpp	2008-05-21 10:33:09.000000000 +0200
@@ -19,6 +19,7 @@
 
 */
 
+#include <QMap>
 #include <QStringList>
 
 #include "ifaces/bluetoothinputdevice.h"
@@ -71,19 +72,39 @@
     return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), ubi());
 }
 
-QMap<QString,QVariant> Solid::Control::BluetoothInputDevice::getProperties() const
+bool Solid::Control::BluetoothInputDevice::isConnected() const
 {
-    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), (QMap< QString,QVariant >()), getProperties());
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), false, isConnected());
 }
 
-void Solid::Control::BluetoothInputDevice::connect()
+QString Solid::Control::BluetoothInputDevice::name() const
 {
-    SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), connect());
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), name());
 }
 
-void Solid::Control::BluetoothInputDevice::disconnect()
+QString Solid::Control::BluetoothInputDevice::address() const
 {
-    SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), disconnect());
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), address());
+}
+
+QString Solid::Control::BluetoothInputDevice::productID() const
+{
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), productID());
+}
+
+QString Solid::Control::BluetoothInputDevice::vendorID() const
+{
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), vendorID());
+}
+
+void Solid::Control::BluetoothInputDevice::slotConnect()
+{
+    SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), slotConnect());
+}
+
+void Solid::Control::BluetoothInputDevice::slotDisconnect()
+{
+    SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), slotDisconnect());
 }
 
 void Solid::Control::BluetoothInputDevicePrivate::setBackendObject(QObject *object)
@@ -91,8 +112,10 @@
     FrontendObjectPrivate::setBackendObject(object);
 
     if (object) {
-        QObject::connect(object, SIGNAL(propertyChanged(QString,QVariant)),
-                         parent(), SIGNAL(propertyChanged(QString,QVariant)));
+        QObject::connect(object, SIGNAL(connected()),
+                         parent(), SIGNAL(connected()));
+        QObject::connect(object, SIGNAL(disconnected()),
+                         parent(), SIGNAL(disconnected()));
     }
 }
 
diff -ur kdebase-workspace-4.2.0/libs/solid/control/bluetoothinputdevice.h kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinputdevice.h
--- kdebase-workspace-4.2.0/libs/solid/control/bluetoothinputdevice.h	2008-10-30 15:13:17.000000000 +0100
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinputdevice.h	2008-06-10 13:41:04.000000000 +0200
@@ -1,7 +1,6 @@
 /*  This file is part of the KDE project
     Copyright (C) 2007 Will Stephenson <wstephenson at kde.org>
     Copyright (C) 2007 Daniel Gollub <dgollub at suse.de>
-    Copyright (C) 2008 Tom Patzig <tpatzig at suse.de>
 
 
     This library is free software; you can redistribute it and/or
@@ -24,8 +23,6 @@
 #define SOLID_CONTROL_BLUETOOTHINPUTDEVICE_H
 
 #include <QtCore/QObject>
-#include <QtCore/QMap>
-#include <QtCore/QVariant>
 
 #include "solid_control_export.h"
 
@@ -77,36 +74,65 @@
      * @returns the Universal Network Identifier of the current bluetooth remote device
      */
     QString ubi() const;
+
+    /**
+     * Retrieves connection status of bluetooth input device.
+     *
+     * @returns true if bluetooth input device is connected
+     */
+    bool isConnected() const;
+
+    /**
+     * Retrieves MAC address of bluetooth input device.
+     *
+     * @returns MAC address of bluetooth input device
+     */
+    QString address() const;
+
+    /**
+     * Retrievies Name of bluetooth input device.
+     *
+     * @returns Name of bluetooth input device
+     */
+    QString name() const;
+
     /**
-     * Retrieve all properties from the input device.
+     * Retrieves Product ID of bluetooth input device.
      *
-     * @returns a hash of named properties
+     * @returns Product ID of bluetooth input device
      */
-    QMap<QString,QVariant> getProperties() const;
+    QString productID() const;
 
+    /**
+     * Retrieves Vendor ID of bluetooth input device.
+     *
+     * @returns Vendor ID of bluetooth input device
+     */
+    QString vendorID() const;
 
 
 public Q_SLOTS:
     /**
      * Connect bluetooth input device.
      */
-    void connect();
+    void slotConnect();
 
     /**
      * Disconnect bluetooth input device.
      */
-    void disconnect();
+    void slotDisconnect();
 
 
 Q_SIGNALS:
-     /**
-     * A Property for the input device has changed.
-     *
-     * @param name the name of the changed property
-     * @param value the new value
+    /**
+     * This signal is emitted when the bluetooth input device is connected.
      */
-    void propertyChanged(const QString &name, const QVariant &value);
+    void connected();
 
+    /**
+     * This signal is emitted when the bluetooth input device is not available anymore.
+     */
+    void disconnected();
 
 private:
     Q_PRIVATE_SLOT(d, void _k_destroyed(QObject *))
diff -ur kdebase-workspace-4.2.0/libs/solid/control/bluetoothinterface.cpp kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinterface.cpp
--- kdebase-workspace-4.2.0/libs/solid/control/bluetoothinterface.cpp	2008-12-04 09:34:54.000000000 +0100
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinterface.cpp	2008-07-03 07:05:34.000000000 +0200
@@ -1,7 +1,6 @@
 /*  This file is part of the KDE project
     Copyright (C) 2006 Will Stephenson <wstephenson at kde.org>
     Copyright (C) 2007 Daniel Gollub <dgollub at suse.de>
-    Copyright (C) 2008 Tom Patzig <tpatzig at suse.de>
 
 
     This library is free software; you can redistribute it and/or
@@ -23,7 +22,6 @@
 #include <QMap>
[...3653 lines suppressed...]
-    QMap<QString, QVariant> props =  iface.getProperties();
-
-    foreach(QString key, props.keys()) {
-        kDebug() << "Interface Property: " << key << " : " << props[key];
-    }
-
+//    iface.discoverDevices();
 
-    iface.startDiscovery();
+    iface.startPeriodicDiscovery();
 
 #if 0
     BluezBluetoothRemoteDevice remote("/org/bluez/hci0/00:16:BC:15:A3:FF");
diff -ur kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.cpp kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.cpp
--- kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.cpp	2008-12-04 09:34:48.000000000 +0100
+++ kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.cpp	2008-04-02 14:18:23.000000000 +0200
@@ -70,8 +70,8 @@
 
         QStringList list = value.toStringList();
 
-        QStringList::ConstIterator it = list.constBegin();
-        QStringList::ConstIterator end = list.constEnd();
+        QStringList::ConstIterator it = list.begin();
+        QStringList::ConstIterator end = list.end();
 
         for (; it!=end; ++it)
         {
@@ -149,7 +149,7 @@
 
 std::ostream &operator<<(std::ostream &out, const QMap<QString,QVariant> &properties)
 {
-    foreach (const QString& key, properties.keys())
+    foreach (QString key, properties.keys())
     {
         out << "  " << key << " = " << properties[key] << endl;
     }
@@ -205,17 +205,6 @@
       cout << "  solid-bluetooth defaultadapter" << endl;
       cout << i18n("             # List bluetooth default adapter/interface\n") << endl;
 
-      cout << "  solid-bluetooth createdevice (interface 'ubi') 'remote-mac'" << endl;
-      cout << i18n("             # Request to create a remote bluetooth device on the bus\n") << endl;
-
-      cout << "  solid-bluetooth removedevice (interface 'ubi') 'remote-mac'" << endl;
-      cout << i18n("             # Request to remove the remote bluetooth device from the bus\n") << endl;
-
-      cout << "  solid-bluetooth getproperties (interface 'ubi') " << endl;
-      cout << i18n("             # Request the properties from the bluetooth adapter\n") << endl;
-
-
-/*
       cout << "  solid-bluetooth getremotename (interface 'ubi') 'remote-mac'" << endl;
       cout << i18n("             # Query the name from the remote device 'remote-mac' with 'ubi'\n") << endl;
 
@@ -242,7 +231,7 @@
       cout << i18n("             # Create bonding (pairing) with bluetooth remote device.\n"
                     "             # Remove bonding of bluetooth remote device.\n"
                     "             # Check for bonding of bluetooth remote device.\n") << endl;
-*/
+
       return 0;
   }
 
@@ -263,35 +252,11 @@
     if (command == "listadapters")
     {
         return shell.bluetoothListAdapters();
-    } 
+    }
     else if (command == "defaultadapter")
     {
         return shell.bluetoothDefaultAdapter();
     }
-    else if (command == "createdevice")
-    {
-        checkArgumentCount(3, 3);
-    	QString adapterUbi(args->arg(1));
-    	QString mac(args->arg(2));		
-    	return shell.bluetoothCreateDevice(adapterUbi, mac);
-    }
-    else if (command == "removedevice")
-    {
-        checkArgumentCount(3, 3);
-    	QString adapterUbi(args->arg(1));
-    	QString remoteUbi(args->arg(2));		
-    	return shell.bluetoothRemoveDevice(adapterUbi, remoteUbi);
-    }
-    else if (command == "getproperties")
-    {
-        checkArgumentCount(2, 2);
-        QString ubi (args->arg(1));
-        return shell.bluetoothGetProperties(ubi);
-    }
-
-
-
-#if 0    
     else if (command == "getremotename")
     {
         checkArgumentCount(3, 3);
@@ -401,7 +366,6 @@
         }
 
     }
-#endif    
     else
     {
         cerr << i18n("Syntax Error: Unknown command '%1'" , command) << endl;
@@ -414,7 +378,9 @@
 {
     Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
 
-    foreach (Solid::Control::BluetoothInterface device, manager.bluetoothInterfaces())
+    const Solid::Control::BluetoothInterfaceList all = manager.bluetoothInterfaces();
+
+    foreach (const Solid::Control::BluetoothInterface device, all)
     {
         cout << "UBI = '" << device.ubi() << "'" << endl;
     }
@@ -430,36 +396,6 @@
     return true;
 }
 
-bool SolidBluetooth::bluetoothCreateDevice(const QString &adapterUbi, const QString &/*mac*/)
-{
-    Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
-    Solid::Control::BluetoothInterface adapter = manager.findBluetoothInterface(adapterUbi);
-//    QString remoteDeviceUBI = adapter.createDevice(mac);
-//    cout << "Remote Device UBI: " << remoteDeviceUBI << endl;
-    return true;
-}
-
-bool SolidBluetooth::bluetoothRemoveDevice(const QString &adapterUbi, const QString &/*remoteDeviceUbi*/)
-{
-    Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
-    Solid::Control::BluetoothInterface adapter = manager.findBluetoothInterface(adapterUbi);
-//    adapter.removeDevice(remoteDeviceUbi);
-    return true;
-}
-
-bool SolidBluetooth::bluetoothGetProperties(const QString &adapterUbi)
-{
-    Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
-    Solid::Control::BluetoothInterface adapter = manager.findBluetoothInterface(adapterUbi);
-    QMap<QString,QVariant> props = adapter.getProperties();
-    foreach (QString valName, props.keys()) {
-        cout << valName << ": " << props[valName] << endl;
-    }
-    return true;
-}
-
-
-#if 0
 bool SolidBluetooth::bluetoothGetRemoteName(const QString &adapterUbi, const QString &mac)
 {
     Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
@@ -749,6 +685,5 @@
     }
     m_loop.exit();
 }
-#endif
 
 #include "solid-bluetooth.moc"
diff -ur kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.h kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.h
--- kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.h	2008-10-17 13:00:20.000000000 +0200
+++ kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.h	2008-04-02 14:18:23.000000000 +0200
@@ -44,10 +44,6 @@
 
     bool bluetoothListAdapters();
     bool bluetoothDefaultAdapter();
-    bool bluetoothCreateDevice(const QString &adapterUbi, const QString &mac);
-    bool bluetoothRemoveDevice(const QString &adapterUbi, const QString &mac);
-    bool bluetoothGetProperties(const QString &adapterUbi);
-#if 0    
     bool bluetoothGetRemoteName(const QString &adapterUbi, const QString &mac);
     bool bluetoothAdapterAddress(const QString &ubi);
     bool bluetoothAdapterName(const QString &ubi);
@@ -67,7 +63,6 @@
     bool bluetoothRemoteCreateBonding(const QString &adapterUbi, const QString &deviceUbi);
     bool bluetoothRemoteRemoveBonding(const QString &adapterUbi, const QString &deviceUbi);
     bool bluetoothRemoteHasBonding(const QString &adapterUbi, const QString &deviceUbi);
-#endif
 
 private:
     void connectJob(KJob *job);
@@ -76,14 +71,12 @@
     int m_error;
     QString m_errorString;
 private slots:
-#if 0
     void slotStorageResult(Solid::ErrorType error, const QVariant &errorData);
     void slotResult(KJob *job);
     void slotPercent(KJob *job, unsigned long percent);
     void slotInfoMessage(KJob *job, const QString &message);
     void slotBluetoothDeviceFound(const QString &ubi, int deviceClass, int rssi);
     void slotBluetoothDiscoveryCompleted();
-#endif    
 };
 
 


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- kdebase-workspace.spec	29 Jan 2009 19:03:09 -0000	1.151
+++ kdebase-workspace.spec	29 Jan 2009 21:33:45 -0000	1.152
@@ -1,10 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+%if 0%{?fedora} <= 9
+%define have_bluez3 1
+%endif
+
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.2.0
 
-Release: 4%{?dist}
+Release: 4%{?dist}.1
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -30,6 +34,9 @@
 Patch100: kdebase-workspace-4.1.96-AllowExternalPaths.patch
 # solid-bluetooth, https://bugzilla.redhat.com/481801
 Patch101: solid-bluetoothTrunkTo42.diff
+# revert solid-bluetooth to the version from 4.1.4, needed for kdebluetooth 0.2
+# 0.3 requires BlueZ 4 and the patch above
+Patch102: kdebase-workspace-4.2.0-bluetooth-revert.patch
 
 # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151
 
@@ -123,7 +130,11 @@
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
+%if 0%{?have_bluez3}
+Provides: solid-bluetooth-devel = 4.1.4-1
+%else
 Provides: solid-bluetooth-devel = 4.3-0.1
+%endif
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
@@ -132,7 +143,11 @@
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
+%if 0%{?have_bluez3}
+Provides: solid-bluetooth = 4.1.4-1
+%else
 Provides: solid-bluetooth = 4.3-0.1
+%endif
 Requires: kdelibs4 >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
@@ -181,8 +196,11 @@
 
 # upstream patches
 %patch100 -p1 -b .AllowExternalPaths
+%if 0%{?have_bluez3}
+%patch102 -p1 -b .bluetooth-revert
+%else
 %patch101 -p0 -b .solid-bluetoothTrunkTo42
-
+%endif
 
 %build
 
@@ -308,6 +326,10 @@
 
 
 %changelog
+* Thu Jan 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-4.1
+- conditionalize bluetooth backport on F10+
+- F9: revert solid-bluetooth to the version from KDE 4.1.4
+
 * Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4
 - omit ldap hack (#457638), kde42's reduced linkage to the rescue

More information about the fedora-extras-commits mailing list