[kf5bluezqt] Remove Bluez4 support. JB#57146

Removing the patches and code paths for bluez4. Bluez5 should still stay as it was.
sailfishos · Feb 8, 2022 · aa295e2 · aa295e2
1 parent 4ac1bbc
commit aa295e2
Show file tree

Hide file tree

Showing 16 changed files with 125 additions and 10,547 deletions.
diff --git a/README b/README
diff --git a/kf5bluezqt.pro b/kf5bluezqt.pro
diff --git a/rpm/0001-Add-rpm-spec-and-.pro-files.patch → rpm/0001-Add-.pro-files.patch b/rpm/0001-Add-rpm-spec-and-.pro-files.patch → rpm/0001-Add-.pro-files.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Bea Lam <bea.lam@jollamobile.com>
 Date: Thu, 21 Jul 2016 05:37:23 +0930
-Subject: [PATCH] Add rpm spec and .pro files
+Subject: [PATCH] Add .pro files
 
 ---
  bluez-qt.pro            |   6 ++
@@ -289,5 +289,5 @@ index 0000000..91d6939
 +
 +INSTALLS += target headers pkgconfig
 -- 
-2.33.1
+2.34.1
 
diff --git a/rpm/0002-Add-MediaTransport-org.bluez.MediaTransport1-wrapper.patch b/rpm/0002-Add-MediaTransport-org.bluez.MediaTransport1-wrapper.patch
@@ -1078,5 +1078,5 @@ index fd49d8e..9e5e7dd 100644
  QString orgBluezProfileManager1();
  QString orgBluezObex();
 -- 
-2.33.1
+2.34.1
 
diff --git a/rpm/0003-Add-Manager-pairWithDevice-QString-to-pair-with-unkn.patch b/rpm/0003-Add-Manager-pairWithDevice-QString-to-pair-with-unkn.patch
@@ -0,0 +1,53 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Bea Lam <bea.lam@jollamobile.com>
+Date: Thu, 10 Nov 2016 17:16:39 +1000
+Subject: [PATCH] Add Manager::pairWithDevice(QString) to pair with unknown
+ devices. Contributes to JB#36678
+
+---
+ src/manager.cpp |  9 +++++++++
+ src/manager.h   | 10 ++++++++++
+ 2 files changed, 19 insertions(+)
+
+diff --git a/src/manager.cpp b/src/manager.cpp
+index 4bd0068..38146c2 100644
+--- a/src/manager.cpp
++++ b/src/manager.cpp
+@@ -246,4 +246,13 @@ PendingCall *Manager::unregisterProfile(Profile *profile)
+                            PendingCall::ReturnVoid, this);
+ }
+
++PendingCall *Manager::pairWithDevice(const QString &address)
++{
++    BluezQt::DevicePtr device = deviceForAddress(address);
++    if (device) {
++        return device->pair();
++    }
++    return new PendingCall(PendingCall::InternalError, QStringLiteral("Device unknown!"), this);
++}
++
+ } // namespace BluezQt
+diff --git a/src/manager.h b/src/manager.h
+index 3165509..1700dd8 100644
+--- a/src/manager.h
++++ b/src/manager.h
+@@ -295,6 +295,16 @@ public:
+      */
+     PendingCall *unregisterProfile(Profile *profile);
+
++    /**
++     * Pairs with a device.
++     *
++     * Possible errors: PendingCall::DoesNotExist
++     *
++     * @param address address of the device
++     * @return pending call with null if the device is known, otherwise with the device object path
++     */
++    PendingCall *pairWithDevice(const QString &address);
++
+ Q_SIGNALS:
+     /**
+      * Indicates that operational state have changed.
+-- 
+2.34.1
+