[arch-commits] Commit in plasma-workspace/repos (10 files)
Antonio Rojas
arojas at archlinux.org
Wed Mar 25 21:11:32 UTC 2015
Date: Wednesday, March 25, 2015 @ 22:11:32
Author: arojas
Revision: 234947
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
plasma-workspace/repos/extra-i686/PKGBUILD
(from rev 234946, plasma-workspace/trunk/PKGBUILD)
plasma-workspace/repos/extra-i686/kde.pam
(from rev 234946, plasma-workspace/trunk/kde.pam)
plasma-workspace/repos/extra-i686/lockscreen-focus.patch
(from rev 234946, plasma-workspace/trunk/lockscreen-focus.patch)
plasma-workspace/repos/extra-x86_64/PKGBUILD
(from rev 234946, plasma-workspace/trunk/PKGBUILD)
plasma-workspace/repos/extra-x86_64/kde.pam
(from rev 234946, plasma-workspace/trunk/kde.pam)
plasma-workspace/repos/extra-x86_64/lockscreen-focus.patch
(from rev 234946, plasma-workspace/trunk/lockscreen-focus.patch)
Deleted:
plasma-workspace/repos/extra-i686/PKGBUILD
plasma-workspace/repos/extra-i686/kde.pam
plasma-workspace/repos/extra-x86_64/PKGBUILD
plasma-workspace/repos/extra-x86_64/kde.pam
-------------------------------------+
/PKGBUILD | 154 ++++++++++++++++++++++++++++++++++
/kde.pam | 12 ++
extra-i686/PKGBUILD | 73 ----------------
extra-i686/kde.pam | 6 -
extra-i686/lockscreen-focus.patch | 32 +++++++
extra-x86_64/PKGBUILD | 73 ----------------
extra-x86_64/kde.pam | 6 -
extra-x86_64/lockscreen-focus.patch | 32 +++++++
8 files changed, 230 insertions(+), 158 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-03-25 21:11:07 UTC (rev 234946)
+++ extra-i686/PKGBUILD 2015-03-25 21:11:32 UTC (rev 234947)
@@ -1,73 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Antonio Rojas
-# Contributor: Alexey D. <lq07829icatm at rambler.ru>
-
-pkgbase=plasma-workspace
-pkgname=('plasma-workspace' 'drkonqi')
-pkgver=5.2.2
-pkgrel=1
-pkgdesc='KDE Plasma Workspace'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
-license=('LGPL')
-# note on libxdamage:
-# not detected by namcap because libgl depends on it
-# but nvidia providing libgl does not depend on libxdamage
-depends=('knewstuff' 'kjsembed' 'knotifyconfig' 'libxdamage' 'kwayland'
- 'libksysguard' 'libkscreen-frameworks' 'ktexteditor' 'libqalculate'
- 'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
- 'xorg-xmessage' 'xorg-xprop' 'milou')
-makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo-frameworks'
- 'krunner')
-groups=('plasma')
-source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"
- 'kde.pam')
-md5sums=('93b4b7e187035635982d3099ba2c8d79'
- '929b182dec8a096206ad493477c09d2c')
-
-prepare() {
- mkdir build
-
- cd ${pkgbase}-${pkgver}
- # be sure to use the Qt5 version of qtpaths
- sed -i 's:qtpaths:qtpaths-qt5:' startkde/startkde.cmake
-}
-
-build() {
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DLIB_INSTALL_DIR=lib \
- -DLIBEXEC_INSTALL_DIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package_plasma-workspace() {
- optdepends=('plasma-workspace-wallpapers: additional wallpapers'
- 'gpsd: GPS support for geolocation')
- conflicts=('kdebase-workspace')
-
- cd build
- make DESTDIR="${pkgdir}" install
-
- install -D "${srcdir}"/kde.pam \
- "${pkgdir}"/etc/pam.d/kde
-
- # Remove conflicts with drkonqi
- rm "${pkgdir}"/usr/lib/drkonqi
- rm -r "${pkgdir}"/usr/share/drkonqi
- rm "${pkgdir}"/usr/lib/libKF5XmlRpcClientPrivate.*
-}
-
-package_drkonqi() {
- pkgdesc='KDE crash handler'
- depends=('kdewebkit')
-
- cd build/drkonqi
- make DESTDIR="${pkgdir}" install
-}
Copied: plasma-workspace/repos/extra-i686/PKGBUILD (from rev 234946, plasma-workspace/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-03-25 21:11:32 UTC (rev 234947)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Antonio Rojas
+# Contributor: Alexey D. <lq07829icatm at rambler.ru>
+
+pkgbase=plasma-workspace
+pkgname=('plasma-workspace' 'drkonqi')
+pkgver=5.2.2
+pkgrel=2
+pkgdesc='KDE Plasma Workspace'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
+license=('LGPL')
+# note on libxdamage:
+# not detected by namcap because libgl depends on it
+# but nvidia providing libgl does not depend on libxdamage
+depends=('knewstuff' 'kjsembed' 'knotifyconfig' 'libxdamage' 'kwayland'
+ 'libksysguard' 'libkscreen-frameworks' 'ktexteditor' 'libqalculate'
+ 'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
+ 'xorg-xmessage' 'xorg-xprop' 'milou')
+makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo-frameworks'
+ 'krunner')
+groups=('plasma')
+source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"
+ 'kde.pam' 'lockscreen-focus.patch')
+md5sums=('93b4b7e187035635982d3099ba2c8d79'
+ '929b182dec8a096206ad493477c09d2c'
+ '0dcc042d4188b2f664f9daf4a5923778')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgbase}-${pkgver}
+ # be sure to use the Qt5 version of qtpaths
+ sed -i 's:qtpaths:qtpaths-qt5:' startkde/startkde.cmake
+
+# fix password field not getting focus in lock screen (upstream bug #344823)
+ patch -p1 -i "$srcdir"/lockscreen-focus.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DLIB_INSTALL_DIR=lib \
+ -DLIBEXEC_INSTALL_DIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package_plasma-workspace() {
+ optdepends=('plasma-workspace-wallpapers: additional wallpapers'
+ 'gpsd: GPS support for geolocation')
+ conflicts=('kdebase-workspace')
+
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+ install -D "${srcdir}"/kde.pam \
+ "${pkgdir}"/etc/pam.d/kde
+
+ # Remove conflicts with drkonqi
+ rm "${pkgdir}"/usr/lib/drkonqi
+ rm -r "${pkgdir}"/usr/share/drkonqi
+ rm "${pkgdir}"/usr/lib/libKF5XmlRpcClientPrivate.*
+}
+
+package_drkonqi() {
+ pkgdesc='KDE crash handler'
+ depends=('kdewebkit')
+
+ cd build/drkonqi
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/kde.pam
===================================================================
--- extra-i686/kde.pam 2015-03-25 21:11:07 UTC (rev 234946)
+++ extra-i686/kde.pam 2015-03-25 21:11:32 UTC (rev 234947)
@@ -1,6 +0,0 @@
-#%PAM-1.0
-
-auth include system-login
-account include system-login
-password include system-login
-session include system-login
Copied: plasma-workspace/repos/extra-i686/kde.pam (from rev 234946, plasma-workspace/trunk/kde.pam)
===================================================================
--- extra-i686/kde.pam (rev 0)
+++ extra-i686/kde.pam 2015-03-25 21:11:32 UTC (rev 234947)
@@ -0,0 +1,6 @@
+#%PAM-1.0
+
+auth include system-login
+account include system-login
+password include system-login
+session include system-login
Copied: plasma-workspace/repos/extra-i686/lockscreen-focus.patch (from rev 234946, plasma-workspace/trunk/lockscreen-focus.patch)
===================================================================
--- extra-i686/lockscreen-focus.patch (rev 0)
+++ extra-i686/lockscreen-focus.patch 2015-03-25 21:11:32 UTC (rev 234947)
@@ -0,0 +1,32 @@
+From: Bhushan Shah <bhush94 at gmail.com>
+Date: Wed, 25 Mar 2015 15:55:22 +0000
+Subject: Workaround the lockscreen password field focus issue
+X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=24f24e03793c8214a5d1f3414a5aeb48eccef4f4
+---
+Workaround the lockscreen password field focus issue
+
+Fixes bug 344823
+Backport of a476e1b6bf6f683bd74000bb30076868c9f92371 in 5.2
+
+CCMAIL: release-team at kde.org
+---
+
+
+--- a/lookandfeel/contents/lockscreen/LockScreen.qml
++++ b/lookandfeel/contents/lockscreen/LockScreen.qml
+@@ -156,6 +156,14 @@
+ enabled: !authenticator.graceLocked
+ onAccepted: unlockFunction()
+ focus: true
++ //HACK: Similar hack is needed in sddm loginscreen
++ //TODO: investigate
++ Timer {
++ interval: 200
++ running: true
++ repeat: false
++ onTriggered: passwordInput.forceActiveFocus()
++ }
+ visible: block.mainItem.model.get(block.mainItem.selectedIndex)["showPassword"]
+ onVisibleChanged: {
+ if (visible) {
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-03-25 21:11:07 UTC (rev 234946)
+++ extra-x86_64/PKGBUILD 2015-03-25 21:11:32 UTC (rev 234947)
@@ -1,73 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Antonio Rojas
-# Contributor: Alexey D. <lq07829icatm at rambler.ru>
-
-pkgbase=plasma-workspace
-pkgname=('plasma-workspace' 'drkonqi')
-pkgver=5.2.2
-pkgrel=1
-pkgdesc='KDE Plasma Workspace'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
-license=('LGPL')
-# note on libxdamage:
-# not detected by namcap because libgl depends on it
-# but nvidia providing libgl does not depend on libxdamage
-depends=('knewstuff' 'kjsembed' 'knotifyconfig' 'libxdamage' 'kwayland'
- 'libksysguard' 'libkscreen-frameworks' 'ktexteditor' 'libqalculate'
- 'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
- 'xorg-xmessage' 'xorg-xprop' 'milou')
-makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo-frameworks'
- 'krunner')
-groups=('plasma')
-source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"
- 'kde.pam')
-md5sums=('93b4b7e187035635982d3099ba2c8d79'
- '929b182dec8a096206ad493477c09d2c')
-
-prepare() {
- mkdir build
-
- cd ${pkgbase}-${pkgver}
- # be sure to use the Qt5 version of qtpaths
- sed -i 's:qtpaths:qtpaths-qt5:' startkde/startkde.cmake
-}
-
-build() {
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DLIB_INSTALL_DIR=lib \
- -DLIBEXEC_INSTALL_DIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package_plasma-workspace() {
- optdepends=('plasma-workspace-wallpapers: additional wallpapers'
- 'gpsd: GPS support for geolocation')
- conflicts=('kdebase-workspace')
-
- cd build
- make DESTDIR="${pkgdir}" install
-
- install -D "${srcdir}"/kde.pam \
- "${pkgdir}"/etc/pam.d/kde
-
- # Remove conflicts with drkonqi
- rm "${pkgdir}"/usr/lib/drkonqi
- rm -r "${pkgdir}"/usr/share/drkonqi
- rm "${pkgdir}"/usr/lib/libKF5XmlRpcClientPrivate.*
-}
-
-package_drkonqi() {
- pkgdesc='KDE crash handler'
- depends=('kdewebkit')
-
- cd build/drkonqi
- make DESTDIR="${pkgdir}" install
-}
Copied: plasma-workspace/repos/extra-x86_64/PKGBUILD (from rev 234946, plasma-workspace/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-03-25 21:11:32 UTC (rev 234947)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Antonio Rojas
+# Contributor: Alexey D. <lq07829icatm at rambler.ru>
+
+pkgbase=plasma-workspace
+pkgname=('plasma-workspace' 'drkonqi')
+pkgver=5.2.2
+pkgrel=2
+pkgdesc='KDE Plasma Workspace'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
+license=('LGPL')
+# note on libxdamage:
+# not detected by namcap because libgl depends on it
+# but nvidia providing libgl does not depend on libxdamage
+depends=('knewstuff' 'kjsembed' 'knotifyconfig' 'libxdamage' 'kwayland'
+ 'libksysguard' 'libkscreen-frameworks' 'ktexteditor' 'libqalculate'
+ 'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
+ 'xorg-xmessage' 'xorg-xprop' 'milou')
+makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo-frameworks'
+ 'krunner')
+groups=('plasma')
+source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"
+ 'kde.pam' 'lockscreen-focus.patch')
+md5sums=('93b4b7e187035635982d3099ba2c8d79'
+ '929b182dec8a096206ad493477c09d2c'
+ '0dcc042d4188b2f664f9daf4a5923778')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgbase}-${pkgver}
+ # be sure to use the Qt5 version of qtpaths
+ sed -i 's:qtpaths:qtpaths-qt5:' startkde/startkde.cmake
+
+# fix password field not getting focus in lock screen (upstream bug #344823)
+ patch -p1 -i "$srcdir"/lockscreen-focus.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DLIB_INSTALL_DIR=lib \
+ -DLIBEXEC_INSTALL_DIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package_plasma-workspace() {
+ optdepends=('plasma-workspace-wallpapers: additional wallpapers'
+ 'gpsd: GPS support for geolocation')
+ conflicts=('kdebase-workspace')
+
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+ install -D "${srcdir}"/kde.pam \
+ "${pkgdir}"/etc/pam.d/kde
+
+ # Remove conflicts with drkonqi
+ rm "${pkgdir}"/usr/lib/drkonqi
+ rm -r "${pkgdir}"/usr/share/drkonqi
+ rm "${pkgdir}"/usr/lib/libKF5XmlRpcClientPrivate.*
+}
+
+package_drkonqi() {
+ pkgdesc='KDE crash handler'
+ depends=('kdewebkit')
+
+ cd build/drkonqi
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/kde.pam
===================================================================
--- extra-x86_64/kde.pam 2015-03-25 21:11:07 UTC (rev 234946)
+++ extra-x86_64/kde.pam 2015-03-25 21:11:32 UTC (rev 234947)
@@ -1,6 +0,0 @@
-#%PAM-1.0
-
-auth include system-login
-account include system-login
-password include system-login
-session include system-login
Copied: plasma-workspace/repos/extra-x86_64/kde.pam (from rev 234946, plasma-workspace/trunk/kde.pam)
===================================================================
--- extra-x86_64/kde.pam (rev 0)
+++ extra-x86_64/kde.pam 2015-03-25 21:11:32 UTC (rev 234947)
@@ -0,0 +1,6 @@
+#%PAM-1.0
+
+auth include system-login
+account include system-login
+password include system-login
+session include system-login
Copied: plasma-workspace/repos/extra-x86_64/lockscreen-focus.patch (from rev 234946, plasma-workspace/trunk/lockscreen-focus.patch)
===================================================================
--- extra-x86_64/lockscreen-focus.patch (rev 0)
+++ extra-x86_64/lockscreen-focus.patch 2015-03-25 21:11:32 UTC (rev 234947)
@@ -0,0 +1,32 @@
+From: Bhushan Shah <bhush94 at gmail.com>
+Date: Wed, 25 Mar 2015 15:55:22 +0000
+Subject: Workaround the lockscreen password field focus issue
+X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=24f24e03793c8214a5d1f3414a5aeb48eccef4f4
+---
+Workaround the lockscreen password field focus issue
+
+Fixes bug 344823
+Backport of a476e1b6bf6f683bd74000bb30076868c9f92371 in 5.2
+
+CCMAIL: release-team at kde.org
+---
+
+
+--- a/lookandfeel/contents/lockscreen/LockScreen.qml
++++ b/lookandfeel/contents/lockscreen/LockScreen.qml
+@@ -156,6 +156,14 @@
+ enabled: !authenticator.graceLocked
+ onAccepted: unlockFunction()
+ focus: true
++ //HACK: Similar hack is needed in sddm loginscreen
++ //TODO: investigate
++ Timer {
++ interval: 200
++ running: true
++ repeat: false
++ onTriggered: passwordInput.forceActiveFocus()
++ }
+ visible: block.mainItem.model.get(block.mainItem.selectedIndex)["showPassword"]
+ onVisibleChanged: {
+ if (visible) {
+
More information about the arch-commits
mailing list