Date: Wednesday, May 30, 2018 @ 03:24:33 Author: felixonmars Revision: 333263
upgpkg: deepin-control-center 4.5.2-1 Added: deepin-control-center/trunk/use-new-functions.patch Modified: deepin-control-center/trunk/PKGBUILD -------------------------+ PKGBUILD | 13 ++++++++++--- use-new-functions.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-05-30 03:23:11 UTC (rev 333262) +++ PKGBUILD 2018-05-30 03:24:33 UTC (rev 333263) @@ -4,7 +4,7 @@ # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> pkgname=deepin-control-center -pkgver=4.5.0 +pkgver=4.5.2 pkgrel=1 pkgdesc='New control center for linux deepin' arch=('x86_64') @@ -18,9 +18,16 @@ conflicts=('dde-control-center' 'dde-dock-applets') replaces=('dde-control-center' 'dde-dock-applets') groups=('deepin') -source=("$pkgname-$pkgver.tar.gz::https://github.com/felixonmars/dde-control-center/archive/$pkgver.tar.gz") -sha512sums=('3a4052aceab25b9cb8189614d3f6382fe96b52d5f1f21e26c0c7b3f8ab81770f0eef9610956f546565b5565152ffef906e9eb326f259dac12c9bad40018b128d') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-control-center/archive/$pkgver.tar.gz" + use-new-functions.patch) +sha512sums=('92f13a8a0834f815aa8e4ed6e565c3585c6a4c0e6e29e016dd8f735688661bf122b4b34ca2ed88de96ed2de4db6d8b1695d93b8a2197ad57cacf57ae6dec99e1' + 'c4f286a017fc57a9dff26ae72f4523de67c54ad749ef7a27181f12ba60ac7699911c3670d2a71134f4a0b8f09efbad11cad87435f3b8d65c1d5f4b03c0d45ddc') +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 Added: use-new-functions.patch =================================================================== --- use-new-functions.patch (rev 0) +++ use-new-functions.patch 2018-05-30 03:24:33 UTC (rev 333263) @@ -0,0 +1,28 @@ +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);