[arch-commits] Commit in deepin-control-center/trunk (2 files)

[Felix Yan]

    Date: Thursday, May 31, 2018 @ 08:52:26
  Author: felixonmars
Revision: 334641

upgpkg: deepin-control-center 4.5.3-1

Modified:
  deepin-control-center/trunk/PKGBUILD
Deleted:
  deepin-control-center/trunk/use-new-functions.patch

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-31 08:50:21 UTC (rev 334640)
+++ PKGBUILD	2018-05-31 08:52:26 UTC (rev 334641)
@@ -4,7 +4,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-control-center
-pkgver=4.5.2
+pkgver=4.5.3
 pkgrel=1
 pkgdesc='New control center for linux deepin'
 arch=('x86_64')
@@ -18,16 +18,9 @@
 conflicts=('dde-control-center' 'dde-dock-applets')
 replaces=('dde-control-center' 'dde-dock-applets')
 groups=('deepin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-control-center/archive/$pkgver.tar.gz"
-        use-new-functions.patch)
-sha512sums=('92f13a8a0834f815aa8e4ed6e565c3585c6a4c0e6e29e016dd8f735688661bf122b4b34ca2ed88de96ed2de4db6d8b1695d93b8a2197ad57cacf57ae6dec99e1'
-            'c4f286a017fc57a9dff26ae72f4523de67c54ad749ef7a27181f12ba60ac7699911c3670d2a71134f4a0b8f09efbad11cad87435f3b8d65c1d5f4b03c0d45ddc')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-control-center/archive/$pkgver.tar.gz")
+sha512sums=('cb749882853431cb45e26c5dd8ce3d68b2f6009fccdee17eff1b1a973038050aa7be1be3e9725a852e7c5685003178ebc7e9d6e6fce5fd444bafb27a1d87b4f7')
 
-prepare() {
-  cd dde-control-center-$pkgver
-  patch -p1 -i ../use-new-functions.patch
-}
-
 build() {
   cd dde-control-center-$pkgver
   qmake-qt5 QMAKE_CFLAGS_ISYSTEM= PREFIX=/usr DISABLE_SYS_UPDATE=YES

Deleted: use-new-functions.patch
===================================================================
--- use-new-functions.patch	2018-05-31 08:50:21 UTC (rev 334640)
+++ use-new-functions.patch	2018-05-31 08:52:26 UTC (rev 334641)
@@ -1,28 +0,0 @@
-diff --git a/dialogs/reboot-reminder-dialog/reminderdialog.cpp b/dialogs/reboot-reminder-dialog/reminderdialog.cpp
-index b11130b2..efb302de 100644
---- a/dialogs/reboot-reminder-dialog/reminderdialog.cpp
-+++ b/dialogs/reboot-reminder-dialog/reminderdialog.cpp
-@@ -27,6 +27,7 @@
- 
- #include <QApplication>
- #include <QDesktopWidget>
-+#include <QScreen>
- 
- #include <QDebug>
- 
-@@ -80,9 +81,14 @@ Manager::Manager() :
- 
- void Manager::setupDialog()
- {
--    const QDesktopWidget *desktop = QApplication::desktop();
-     const QPoint cursorPoint = QCursor::pos();
-+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
-+    const QDesktopWidget *desktop = QApplication::desktop();
-     const QRect geom = desktop->screenGeometry(cursorPoint);
-+#else
-+    const QScreen *screen = qApp->screenAt(cursorPoint);
-+    const QRect geom = screen->geometry();
-+#endif
- 
-     if (!m_dialog)
-         m_dialog = new ReminderDialog(geom);