[arch-commits] Commit in deepin-dock/repos/community-x86_64 (5 files)
Felix Yan
felixonmars at archlinux.org
Sun Oct 25 15:39:22 UTC 2020
Date: Sunday, October 25, 2020 @ 15:39:21
Author: felixonmars
Revision: 732808
archrelease: copy trunk to community-x86_64
Added:
deepin-dock/repos/community-x86_64/PKGBUILD
(from rev 732807, deepin-dock/trunk/PKGBUILD)
deepin-dock/repos/community-x86_64/deepin-dock-fix-build.patch
(from rev 732807, deepin-dock/trunk/deepin-dock-fix-build.patch)
Deleted:
deepin-dock/repos/community-x86_64/PKGBUILD
deepin-dock/repos/community-x86_64/deepin-dock-fix-build.patch
deepin-dock/repos/community-x86_64/deepin-dock-qt5.15.patch
-----------------------------+
PKGBUILD | 79 +++++++++++----------
deepin-dock-fix-build.patch | 152 +++++++++++++++++++++---------------------
deepin-dock-qt5.15.patch | 60 ----------------
3 files changed, 116 insertions(+), 175 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-10-25 15:39:09 UTC (rev 732807)
+++ PKGBUILD 2020-10-25 15:39:21 UTC (rev 732808)
@@ -1,39 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=deepin-dock
-pkgver=5.2.0.14
-pkgrel=1
-pkgdesc='Deepin desktop-environment - dock module'
-arch=('x86_64')
-url="https://github.com/linuxdeepin/dde-dock"
-license=('GPL3')
-depends=('qt5-svg' 'deepin-menu' 'deepin-daemon' 'deepin-launcher' 'deepin-qt5integration'
- 'deepin-qt-dbus-factory' 'deepin-network-utils' 'libdbusmenu-qt5')
-makedepends=('cmake' 'ninja' 'qt5-tools')
-conflicts=('dde-dock')
-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
- 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() {
- 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-$pkgver
- DESTDIR="$pkgdir" ninja install
-}
Copied: deepin-dock/repos/community-x86_64/PKGBUILD (from rev 732807, deepin-dock/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-10-25 15:39:21 UTC (rev 732808)
@@ -0,0 +1,40 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-dock
+pkgver=5.2.0.16
+pkgrel=1
+pkgdesc='Deepin desktop-environment - dock module'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/dde-dock"
+license=('GPL3')
+depends=('qt5-svg' 'deepin-menu' 'deepin-daemon' 'deepin-launcher' 'deepin-qt5integration'
+ 'deepin-qt-dbus-factory' 'deepin-network-utils' 'libdbusmenu-qt5')
+makedepends=('cmake' 'ninja' 'qt5-tools')
+conflicts=('dde-dock')
+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=('79eda542b499e533a6987c0e7eef14868e4cb0fcd2f6c179a412532316f637c428d7e409f93a6f592f3cc285e619a347b38f8fc8d7e79cf37433866efbe2b056'
+ '38c3f683e10c70f54123d445b80831eb74830b27f265fccf7eb4037bfb0c96879bf25203e8e672ebe483e8cae291197dfac81296648f08548d61a7644c0076f9'
+ 'f65a066dbbd27caec29e59dcb5f0328dd462cc5b86d4d899a10f04d9164c29729575230ab1be81f47ea4f4c9ee8bdeaa0a2b4d89fe82d30f8858509ebb2e289a')
+
+prepare() {
+ cd dde-dock-$pkgver
+ patch -p1 -i ../deepin-dock-fix-build.patch
+ patch -p1 -i ../1611be8c849d19fab44de5eecc663a7c38575e70.patch
+}
+
+build() {
+ 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-$pkgver
+ DESTDIR="$pkgdir" ninja install
+}
Deleted: deepin-dock-fix-build.patch
===================================================================
--- deepin-dock-fix-build.patch 2020-10-25 15:39:09 UTC (rev 732807)
+++ deepin-dock-fix-build.patch 2020-10-25 15:39:21 UTC (rev 732808)
@@ -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);
Copied: deepin-dock/repos/community-x86_64/deepin-dock-fix-build.patch (from rev 732807, deepin-dock/trunk/deepin-dock-fix-build.patch)
===================================================================
--- deepin-dock-fix-build.patch (rev 0)
+++ deepin-dock-fix-build.patch 2020-10-25 15:39:21 UTC (rev 732808)
@@ -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);
Deleted: deepin-dock-qt5.15.patch
===================================================================
--- deepin-dock-qt5.15.patch 2020-10-25 15:39:09 UTC (rev 732807)
+++ deepin-dock-qt5.15.patch 2020-10-25 15:39:21 UTC (rev 732808)
@@ -1,60 +0,0 @@
-diff --git a/plugins/onboard/onboarditem.cpp b/plugins/onboard/onboarditem.cpp
-index e43a0917..a7b29345 100644
---- a/plugins/onboard/onboarditem.cpp
-+++ b/plugins/onboard/onboarditem.cpp
-@@ -23,6 +23,7 @@
-
- #include <QSvgRenderer>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMouseEvent>
- #include <QApplication>
- #include <QIcon>
-diff --git a/plugins/shutdown/shutdownwidget.cpp b/plugins/shutdown/shutdownwidget.cpp
-index 8b62a4ab..a303df4e 100644
---- a/plugins/shutdown/shutdownwidget.cpp
-+++ b/plugins/shutdown/shutdownwidget.cpp
-@@ -23,6 +23,7 @@
-
- #include <QSvgRenderer>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMouseEvent>
- #include <QApplication>
- #include <QIcon>
-diff --git a/plugins/tray/fashiontray/containers/spliteranimated.cpp b/plugins/tray/fashiontray/containers/spliteranimated.cpp
-index 92d4ca1c..3feb06f4 100644
---- a/plugins/tray/fashiontray/containers/spliteranimated.cpp
-+++ b/plugins/tray/fashiontray/containers/spliteranimated.cpp
-@@ -1,6 +1,7 @@
- #include "spliteranimated.h"
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QDebug>
-
- #define OpacityMax 0.3
-diff --git a/plugins/tray/fashiontray/fashiontraycontrolwidget.cpp b/plugins/tray/fashiontray/fashiontraycontrolwidget.cpp
-index b7edc119..2238f559 100644
---- a/plugins/tray/fashiontray/fashiontraycontrolwidget.cpp
-+++ b/plugins/tray/fashiontray/fashiontraycontrolwidget.cpp
-@@ -23,6 +23,7 @@
-
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <DHiDPIHelper>
- #include <DStyle>
- #include <DGuiApplicationHelper>
-diff --git a/plugins/tray/fashiontray/fashiontraywidgetwrapper.cpp b/plugins/tray/fashiontray/fashiontraywidgetwrapper.cpp
-index 30e47172..833f1e1c 100644
---- a/plugins/tray/fashiontray/fashiontraywidgetwrapper.cpp
-+++ b/plugins/tray/fashiontray/fashiontraywidgetwrapper.cpp
-@@ -23,6 +23,7 @@
- #include "../xembedtraywidget.h"
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QDebug>
- #include <QMouseEvent>
- #include <QDrag>
More information about the arch-commits
mailing list