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

[Felix Yan]

    Date: Friday, August 14, 2020 @ 12:47:24
  Author: felixonmars
Revision: 679130

upgpkg: deepin-session-ui 5.3.0.1-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-14 12:38:30 UTC (rev 679129)
+++ PKGBUILD	2020-08-14 12:47:24 UTC (rev 679130)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-session-ui
-pkgver=5.2.0.16
+pkgver=5.3.0.1
 pkgrel=1
 pkgdesc='Deepin desktop-environment - Session UI module'
 arch=('x86_64')
@@ -17,17 +17,15 @@
 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"
-         deepin-session-ui-qt5.15.patch)
-sha512sums=('f28b14b4a720e2d43d54ff6836a6e636d87e185fa7a4361d6ce265fff4c36033e49f0dec4136c21a82462921d3dc057c47debb16c9a65e8c2e0974f57f5c9b4f'
-            '846726964cac5005b0ac3a5043e5df914ff83faff68f98d2513d86494a9718a85ae4268776fd08ffe852e28ac0ae5878353d3c65db84fbd1509b2325e70fe8d6')
+         deepin-session-ui-qt5.15-reborn.patch::https://github.com/linuxdeepin/dde-session-ui/commit/926744b8111f30f8b40b9a8cfb4b3309babdf863.patch)
+sha512sums=('b12055fe9a0d66e175419d6cebf10986182c100755c56bab31e8d03b1ec8ec9224c749a121db5168b57f94864e54f9c3487328daede7f4593b8982cb828de0fc'
+            '181e2b27795450a420aed2229bdbdd0f0d47d1c80fdb016c08acc44120147aa0ea1bafc3c303a6f8918164bde764ad309ed54b5aa6082e3b1b420bf2d992231e')
 
 prepare() {
   cd dde-session-ui-$pkgver
   sed -i 's|/usr/share/backgrounds/default_background.jpg|/usr/share/backgrounds/deepin/desktop.jpg|' widgets/*.cpp
 
-  sed -i '/include <QPainter>/a #include <QPainterPath>' dde-notification-plugin/notifications/notificationswidget.cpp
-
-  patch -p1 -i ../deepin-session-ui-qt5.15.patch # Fix build with Qt 5.15
+  patch -p1 -i ../deepin-session-ui-qt5.15-reborn.patch # Fix build with Qt 5.15 again
 }
 
 build() {

Deleted: deepin-session-ui-qt5.15.patch
===================================================================
--- deepin-session-ui-qt5.15.patch	2020-08-14 12:38:30 UTC (rev 679129)
+++ deepin-session-ui-qt5.15.patch	2020-08-14 12:47:24 UTC (rev 679130)
@@ -1,24 +0,0 @@
-diff --git a/dde-osd/common.cpp b/dde-osd/common.cpp
-index 0505ac60..ffa55e84 100644
---- a/dde-osd/common.cpp
-+++ b/dde-osd/common.cpp
-@@ -25,6 +25,7 @@
- 
- #include "common.h"
- #include <QSvgRenderer>
-+#include <QPainterPath>
- 
- void DrawHelper::DrawImage(QPainter *painter, const QStyleOptionViewItem &option, const QString &pix, bool withText, bool withProgress)
- {
-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/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 <QPainterPath>
- 
- #include <QTimer>
- #include <QKeyEvent>