[arch-commits] Commit in deepin-topbar/repos/community-x86_64 (4 files)
Felix Yan
felixonmars at archlinux.org
Tue Jun 16 08:47:21 UTC 2020
Date: Tuesday, June 16, 2020 @ 08:47:20
Author: felixonmars
Revision: 646022
archrelease: copy trunk to community-x86_64
Added:
deepin-topbar/repos/community-x86_64/PKGBUILD
(from rev 646021, deepin-topbar/trunk/PKGBUILD)
deepin-topbar/repos/community-x86_64/deepin-topbar-dde-v20.patch
(from rev 646021, deepin-topbar/trunk/deepin-topbar-dde-v20.patch)
Deleted:
deepin-topbar/repos/community-x86_64/PKGBUILD
deepin-topbar/repos/community-x86_64/deepin-topbar-dde-v20.patch
-----------------------------+
PKGBUILD | 58 ++++++++-----------
deepin-topbar-dde-v20.patch | 128 +++++++++++++++++++++---------------------
2 files changed, 90 insertions(+), 96 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-16 08:47:04 UTC (rev 646021)
+++ PKGBUILD 2020-06-16 08:47:20 UTC (rev 646022)
@@ -1,32 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: kirigaya <kirigaya at mkacg.com>
-
-pkgname=deepin-topbar
-pkgver=0.6.6
-pkgrel=3
-pkgdesc="This is topbar for Deepin"
-arch=('x86_64')
-url="https://github.com/kirigayakazushin/deepin-topbar"
-license=('GPL')
-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"
- $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
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: deepin-topbar/repos/community-x86_64/PKGBUILD (from rev 646021, deepin-topbar/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-06-16 08:47:20 UTC (rev 646022)
@@ -0,0 +1,26 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: kirigaya <kirigaya at mkacg.com>
+
+pkgname=deepin-topbar
+pkgver=0.7.0
+pkgrel=1
+pkgdesc="This is topbar for Deepin"
+arch=('x86_64')
+url="https://github.com/kirigayakazushin/deepin-topbar"
+license=('GPL')
+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=('30d0b0df25c5ceef626b079c1113d3915532e74c2392f964d5438b374aa5e3d2adedbc9cc3106f8aa23c822539310260f0d5a7d28392181c6b30bfb669dbbb9f')
+
+build() {
+ cd $pkgname-$pkgver
+ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: deepin-topbar-dde-v20.patch
===================================================================
--- deepin-topbar-dde-v20.patch 2020-06-16 08:47:04 UTC (rev 646021)
+++ deepin-topbar-dde-v20.patch 2020-06-16 08:47:20 UTC (rev 646022)
@@ -1,64 +0,0 @@
-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);
Copied: deepin-topbar/repos/community-x86_64/deepin-topbar-dde-v20.patch (from rev 646021, deepin-topbar/trunk/deepin-topbar-dde-v20.patch)
===================================================================
--- deepin-topbar-dde-v20.patch (rev 0)
+++ deepin-topbar-dde-v20.patch 2020-06-16 08:47:20 UTC (rev 646022)
@@ -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);
More information about the arch-commits
mailing list