[arch-commits] Commit in deepin-session-ui/trunk (PKGBUILD use-new-functions.patch)

[Felix Yan]

    Date: Wednesday, May 30, 2018 @ 03:12:38
  Author: felixonmars
Revision: 333251

upgpkg: deepin-session-ui 4.4.1-1

Added:
  deepin-session-ui/trunk/use-new-functions.patch
Modified:
  deepin-session-ui/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   13 ++++++++++---
 use-new-functions.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-30 03:08:30 UTC (rev 333250)
+++ PKGBUILD	2018-05-30 03:12:38 UTC (rev 333251)
@@ -4,7 +4,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-session-ui
-pkgver=4.4.0
+pkgver=4.4.1
 pkgrel=1
 pkgdesc='Deepin desktop-environment - Session UI module'
 arch=('x86_64')
@@ -17,9 +17,16 @@
 provides=('lightdm-deepin-greeter')
 conflicts=('dde-workspace' 'dde-session-ui')
 replaces=('dde-workspace' 'dde-session-ui')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/felixonmars/dde-session-ui/archive/$pkgver.tar.gz")
-sha512sums=('a884fa407e067619fe3d5c8eb15f9e3653f300f78cd71ee297283bfbd9ab98d2bc4ef5b5dd1ad5b2eb6985638ce61db43915fc31c5e06c87cdcd983afa729bad')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-session-ui/archive/$pkgver.tar.gz"
+        use-new-functions.patch)
+sha512sums=('722924a2be8631f454e770fdd6668a3597427a3d6c853e1d2bf14600bf55a6ed3942aba3b669a686b88217e2387889473030c3b3a2f3a5ec9e7349172ce4a710'
+            'b6ac269b59a80727b79799ba5a0c0cfabb62a323d47ee6c8ca96421be9f67bc3bd3c57167398da3c94512c2d0e886245c30bafd46382548a041d8614f782f923')
 
+prepare() {
+  cd dde-session-ui-$pkgver
+  patch -p1 -i ../use-new-functions.patch
+}
+
 build() {
   cd dde-session-ui-$pkgver
   qmake-qt5 PREFIX=/usr

Added: use-new-functions.patch
===================================================================
--- use-new-functions.patch	                        (rev 0)
+++ use-new-functions.patch	2018-05-30 03:12:38 UTC (rev 333251)
@@ -0,0 +1,26 @@
+diff --git a/dde-suspend-dialog/suspenddialog.cpp b/dde-suspend-dialog/suspenddialog.cpp
+index 8ec8773..4da008b 100644
+--- a/dde-suspend-dialog/suspenddialog.cpp
++++ b/dde-suspend-dialog/suspenddialog.cpp
+@@ -26,7 +26,7 @@
+ #include "suspenddialog.h"
+ 
+ #include <QApplication>
+-#include <QDesktopWidget>
++#include <QScreen>
+ 
+ #include <QDebug>
+ 
+@@ -73,9 +73,9 @@ Manager::Manager()
+ 
+ void Manager::setupDialogs()
+ {
+-    const QDesktopWidget *desktop = QApplication::desktop();
+-    for (int i = 0; i < desktop->screenCount(); i++) {
+-        const QRect geom = desktop->screenGeometry(i);
++    QList<QScreen *> screenList = qApp->screens();
++    for (int i = 0; i < screenList.length(); i++) {
++        const QRect geom = screenList[i]->geometry();
+ 
+         SuspendDialog *dialog = new SuspendDialog(geom);
+         dialog->show();