Date: Wednesday, May 24, 2017 @ 07:00:56 Author: felixonmars Revision: 229925
archrelease: copy trunk to community-i686, community-x86_64 Added: deepin-session-ui/repos/community-i686/PKGBUILD (from rev 229924, deepin-session-ui/trunk/PKGBUILD) deepin-session-ui/repos/community-i686/issue54075.patch (from rev 229924, deepin-session-ui/trunk/issue54075.patch) deepin-session-ui/repos/community-x86_64/PKGBUILD (from rev 229924, deepin-session-ui/trunk/PKGBUILD) deepin-session-ui/repos/community-x86_64/issue54075.patch (from rev 229924, deepin-session-ui/trunk/issue54075.patch) Deleted: deepin-session-ui/repos/community-i686/PKGBUILD deepin-session-ui/repos/community-x86_64/PKGBUILD -----------------------------------+ /PKGBUILD | 80 ++++++++++++++++++++++++++++++++ community-i686/PKGBUILD | 32 ------------- community-i686/issue54075.patch | 88 ++++++++++++++++++++++++++++++++++++ community-x86_64/PKGBUILD | 32 ------------- community-x86_64/issue54075.patch | 88 ++++++++++++++++++++++++++++++++++++ 5 files changed, 256 insertions(+), 64 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-05-24 07:00:29 UTC (rev 229924) +++ community-i686/PKGBUILD 2017-05-24 07:00:56 UTC (rev 229925) @@ -1,32 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Josip Ponjavic <josipponjavic at gmail dot com> -# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> - -pkgname=deepin-session-ui -pkgver=4.0.6 -pkgrel=1 -pkgdesc='Deepin desktop-environment - Session UI module' -arch=('i686' 'x86_64') -url="https://github.com/linuxdeepin/dde-session-ui" -license=('GPL3') -groups=('deepin') -depends=('gsettings-qt' 'deepin-tool-kit' 'liblightdm-qt5' 'qt5-svg' 'deepin-daemon' - 'deepin-control-center' 'startdde' 'gtk2' 'xorg-xrandr' 'deepin-qt-dbus-factory') -makedepends=('qt5-tools') -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") -sha512sums=('b16bdf0085872a781e26b6cbd0604809f0a435a3a0152e325f0fac725ecf0b77981aa7b7f541d0f3dd1713a617c7786fad77c408d74c73606c21c5bebf54e66e') - -build() { - cd dde-session-ui-$pkgver - qmake-qt5 PREFIX=/usr - make -} - -package() { - cd dde-session-ui-$pkgver - make INSTALL_ROOT="$pkgdir" install -} Copied: deepin-session-ui/repos/community-i686/PKGBUILD (from rev 229924, deepin-session-ui/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-05-24 07:00:56 UTC (rev 229925) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Josip Ponjavic <josipponjavic at gmail dot com> +# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> + +pkgname=deepin-session-ui +pkgver=4.0.6 +pkgrel=2 +pkgdesc='Deepin desktop-environment - Session UI module' +arch=('i686' 'x86_64') +url="https://github.com/linuxdeepin/dde-session-ui" +license=('GPL3') +groups=('deepin') +depends=('gsettings-qt' 'deepin-tool-kit' 'liblightdm-qt5' 'qt5-svg' 'deepin-daemon' + 'deepin-control-center' 'startdde' 'gtk2' 'xorg-xrandr' 'deepin-qt-dbus-factory') +makedepends=('qt5-tools') +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') + +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 + make +} + +package() { + cd dde-session-ui-$pkgver + make INSTALL_ROOT="$pkgdir" install +} Copied: deepin-session-ui/repos/community-i686/issue54075.patch (from rev 229924, deepin-session-ui/trunk/issue54075.patch) =================================================================== --- community-i686/issue54075.patch (rev 0) +++ community-i686/issue54075.patch 2017-05-24 07:00:56 UTC (rev 229925) @@ -0,0 +1,88 @@ +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(); Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2017-05-24 07:00:29 UTC (rev 229924) +++ community-x86_64/PKGBUILD 2017-05-24 07:00:56 UTC (rev 229925) @@ -1,32 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Josip Ponjavic <josipponjavic at gmail dot com> -# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> - -pkgname=deepin-session-ui -pkgver=4.0.6 -pkgrel=1 -pkgdesc='Deepin desktop-environment - Session UI module' -arch=('i686' 'x86_64') -url="https://github.com/linuxdeepin/dde-session-ui" -license=('GPL3') -groups=('deepin') -depends=('gsettings-qt' 'deepin-tool-kit' 'liblightdm-qt5' 'qt5-svg' 'deepin-daemon' - 'deepin-control-center' 'startdde' 'gtk2' 'xorg-xrandr' 'deepin-qt-dbus-factory') -makedepends=('qt5-tools') -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") -sha512sums=('b16bdf0085872a781e26b6cbd0604809f0a435a3a0152e325f0fac725ecf0b77981aa7b7f541d0f3dd1713a617c7786fad77c408d74c73606c21c5bebf54e66e') - -build() { - cd dde-session-ui-$pkgver - qmake-qt5 PREFIX=/usr - make -} - -package() { - cd dde-session-ui-$pkgver - make INSTALL_ROOT="$pkgdir" install -} Copied: deepin-session-ui/repos/community-x86_64/PKGBUILD (from rev 229924, deepin-session-ui/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-05-24 07:00:56 UTC (rev 229925) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Josip Ponjavic <josipponjavic at gmail dot com> +# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> + +pkgname=deepin-session-ui +pkgver=4.0.6 +pkgrel=2 +pkgdesc='Deepin desktop-environment - Session UI module' +arch=('i686' 'x86_64') +url="https://github.com/linuxdeepin/dde-session-ui" +license=('GPL3') +groups=('deepin') +depends=('gsettings-qt' 'deepin-tool-kit' 'liblightdm-qt5' 'qt5-svg' 'deepin-daemon' + 'deepin-control-center' 'startdde' 'gtk2' 'xorg-xrandr' 'deepin-qt-dbus-factory') +makedepends=('qt5-tools') +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') + +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 + make +} + +package() { + cd dde-session-ui-$pkgver + make INSTALL_ROOT="$pkgdir" install +} Copied: deepin-session-ui/repos/community-x86_64/issue54075.patch (from rev 229924, deepin-session-ui/trunk/issue54075.patch) =================================================================== --- community-x86_64/issue54075.patch (rev 0) +++ community-x86_64/issue54075.patch 2017-05-24 07:00:56 UTC (rev 229925) @@ -0,0 +1,88 @@ +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();