[arch-commits] Commit in deepin-session-ui/trunk (2 files)

[Felix Yan]

    Date: Wednesday, June 3, 2020 @ 16:28:53
  Author: felixonmars
Revision: 638271

upgpkg: deepin-session-ui 5.2.0.0-1

Modified:
  deepin-session-ui/trunk/PKGBUILD
  deepin-session-ui/trunk/deepin-session-ui-qt5.15.patch

--------------------------------+
 PKGBUILD                       |   17 +++++++++--------
 deepin-session-ui-qt5.15.patch |   12 ++++++------
 2 files changed, 15 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-03 16:25:29 UTC (rev 638270)
+++ PKGBUILD	2020-06-03 16:28:53 UTC (rev 638271)
@@ -3,8 +3,9 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-session-ui
-pkgver=5.1.0101.0
-pkgrel=2
+pkgver=5.2.0.0
+_tag=5.2.0.0-1
+pkgrel=1
 pkgdesc='Deepin desktop-environment - Session UI module'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/dde-session-ui"
@@ -16,13 +17,13 @@
 provides=('deepin-notifications')
 conflicts=('dde-workspace' 'dde-session-ui' 'deepin-notifications')
 replaces=('dde-workspace' 'dde-session-ui' 'deepin-notifications')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-session-ui/archive/$pkgver.tar.gz"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-session-ui/archive/$_tag.tar.gz"
          deepin-session-ui-qt5.15.patch)
-sha512sums=('764d0a47320ab4dd3d8ce8ed22d2094e100f720ce552339746edfd123ec081f766ab1874c2b4b9620b6a6f4e82495cf4e7e2e1128e5bbb8a22eac3440b0017a9'
-            '421b100161ad9db234ece920e2c2784e1fbca0cd04e1a9a067311f3fdb13cc0ef7d58f7b33af151fabc7637b793d1479011966a741d854d745bcab3b79a9cdfd')
+sha512sums=('4bd87efdbf27a231e6db9f64e159c7ad69bcdacda881969805e1f4d58240f8eb7cdafa76720679fb688836e28552da0405a65ffb1e32bd33d3d1bdb9180f57f2'
+            '846726964cac5005b0ac3a5043e5df914ff83faff68f98d2513d86494a9718a85ae4268776fd08ffe852e28ac0ae5878353d3c65db84fbd1509b2325e70fe8d6')
 
 prepare() {
-  cd dde-session-ui-$pkgver
+  cd dde-session-ui-$_tag
   sed -i 's|/usr/share/backgrounds/default_background.jpg|/usr/share/backgrounds/deepin/desktop.jpg|' widgets/*.cpp
 
   patch -p1 -i ../deepin-session-ui-qt5.15.patch # Fix build with Qt 5.15
@@ -29,12 +30,12 @@
 }
 
 build() {
-  cd dde-session-ui-$pkgver
+  cd dde-session-ui-$_tag
   qmake-qt5 PREFIX=/usr
   make
 }
 
 package() {
-  cd dde-session-ui-$pkgver
+  cd dde-session-ui-$_tag
   make INSTALL_ROOT="$pkgdir" install
 }

Modified: deepin-session-ui-qt5.15.patch
===================================================================
--- deepin-session-ui-qt5.15.patch	2020-06-03 16:25:29 UTC (rev 638270)
+++ deepin-session-ui-qt5.15.patch	2020-06-03 16:28:53 UTC (rev 638271)
@@ -10,15 +10,15 @@
  
  void DrawHelper::DrawImage(QPainter *painter, const QStyleOptionViewItem &option, const QString &pix, bool withText, bool withProgress)
  {
-diff --git a/dde-osd/notification-center/bubbleoverlapwidget.cpp b/dde-osd/notification-center/bubbleoverlapwidget.cpp
+diff --git a/dde-osd/notification-center/overlapwidet.cpp b/dde-osd/notification-center/overlapwidet.cpp
 index d2aee64e..a89f0bd1 100644
---- a/dde-osd/notification-center/bubbleoverlapwidget.cpp
-+++ b/dde-osd/notification-center/bubbleoverlapwidget.cpp
+--- a/dde-osd/notification-center/overlapwidet.cpp
++++ b/dde-osd/notification-center/overlapwidet.cpp
 @@ -25,6 +25,7 @@
+ #include "../notification/constants.h"
  #include "notification/constants.h"
  #include "notifymodel.h"
- #include <QPointer>
 +#include <QPainterPath>
  
- HalfRoundedRectWidget::HalfRoundedRectWidget(QWidget *parent)
-     : AlphaWidget(parent)
+ #include <QTimer>
+ #include <QKeyEvent>