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

[Antonio Rojas]

    Date: Tuesday, May 26, 2020 @ 15:55:48
  Author: arojas
Revision: 635113

Qt 5.15 rebuild

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-26 15:17:13 UTC (rev 635112)
+++ PKGBUILD	2020-05-26 15:55:48 UTC (rev 635113)
@@ -4,7 +4,7 @@
 
 pkgname=deepin-session-ui
 pkgver=5.1.0101.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Deepin desktop-environment - Session UI module'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/dde-session-ui"
@@ -16,12 +16,16 @@
 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")
-sha512sums=('764d0a47320ab4dd3d8ce8ed22d2094e100f720ce552339746edfd123ec081f766ab1874c2b4b9620b6a6f4e82495cf4e7e2e1128e5bbb8a22eac3440b0017a9')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-session-ui/archive/$pkgver.tar.gz"
+         deepin-session-ui-qt5.15.patch)
+sha512sums=('764d0a47320ab4dd3d8ce8ed22d2094e100f720ce552339746edfd123ec081f766ab1874c2b4b9620b6a6f4e82495cf4e7e2e1128e5bbb8a22eac3440b0017a9'
+            '421b100161ad9db234ece920e2c2784e1fbca0cd04e1a9a067311f3fdb13cc0ef7d58f7b33af151fabc7637b793d1479011966a741d854d745bcab3b79a9cdfd')
 
 prepare() {
   cd dde-session-ui-$pkgver
   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
 }
 
 build() {

Added: deepin-session-ui-qt5.15.patch
===================================================================
--- deepin-session-ui-qt5.15.patch	                        (rev 0)
+++ deepin-session-ui-qt5.15.patch	2020-05-26 15:55:48 UTC (rev 635113)
@@ -0,0 +1,24 @@
+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/bubbleoverlapwidget.cpp b/dde-osd/notification-center/bubbleoverlapwidget.cpp
+index d2aee64e..a89f0bd1 100644
+--- a/dde-osd/notification-center/bubbleoverlapwidget.cpp
++++ b/dde-osd/notification-center/bubbleoverlapwidget.cpp
+@@ -25,6 +25,7 @@
+ #include "notification/constants.h"
+ #include "notifymodel.h"
+ #include <QPointer>
++#include <QPainterPath>
+ 
+ HalfRoundedRectWidget::HalfRoundedRectWidget(QWidget *parent)
+     : AlphaWidget(parent)