[arch-commits] Commit in kdebase-workspace (3 files)

[Andrea Scarpino]

    Date: Sunday, May 23, 2010 @ 20:50:32
  Author: andrea
Revision: 80932

first set of KDE 4.5 tarballs (4.4.80)

Added:
  kdebase-workspace/kde-unstable/
Modified:
  kdebase-workspace/kde-unstable/PKGBUILD
Deleted:
  kdebase-workspace/kde-unstable/screensaver-sleep.patch

-------------------------+
 PKGBUILD                |   25 ++++++++++++-------------
 screensaver-sleep.patch |   12 ------------
 2 files changed, 12 insertions(+), 25 deletions(-)

Modified: kde-unstable/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2010-05-20 13:36:36 UTC (rev 80615)
+++ kde-unstable/PKGBUILD	2010-05-24 00:50:32 UTC (rev 80932)
@@ -1,9 +1,10 @@
 # $Id: PKGBUILD 59826 2009-11-28 01:40:21Z andrea $
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdebase-workspace
-pkgver=4.4.3
-pkgrel=2
+pkgver=4.4.80
+pkgrel=1
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -13,10 +14,10 @@
 # 	not detected by namcap because libgl depends on it
 #	but nvidia providing libgl does not depend on libxdamage
 depends=('polkit-kde' 'kdepimlibs' 'kdepim-runtime' 'kdebase-runtime' 'qimageblitz'
-         'libxxf86misc' 'libxcomposite' 'libxss' 'lm_sensors' 'libxklavier' 'libxft'
-         'libxdamage' 'xorg-utils' 'libxrandr')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' 'kdebindings-python'
-             'kdebindings-ruby')
+         'libxxf86misc' 'libxcomposite' 'lm_sensors' 'libxklavier' 'libxdamage'
+	 'xorg-utils' 'libxrandr' 'libraw1394' 'libqalculate')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' 'kdebindings-python')
+#             'kdebindings-ruby')
 replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde')
 conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde')
 install='kdebase-workspace.install'
@@ -24,25 +25,23 @@
         'etc/pam.d/kde'
         'etc/pam.d/kde-np'
         'etc/pam.d/kscreensaver')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch' 'screensaver-sleep.patch')
-sha1sums=('efd427dfe8b7beebdfe162006689871c61991336'
+        'fixpath.patch' 'terminate-server.patch')
+sha1sums=('a31fcf38d6779139f01cab3116940789078d62fd'
           '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
           'f7b38af38549242a240f1a90ab9964ca8a366129'
           '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd676932e89f201d1f381615651761af1badb88be')
+          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 	patch -p0 -i ${srcdir}/kdm-zsh-profile.patch || return 1
 	patch -p0 -i ${srcdir}/fixpath.patch || return 1
 	patch -p0 -i ${srcdir}/terminate-server.patch || return 1
-        patch -p1 -i ${srcdir}/screensaver-sleep.patch || return 1 # FS#19426      
 
 	cd ${srcdir}
 	mkdir build

Deleted: kde-unstable/screensaver-sleep.patch
===================================================================
--- trunk/screensaver-sleep.patch	2010-05-20 13:36:36 UTC (rev 80615)
+++ kde-unstable/screensaver-sleep.patch	2010-05-24 00:50:32 UTC (rev 80932)
@@ -1,12 +0,0 @@
---- kdebase-workspace-4.4.3/powerdevil/daemon/PowerDevilDaemon.cpp.orig	2010-04-29 21:54:40.000000000 +0200
-+++ kdebase-workspace-4.4.3/powerdevil/daemon/PowerDevilDaemon.cpp	2010-05-09 17:06:54.000000000 +0200
-@@ -571,7 +571,7 @@
- 
- void PowerDevilDaemon::buttonPressed(int but)
- {
--    if (!checkIfCurrentSessionActive() || d->screenSaverIface->GetActive()) {
-+    if (!checkIfCurrentSessionActive()) {
-         return;
-     }
- 
-