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

Felix Yan felixonmars at archlinux.org
Fri Sep 11 10:26:06 UTC 2020


    Date: Friday, September 11, 2020 @ 10:26:06
  Author: felixonmars
Revision: 702653

upgpkg: deepin-dock 5.1.0.13-1

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

-----------------------------+
 PKGBUILD                    |   22 ++++--------
 deepin-dock-fix-build.patch |   76 ------------------------------------------
 2 files changed, 9 insertions(+), 89 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-11 10:23:27 UTC (rev 702652)
+++ PKGBUILD	2020-09-11 10:26:06 UTC (rev 702653)
@@ -3,9 +3,8 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-dock
-pkgver=5.1.0.11.20200622
-_commit=e4acd32b24e220e66c283707b481f9757048ad7c
-pkgrel=2
+pkgver=5.1.0.13
+pkgrel=1
 pkgdesc='Deepin desktop-environment - dock module'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/dde-dock"
@@ -16,25 +15,22 @@
 conflicts=('dde-dock')
 replaces=('dde-dock')
 groups=('deepin')
-source=("$pkgname-$_commit.tar.gz::https://github.com/linuxdeepin/dde-dock/archive/$_commit.tar.gz"
-         deepin-dock-qt5.15.patch
-         deepin-dock-fix-build.patch)
-sha512sums=('1d191dbcf23882f906eaf6f63ee1c93df33fcb792fe8d15bfbc2b64a694c2b9bbdff781ba00a02a965a23aff402959318e8b8419e8331446a1bebedf71e16a64'
-            '1fb3a6490e152d081f5fdff655e503dac602cb29b231df252edd664bf8b5ffcc589efd7d96b7b61e53f620670b110dcd5e1952fe5b88fe65fbf8acf8ce8812fd'
-            '38c3f683e10c70f54123d445b80831eb74830b27f265fccf7eb4037bfb0c96879bf25203e8e672ebe483e8cae291197dfac81296648f08548d61a7644c0076f9')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-dock/archive/$pkgver.tar.gz"
+         deepin-dock-qt5.15.patch)
+sha512sums=('c60734a0380b1c7bec0fecc293b36e7bf1e2ef3c3ba6527f19c16b14402d7a0cb7c9ce6a6b527f8f890ad0d7d3b9809ded0fc401cdf03f8f54c1044469c77e8e'
+            '1fb3a6490e152d081f5fdff655e503dac602cb29b231df252edd664bf8b5ffcc589efd7d96b7b61e53f620670b110dcd5e1952fe5b88fe65fbf8acf8ce8812fd')
 
 prepare() {
-  patch -d dde-dock-$_commit -p1 -i ../deepin-dock-qt5.15.patch # Fix build with Qt 5.15
-  patch -d dde-dock-$_commit -p1 -i ../deepin-dock-fix-build.patch # Fix build with new deepin-network-utils
+  patch -d dde-dock-$pkgver -p1 -i ../deepin-dock-qt5.15.patch # Fix build with Qt 5.15
 }
 
 build() {
-  cd dde-dock-$_commit
+  cd dde-dock-$pkgver
   cmake . -GNinja -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DDOCK_TRAY_USE_NATIVE_POPUP=YES
   ninja
 }
 
 package() {
-  cd dde-dock-$_commit
+  cd dde-dock-$pkgver
   DESTDIR="$pkgdir" ninja install
 }

Deleted: deepin-dock-fix-build.patch
===================================================================
--- deepin-dock-fix-build.patch	2020-09-11 10:23:27 UTC (rev 702652)
+++ deepin-dock-fix-build.patch	2020-09-11 10:26:06 UTC (rev 702653)
@@ -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