Date: Saturday, June 3, 2017 @ 03:11:15 Author: felixonmars Revision: 233640
upgpkg: deepin-session-ui 4.0.7-1 Modified: deepin-session-ui/trunk/PKGBUILD Deleted: deepin-session-ui/trunk/issue54075.patch ------------------+ PKGBUILD | 16 ++------- issue54075.patch | 88 ----------------------------------------------------- 2 files changed, 4 insertions(+), 100 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-06-03 03:02:31 UTC (rev 233639) +++ PKGBUILD 2017-06-03 03:11:15 UTC (rev 233640) @@ -4,8 +4,8 @@ # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> pkgname=deepin-session-ui -pkgver=4.0.6 -pkgrel=2 +pkgver=4.0.7 +pkgrel=1 pkgdesc='Deepin desktop-environment - Session UI module' arch=('i686' 'x86_64') url="https://github.com/linuxdeepin/dde-session-ui" @@ -17,17 +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" - issue54075.patch) -sha512sums=('b16bdf0085872a781e26b6cbd0604809f0a435a3a0152e325f0fac725ecf0b77981aa7b7f541d0f3dd1713a617c7786fad77c408d74c73606c21c5bebf54e66e' - '000368298dbf31e806f2bc814ae74e4a5f561a7b2d6cf6083b82ab817b10c95a1ee6e3f6eb7eb58e9f92e19de8aac21ef4ac7cfe24afdc9b5767c18dc39deed7') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-session-ui/archive/$pkgver.tar.gz") +sha512sums=('af2a14fe9d0e846abd06f969dac49501b51a88368669d0e9267399b6d41498abb1bb9a8f293f5ba103db77f372c9f4c4b79d7f43dcd9d235d651d1f8af33c067') -prepare() { - cd dde-session-ui-$pkgver - # https://github.com/linuxdeepin/developer-center/issues/286 - patch -p1 -i ../issue54075.patch -} - build() { cd dde-session-ui-$pkgver qmake-qt5 PREFIX=/usr Deleted: issue54075.patch =================================================================== --- issue54075.patch 2017-06-03 03:02:31 UTC (rev 233639) +++ issue54075.patch 2017-06-03 03:11:15 UTC (rev 233640) @@ -1,88 +0,0 @@ -From 28e0c04d652b5f0a492b1716d7bde2065557dcbf Mon Sep 17 00:00:00 2001 -From: kirigaya <kirig...@mkacg.com> -Date: Tue, 9 May 2017 10:01:24 +0800 -Subject: [PATCH] dde-lock: frequent calls to DBUS cause timeout - -Change-Id: I05a840c24e6276f34007b85ba76eefde10dd50aa ---- - dde-lock/lockmanager.cpp | 6 ++++++ - dde-lock/lockmanager.h | 1 + - 2 files changed, 7 insertions(+) - -diff --git a/dde-lock/lockmanager.cpp b/dde-lock/lockmanager.cpp -index 7c4b23b..f8cecdb 100644 ---- a/dde-lock/lockmanager.cpp -+++ b/dde-lock/lockmanager.cpp -@@ -217,6 +217,7 @@ void LockManager::chooseUserMode() - - void LockManager::onUnlockFinished(QDBusPendingCallWatcher *w) - { -+ m_checkingPWD = false; - - QDBusPendingReply<bool> reply = *w; - -@@ -344,6 +345,11 @@ void LockManager::mouseReleaseEvent(QMouseEvent *e) - - void LockManager::unlock() - { -+ if (m_checkingPWD) -+ return; -+ -+ m_checkingPWD = true; -+ - if (!m_requireShutdownWidget->isHidden()) { - m_requireShutdownWidget->shutdownAction(); - return; -diff --git a/dde-lock/lockmanager.h b/dde-lock/lockmanager.h -index 69c90bd..be3cc07 100644 ---- a/dde-lock/lockmanager.h -+++ b/dde-lock/lockmanager.h -@@ -108,6 +108,7 @@ public slots: - QSize m_passwdEditSize; - - int m_authFailureCount = 0; -+ bool m_checkingPWD = false; - }; - - #endif // LOCKMANAGER_H -From 9d3b0ed23549f86b6879f5778c61902dbb4ddc99 Mon Sep 17 00:00:00 2001 -From: kirigaya <kirig...@mkacg.com> -Date: Thu, 11 May 2017 17:25:31 +0800 -Subject: [PATCH] Lock: fix error lock - -Change-Id: I8037aec76679bde1bb0063bbbefebc74f9dd6ef3 ---- - dde-lock/lockmanager.cpp | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/dde-lock/lockmanager.cpp b/dde-lock/lockmanager.cpp -index 5d47927..3fc19b7 100644 ---- a/dde-lock/lockmanager.cpp -+++ b/dde-lock/lockmanager.cpp -@@ -352,11 +352,6 @@ void LockManager::mouseReleaseEvent(QMouseEvent *e) - - void LockManager::unlock() - { -- if (m_checkingPWD) -- return; -- -- m_checkingPWD = true; -- - if (!m_requireShutdownWidget->isHidden()) { - m_requireShutdownWidget->shutdownAction(); - return; -@@ -371,6 +366,14 @@ void LockManager::unlock() - - m_userWidget->showLoadingAni(); - -+ if (!m_passwordEdit->isVisible()) -+ return; -+ -+ if (m_checkingPWD) -+ return; -+ -+ m_checkingPWD = true; -+ - // qDebug() << "unlock" << m_userWidget->currentUser() << m_passwordEdit->getText(); - const QString &username = m_userWidget->currentUser(); - const QString &password = m_passwordEdit->getText();