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

[Felix Yan]

    Date: Thursday, May 31, 2018 @ 08:49:16
  Author: felixonmars
Revision: 334637

upgpkg: deepin-session-ui 4.4.2-1

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

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

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

Deleted: use-new-functions.patch
===================================================================
--- use-new-functions.patch	2018-05-31 08:47:36 UTC (rev 334636)
+++ use-new-functions.patch	2018-05-31 08:49:16 UTC (rev 334637)
@@ -1,26 +0,0 @@
-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();