update

3 files changed, 153 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef7403d30fc8..8d17bd3c8b1e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = deepin-dock-git
 	pkgdesc = Deepin desktop-environment - dock module
-	pkgver = 5.3.0.3.r2.g52dbff80
+	pkgver = 5.1.0.11.r353.g0a4c6101
 	pkgrel = 1
 	url = https://github.com/linuxdeepin/dde-dock
 	arch = x86_64
@@ -10,6 +10,9 @@ pkgbase = deepin-dock-git
 	makedepends = cmake
 	makedepends = ninja
 	makedepends = qt5-tools
+	makedepends = deepin-qt5integration-git
+	makedepends = deepin-qt-dbus-factory
+	makedepends = deepin-network-utils-git
 	depends = qt5-svg
 	depends = deepin-daemon-git
 	depends = deepin-qt5integration-git
@@ -19,7 +22,9 @@ pkgbase = deepin-dock-git
 	provides = deepin-dock
 	conflicts = deepin-dock
 	replaces = deepin-dock
-	source = git://github.com/justforlxz/dde-dock
+	source = deepin-dock-git::git://github.com/linuxdeepin/dde-dock
+	source = dde-dock.patch
+	sha512sums = SKIP
 	sha512sums = SKIP
 
 pkgname = deepin-dock-git
diff --git a/PKGBUILD b/PKGBUILD
index 41b1abea316c..2b3c1aad0435 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: DingYuan Zhang <justforlxz@gmail.com>
 
 pkgname=deepin-dock-git
-pkgver=5.3.0.3.r2.g52dbff80
+pkgver=5.1.0.11.r353.g0a4c6101
 pkgrel=1
 pkgdesc='Deepin desktop-environment - dock module'
 arch=('x86_64')
@@ -10,26 +10,32 @@ url="https://github.com/linuxdeepin/dde-dock"
 license=('GPL3')
 depends=('qt5-svg' 'deepin-daemon-git' 'deepin-qt5integration-git'
          'deepin-qt-dbus-factory-git' 'deepin-network-utils-git' 'libdbusmenu-qt5')
-makedepends=('git' 'cmake' 'ninja' 'qt5-tools')
+makedepends=('git' 'cmake' 'ninja' 'qt5-tools' 'deepin-qt5integration-git' 'deepin-qt-dbus-factory' 'deepin-network-utils-git')
 conflicts=('deepin-dock')
 replaces=('deepin-dock')
 provides=('deepin-dock')
 groups=('deepin-git')
-source=("git://github.com/justforlxz/dde-dock")
-sha512sums=('SKIP')
+source=("$pkgname::git://github.com/linuxdeepin/dde-dock"
+        "dde-dock.patch")
+sha512sums=('SKIP' 'SKIP')
 
 pkgver() {
-    cd dde-dock
+    cd $pkgname
     git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+  cd $pkgname
+  patch -p1 -i ../dde-dock.patch
+}
+
 build() {
-  cd dde-dock
+  cd $pkgname
   cmake . -GNinja -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DDOCK_TRAY_USE_NATIVE_POPUP=YES
   ninja
 }
 
 package() {
-  cd dde-dock
+  cd $pkgname
   DESTDIR="$pkgdir" ninja install
 }
diff --git a/dde-dock.patch b/dde-dock.patch
new file mode 100644
index 000000000000..55828bda7eb4
--- /dev/null
+++ b/dde-dock.patch
@@ -0,0 +1,133 @@
+commit 92ee756615c6a32758a9e174b98b506b907fe6ad
+Author: Zhang, DingYuan <justforlxz@gmail.com>
+Date:   Fri Aug 7 18:18:16 2020 +0800
+
+    fix: build failed cause dde-network-utils update unknown enum
+    
+    dde-network-utils update enum unknown
+    
+    Log: 修复编译失败
+    Change-Id: Ifbdd1e7920dd2fdd77f705876727fe8d0733936d
+
+diff --git a/plugins/network/item/applet/accesspointwidget.cpp b/plugins/network/item/applet/accesspointwidget.cpp
+index 21f79ac2..c123b145 100644
+--- a/plugins/network/item/applet/accesspointwidget.cpp
++++ b/plugins/network/item/applet/accesspointwidget.cpp
+@@ -46,7 +46,7 @@ extern void initFontColor(QWidget *widget);
+ 
+ AccessPointWidget::AccessPointWidget()
+     : QFrame(nullptr)
+-    , m_activeState(NetworkDevice::Unknow)
++    , m_activeState(NetworkDevice::Unknown)
+     , m_ssidBtn(new SsidButton(this))
+     , m_securityLabel(new QLabel)
+     , m_strengthLabel(new QLabel)
+@@ -127,7 +127,7 @@ void AccessPointWidget::updateAP(const AccessPoint &ap)
+     }
+ 
+     // reset state
+-    setActiveState(NetworkDevice::Unknow);
++    setActiveState(NetworkDevice::Unknown);
+ }
+ 
+ bool AccessPointWidget::active() const
+@@ -200,6 +200,6 @@ void AccessPointWidget::ssidClicked()
+ 
+ void AccessPointWidget::disconnectBtnClicked()
+ {
+-    setActiveState(NetworkDevice::Unknow);
++    setActiveState(NetworkDevice::Unknown);
+     emit requestDeactiveAP(m_ap);
+ }
+diff --git a/plugins/network/item/wireditem.cpp b/plugins/network/item/wireditem.cpp
+index 31d86ff3..5eb056da 100644
+--- a/plugins/network/item/wireditem.cpp
++++ b/plugins/network/item/wireditem.cpp
+@@ -133,7 +133,7 @@ WiredItem::WiredStatus WiredItem::getDeviceState()
+     }
+ 
+     switch (m_device->status()) {
+-        case NetworkDevice::Unknow:        return Unknow;
++        case NetworkDevice::Unknown:       return Unknown;
+         case NetworkDevice::Unmanaged:
+         case NetworkDevice::Unavailable:   return Nocable;
+         case NetworkDevice::Disconnected:  return Disconnected;
+@@ -174,7 +174,7 @@ void WiredItem::setWiredStateIcon()
+     auto ratio =  devicePixelRatioF();
+ 
+     switch (m_deviceState) {
+-        case NetworkDevice::Unknow:
++        case NetworkDevice::Unknown:
+         case NetworkDevice::Unmanaged:
+         case NetworkDevice::Unavailable: {
+             stateString = "error";
+@@ -246,7 +246,7 @@ void WiredItem::deviceStateChanged(NetworkDevice::DeviceStatus state)
+ {
+     m_deviceState = state;
+     switch (state) {
+-        case NetworkDevice::Unknow:
++        case NetworkDevice::Unknown:
+         case NetworkDevice::Unmanaged:
+         case NetworkDevice::Unavailable:
+         case NetworkDevice::Disconnected:
+diff --git a/plugins/network/item/wireditem.h b/plugins/network/item/wireditem.h
+index 8bb81c0d..4c4b5751 100644
+--- a/plugins/network/item/wireditem.h
++++ b/plugins/network/item/wireditem.h
+@@ -43,7 +43,7 @@ class WiredItem : public DeviceItem
+ 
+ public:
+     enum WiredStatus {
+-        Unknow              = 0,
++        Unknown             = 0,
+         Enabled             = 0x00000001,
+         Disabled            = 0x00000002,
+         Connected           = 0x00000004,
+diff --git a/plugins/network/item/wirelessitem.cpp b/plugins/network/item/wirelessitem.cpp
+index 858fc1b1..24396427 100644
+--- a/plugins/network/item/wirelessitem.cpp
++++ b/plugins/network/item/wirelessitem.cpp
+@@ -117,7 +117,7 @@ WirelessItem::WirelessStatus WirelessItem::getDeviceState()
+     }
+ 
+     switch (m_device->status()) {
+-    case NetworkDevice::Unknow:        return Unknow;
++    case NetworkDevice::Unknown:       return Unknown;
+     case NetworkDevice::Unmanaged:
+     case NetworkDevice::Unavailable:
+     case NetworkDevice::Disconnected:  return Disconnected;
+diff --git a/plugins/network/item/wirelessitem.h b/plugins/network/item/wirelessitem.h
+index d4d7d5ca..43d535c9 100644
+--- a/plugins/network/item/wirelessitem.h
++++ b/plugins/network/item/wirelessitem.h
+@@ -38,7 +38,7 @@ class WirelessItem : public DeviceItem
+ 
+ public:
+     enum WirelessStatus {
+-        Unknow              = 0,
++        Unknown             = 0,
+         Enabled             = 0x00010000,
+         Disabled            = 0x00020000,
+         Connected           = 0x00040000,
+diff --git a/plugins/network/networkitem.cpp b/plugins/network/networkitem.cpp
+index 0c7211b7..c6bdc2ca 100644
+--- a/plugins/network/networkitem.cpp
++++ b/plugins/network/networkitem.cpp
+@@ -525,7 +525,7 @@ void NetworkItem::getPluginState()
+     // 按如下顺序得到当前无线设备状态
+     temp = state;
+     if (!temp)
+-        wirelessState = WirelessItem::Unknow;
++        wirelessState = WirelessItem::Unknown;
+     temp = state;
+     if ((temp & WirelessItem::Disabled) >> 17)
+         wirelessState = WirelessItem::Disabled;
+@@ -569,7 +569,7 @@ void NetworkItem::getPluginState()
+     }
+     temp = state;
+     if (!temp)
+-        wiredState = WiredItem::Unknow;
++        wiredState = WiredItem::Unknown;
+     temp = state;
+     if ((temp & WiredItem::Nocable) >> 9)
+         wiredState = WiredItem::Nocable;