[arch-commits] Commit in deepin-topbar/trunk (PKGBUILD deepin-topbar-dde-v20.patch)

[Felix Yan]

    Date: Monday, June 15, 2020 @ 13:56:49
  Author: felixonmars
Revision: 645137

upgpkg: deepin-topbar 0.6.6-3

Added:
  deepin-topbar/trunk/deepin-topbar-dde-v20.patch
Modified:
  deepin-topbar/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   12 +++++--
 deepin-topbar-dde-v20.patch |   64 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-15 13:54:18 UTC (rev 645136)
+++ PKGBUILD	2020-06-15 13:56:49 UTC (rev 645137)
@@ -3,7 +3,7 @@
 
 pkgname=deepin-topbar
 pkgver=0.6.6
-pkgrel=2
+pkgrel=3
 pkgdesc="This is topbar for Deepin"
 arch=('x86_64')
 url="https://github.com/kirigayakazushin/deepin-topbar"
@@ -11,9 +11,15 @@
 depends=('deepin-network-utils' 'deepin-qt5integration' 'deepin-qt-dbus-factory' 'libdbusmenu-qt5'
          'procps-ng')
 makedepends=('cmake' 'qt5-tools')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/kirigayakazushin/deepin-topbar/archive/$pkgver.tar.gz")
-sha512sums=('415f6e4eadbe78fe1ab4ef61c5f32f8c945fea56556458a88592da7094aeaf1a03cac2f8ac4a2b0f0d3506368ff3f9f3ae19b5683892f5b995024225f06a65dc')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/kirigayakazushin/deepin-topbar/archive/$pkgver.tar.gz"
+        $pkgname-dde-v20.patch)
+sha512sums=('415f6e4eadbe78fe1ab4ef61c5f32f8c945fea56556458a88592da7094aeaf1a03cac2f8ac4a2b0f0d3506368ff3f9f3ae19b5683892f5b995024225f06a65dc'
+            '4109ca2aea0c35d2c2c8a91dda43776f24420446ded2f41d0e6feb210fdf7130dfdba449d32d1ce3318389749ec242a815ac58f0b143e36788f31de835d24c8c')
 
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < $pkgname-dde-v20.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib

Added: deepin-topbar-dde-v20.patch
===================================================================
--- deepin-topbar-dde-v20.patch	                        (rev 0)
+++ deepin-topbar-dde-v20.patch	2020-06-15 13:56:49 UTC (rev 645137)
@@ -0,0 +1,64 @@
+diff --git a/src/widgets/itempopupwindow.h b/src/widgets/itempopupwindow.h
+index 73abcfe..d0667bc 100644
+--- a/src/widgets/itempopupwindow.h
++++ b/src/widgets/itempopupwindow.h
+@@ -4,7 +4,9 @@
+ #include <QWidget>
+ #include <darrowrectangle.h>
+ #include <dregionmonitor.h>
++#include <DRegionMonitor>
+ 
++DGUI_USE_NAMESPACE
+ DWIDGET_USE_NAMESPACE
+ 
+ class ItemPopupWindow : public DArrowRectangle
+diff --git a/src/widgets/itempopupwindow.cpp b/src/widgets/itempopupwindow.cpp
+index e6ed86c..90f9e93 100644
+--- a/src/widgets/itempopupwindow.cpp
++++ b/src/widgets/itempopupwindow.cpp
+@@ -1,4 +1,7 @@
+ #include "itempopupwindow.h"
++#include <DRegionMonitor>
++
++DGUI_USE_NAMESPACE
+ 
+ ItemPopupWindow::ItemPopupWindow(QWidget *parent)
+     : DArrowRectangle(DArrowRectangle::ArrowTop, parent)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 301cf95..60daf59 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -261,6 +261,8 @@ find_package(PkgConfig REQUIRED)
+ find_package(DtkWidget REQUIRED)
+ find_package(Qt5 COMPONENTS Core Gui DBus Svg X11Extras Concurrent REQUIRED)
+ 
++pkg_check_modules(DtkWidget REQUIRED dtkwidget)
++pkg_check_modules(DtkGui REQUIRED dtkgui)
+ pkg_check_modules(PROCPS REQUIRED libprocps)
+ pkg_check_modules(XCB_LIBS REQUIRED xcb-ewmh xcb xcb-image xcb-composite xtst xcb-icccm dbusmenu-qt5)
+ pkg_check_modules(XCB_EWMH REQUIRED xcb-ewmh x11 xext)
+diff --git a/src/widgets/switchitem.h b/src/widgets/switchitem.h
+index 92dfe74..1c332da 100644
+--- a/src/widgets/switchitem.h
++++ b/src/widgets/switchitem.h
+@@ -15,7 +15,7 @@ public:
+     explicit SwitchItem(QWidget *parent = 0);
+ 
+     const QString text() const { return m_text->text(); }
+-    bool checked() const { return m_switch->checked(); }
++    bool checked() const { return m_switch->isChecked(); }
+     const QString value() const {return m_value; }
+ 
+ signals:
+diff --git a/src/modules/sound/sounditem.cpp b/src/modules/sound/sounditem.cpp
+index ec91e21..e3305a9 100644
+--- a/src/modules/sound/sounditem.cpp
++++ b/src/modules/sound/sounditem.cpp
+@@ -51,7 +51,6 @@ SoundItem::SoundItem(QWidget *parent)
+     m_tickScrollArea->hide();
+ 
+     m_tickEffect->setDirection(DTickEffect::RightToLeft);
+-    m_tickEffect->setDuration(3000);
+ 
+     QHBoxLayout *layout = new QHBoxLayout;
+     layout->setMargin(0);