git » plasma-workspace.git » commit 9d69672

Plasma 5.3

author Antonio Rojas
2015-04-25 17:06:41 UTC
committer Antonio Rojas
2015-04-25 17:06:41 UTC
parent a58ff30065dfee7b13b4247cb364d3b52ba5bd9e

Plasma 5.3

PKGBUILD +11 -16
lockscreen-focus.patch +0 -32

diff --git a/PKGBUILD b/PKGBUILD
index 2095a37..af40abe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 
 pkgbase=plasma-workspace
 pkgname=('plasma-workspace' 'drkonqi')
-pkgver=5.2.2
-pkgrel=2
+pkgver=5.3.0
+pkgrel=1
 pkgdesc='KDE Plasma Workspace'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
@@ -15,17 +15,16 @@ license=('LGPL')
 # 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'
+         'libksysguard' 'libkscreen' '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')
+         'xorg-xmessage' 'xorg-xprop' 'milou' 'breeze')
+makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo'
+             'krunner' 'kxmlrpcclient' 'networkmanager-qt')
 groups=('plasma')
 source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"
-        'kde.pam' 'lockscreen-focus.patch')
-md5sums=('93b4b7e187035635982d3099ba2c8d79'
-         '929b182dec8a096206ad493477c09d2c'
-         '0dcc042d4188b2f664f9daf4a5923778')
+        'kde.pam')
+md5sums=('4085a9bdd87706beeccfcc7dd09d5b85'
+         '929b182dec8a096206ad493477c09d2c')
 
 prepare() {
   mkdir build
@@ -33,9 +32,6 @@ prepare() {
   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() {
@@ -52,7 +48,7 @@ build() {
 
 package_plasma-workspace() {
   optdepends=('plasma-workspace-wallpapers: additional wallpapers'
-              'gpsd: GPS support for geolocation')
+              'gpsd: GPS based geolocation' 'networkmanager-qt: IP based geolocation')
   conflicts=('kdebase-workspace')
 
   cd build
@@ -64,12 +60,11 @@ package_plasma-workspace() {
   # 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')
+  depends=('kdewebkit' 'kxmlrpcclient')
 
   cd build/drkonqi
   make DESTDIR="${pkgdir}" install
diff --git a/lockscreen-focus.patch b/lockscreen-focus.patch
deleted file mode 100644
index e1ac7ba..0000000
--- a/lockscreen-focus.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Bhushan Shah <bhush94@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@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) {
-