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

Felix Yan felixonmars at archlinux.org
Sat Oct 31 14:58:53 UTC 2020


    Date: Saturday, October 31, 2020 @ 14:58:52
  Author: felixonmars
Revision: 737773

upgpkg: deepin-dock 5.3.0.12-1

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

-----------------------------+
 PKGBUILD                    |    7 +--
 deepin-dock-fix-build.patch |   76 ------------------------------------------
 2 files changed, 2 insertions(+), 81 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-31 14:55:25 UTC (rev 737772)
+++ PKGBUILD	2020-10-31 14:58:52 UTC (rev 737773)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-dock
-pkgver=5.2.0.22
+pkgver=5.3.0.12
 pkgrel=1
 pkgdesc='Deepin desktop-environment - dock module'
 arch=('x86_64')
@@ -16,15 +16,12 @@
 replaces=('dde-dock')
 groups=('deepin')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-dock/archive/$pkgver.tar.gz"
-        deepin-dock-fix-build.patch
         https://github.com/linuxdeepin/dde-dock/commit/1611be8c849d19fab44de5eecc663a7c38575e70.patch)
-sha512sums=('1e929522f92e3d22beb06b5886eb57f943049a7cc84ddd592542e48befb9324edf6cddcc490eeb6d5f253c9dab9ec8f28b07de9dda1ac2460ddf2c8df3f1baa4'
-            '38c3f683e10c70f54123d445b80831eb74830b27f265fccf7eb4037bfb0c96879bf25203e8e672ebe483e8cae291197dfac81296648f08548d61a7644c0076f9'
+sha512sums=('61ca0953a8a7a0cc9d76cebd4430f35c00c3f1efc2ec8199ed7cfa36ccdc10922dfc78d26a0b24f00cc614447093f3b444c9486e68a17fd1868af36829858352'
             'f65a066dbbd27caec29e59dcb5f0328dd462cc5b86d4d899a10f04d9164c29729575230ab1be81f47ea4f4c9ee8bdeaa0a2b4d89fe82d30f8858509ebb2e289a')
 
 prepare() {
   cd dde-dock-$pkgver
-  patch -p1 -i ../deepin-dock-fix-build.patch
   patch -p1 -i ../1611be8c849d19fab44de5eecc663a7c38575e70.patch
 }
 

Deleted: deepin-dock-fix-build.patch
===================================================================
--- deepin-dock-fix-build.patch	2020-10-31 14:55:25 UTC (rev 737772)
+++ deepin-dock-fix-build.patch	2020-10-31 14:58:52 UTC (rev 737773)
@@ -1,76 +0,0 @@
-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);



More information about the arch-commits mailing list