[arch-commits] Commit in deepin-dock/trunk (PKGBUILD deepin-dock-fix-build.patch)

[Felix Yan]

    Date: Wednesday, September 16, 2020 @ 10:40:48
  Author: felixonmars
Revision: 707385

upgpkg: deepin-dock 5.2.0.14-1

Added:
  deepin-dock/trunk/deepin-dock-fix-build.patch
Modified:
  deepin-dock/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   11 +++---
 deepin-dock-fix-build.patch |   76 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-16 10:38:04 UTC (rev 707384)
+++ PKGBUILD	2020-09-16 10:40:48 UTC (rev 707385)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-dock
-pkgver=5.1.0.14
+pkgver=5.2.0.14
 pkgrel=1
 pkgdesc='Deepin desktop-environment - dock module'
 arch=('x86_64')
@@ -16,12 +16,15 @@
 replaces=('dde-dock')
 groups=('deepin')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-dock/archive/$pkgver.tar.gz"
-         deepin-dock-qt5.15.patch)
-sha512sums=('488c2d1bc4aa52ed5a54730b79398a4d33237c7dffb6c92a395c41c973ec328619238298cdfb62e0e519c56c22a241eb6f811dde2c6199aab44a438bd33e2410'
-            '1fb3a6490e152d081f5fdff655e503dac602cb29b231df252edd664bf8b5ffcc589efd7d96b7b61e53f620670b110dcd5e1952fe5b88fe65fbf8acf8ce8812fd')
+         deepin-dock-qt5.15.patch
+         deepin-dock-fix-build.patch)
+sha512sums=('32c49dab42e32ca78f11b398be917c4a206c578b24a7a4341274e7996b1c0392c0f5d6352f02a02c4f84eadbfca60ba7436c5114bf762f3ac7af61cd0281e037'
+            '1fb3a6490e152d081f5fdff655e503dac602cb29b231df252edd664bf8b5ffcc589efd7d96b7b61e53f620670b110dcd5e1952fe5b88fe65fbf8acf8ce8812fd'
+            '38c3f683e10c70f54123d445b80831eb74830b27f265fccf7eb4037bfb0c96879bf25203e8e672ebe483e8cae291197dfac81296648f08548d61a7644c0076f9')
 
 prepare() {
   patch -d dde-dock-$pkgver -p1 -i ../deepin-dock-qt5.15.patch # Fix build with Qt 5.15
+  patch -d dde-dock-$pkgver -p1 -i ../deepin-dock-fix-build.patch # Fix build with new deepin-network-utils
 }
 
 build() {

Added: deepin-dock-fix-build.patch
===================================================================
--- deepin-dock-fix-build.patch	                        (rev 0)
+++ deepin-dock-fix-build.patch	2020-09-16 10:40:48 UTC (rev 707385)
@@ -0,0 +1,76 @@
+From b8d7f24ebe0d41c50436458e4aa8e06ff878dfd9 Mon Sep 17 00:00:00 2001
+From: yexin <yexin at uniontech.com>
+Date: Wed, 26 Aug 2020 15:30:09 +0800
+Subject: [PATCH] =?UTF-8?q?feat:=20ConnectDevice=E8=93=9D=E7=89=99?=
+ =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=E6=94=B9=E5=8F=98?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+新增蓝牙扫描结束3分钟后，点击列表项设备连接，连接设备接口新增蓝牙设备参数
+
+Log: ConnectDeviece蓝牙接口参数改变
+Task: https://pms.uniontech.com/zentao/task-view-33527.html
+Change-Id: Ia4d988d31f04307a4e67f95e49f39947cb59805d
+Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/2753
+Reviewed-by: <mailman at uniontech.com>
+Reviewed-by: wangwei <wangwei at uniontech.com>
+Reviewed-by: fanpengcheng <fanpengcheng at uniontech.com>
+Tested-by: <mailman at uniontech.com>
+---
+ plugins/bluetooth/componments/adapteritem.cpp     | 4 +++-
+ plugins/bluetooth/componments/adaptersmanager.cpp | 4 ++--
+ plugins/bluetooth/componments/adaptersmanager.h   | 2 +-
+ plugins/bluetooth/componments/device.cpp          | 8 ++++++++
+ plugins/bluetooth/componments/device.h            | 4 ++++
+ plugins/bluetooth/componments/deviceitem.cpp      | 2 ++
+ 6 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/bluetooth/componments/adapteritem.cpp b/plugins/bluetooth/componments/adapteritem.cpp
+index 172c0168..5949c70a 100644
+--- a/plugins/bluetooth/componments/adapteritem.cpp
++++ b/plugins/bluetooth/componments/adapteritem.cpp
+@@ -299,7 +299,9 @@ void AdapterItem::createDeviceItem(Device *device)
+     connect(device, &Device::stateChanged, deviceItem, &DeviceItem::changeState);
+     connect(device, &Device::stateChanged, this, &AdapterItem::deviceChangeState);
+     connect(device, &Device::rssiChanged, this, &AdapterItem::deviceRssiChanged);
+-    connect(deviceItem, &DeviceItem::clicked, m_adaptersManager, &AdaptersManager::connectDevice);
++    connect(deviceItem, &DeviceItem::clicked, m_adaptersManager, [this](Device *device){
++        m_adaptersManager->connectDevice(device, m_adapter);
++    });
+ }
+ 
+ void AdapterItem::updateView()
+diff --git a/plugins/bluetooth/componments/adaptersmanager.cpp b/plugins/bluetooth/componments/adaptersmanager.cpp
+index 623499a4..500e4233 100644
+--- a/plugins/bluetooth/componments/adaptersmanager.cpp
++++ b/plugins/bluetooth/componments/adaptersmanager.cpp
+@@ -134,13 +134,13 @@ void AdaptersManager::setAdapterPowered(const Adapter *adapter, const bool &powe
+ //    }
+ //}
+ 
+-void AdaptersManager::connectDevice(Device *device)
++void AdaptersManager::connectDevice(Device *device, Adapter *adapter)
+ {
+     if (device) {
+         QDBusObjectPath path(device->id());
+         switch (device->state()) {
+             case Device::StateUnavailable: {
+-                m_bluetoothInter->ConnectDevice(path);
++                m_bluetoothInter->ConnectDevice(path, QDBusObjectPath(adapter->id()));
+                 qDebug() << "connect to device: " << device->name();
+             }
+                 break;
+diff --git a/plugins/bluetooth/componments/adaptersmanager.h b/plugins/bluetooth/componments/adaptersmanager.h
+index a179f39e..9e751db7 100644
+--- a/plugins/bluetooth/componments/adaptersmanager.h
++++ b/plugins/bluetooth/componments/adaptersmanager.h
+@@ -39,7 +39,7 @@ class AdaptersManager : public QObject
+ 
+     void setAdapterPowered(const Adapter *adapter, const bool &powered);
+ //    void connectAllPairedDevice(const Adapter *adapter);
+-    void connectDevice(Device *deviceId);
++    void connectDevice(Device *device, Adapter *adapter);
+     bool defaultAdapterInitPowerState();
+     int adaptersCount();
+     void adapterRefresh(const Adapter *adapter);