summaryrefslogtreecommitdiff
path: root/extra/kdebase-workspace
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2011-12-10 10:00:34 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2011-12-10 10:00:34 +0100
commitfbe815aa83090984779a8b380cbfc1247353d98b (patch)
tree2eb92ffe4f5cb6c6c13f065f3122d9f18264b6c6 /extra/kdebase-workspace
parentd638a96c43b3c4fb9b517e8a66a4e8b1fa999833 (diff)
parentd22b68a6758c4f29a8e50a7be467374a53c68415 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/qtfm/PKGBUILD core/binutils/PKGBUILD core/fakeroot/PKGBUILD core/gcc/PKGBUILD core/linux-api-headers/PKGBUILD extra/audacious/PKGBUILD extra/kdelibs/PKGBUILD extra/kdemultimedia/PKGBUILD extra/llvm/PKGBUILD extra/maxima/PKGBUILD extra/sbcl/PKGBUILD extra/vigra/PKGBUILD kde-unstable/kdebase-workspace/PKGBUILD multilib/binutils-multilib/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-dbus-core/PKGBUILD multilib/lib32-glibc/PKGBUILD multilib/lib32-libgcrypt/PKGBUILD multilib/lib32-libgpg-error/PKGBUILD multilib/lib32-sqlite3/PKGBUILD multilib/lib32-tdb/PKGBUILD multilib/lib32-xcb-util/PKGBUILD
Diffstat (limited to 'extra/kdebase-workspace')
-rw-r--r--extra/kdebase-workspace/PKGBUILD12
1 files changed, 5 insertions, 7 deletions
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 57f02f9bd..a186ea25d 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 141771 2011-11-02 18:12:45Z andrea $
+# $Id: PKGBUILD 144857 2011-12-08 16:10:09Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdebase-workspace
_pkgname=kde-workspace
-pkgver=4.7.3
-pkgrel=3
+pkgver=4.7.4
+pkgrel=2
pkgdesc="KDE Base Workspace"
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
@@ -32,10 +32,9 @@ backup=('usr/share/config/kdm/kdmrc'
'etc/pam.d/kscreensaver')
options=('emptydirs')
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
- 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
+ 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
-sha1sums=('f3ed24e3e70671033718a5139cb61d0d7e2e709e'
- '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
+sha1sums=('b7810ba13f6f2a1c4783b153ad9349a1dd27b495'
'5db3a245201bd4a50e65aa2ef583cf5490e4f646'
'f7b38af38549242a240f1a90ab9964ca8a366129'
'603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
@@ -46,7 +45,6 @@ sha1sums=('f3ed24e3e70671033718a5139cb61d0d7e2e709e'
build() {
cd "${srcdir}"/${_pkgname}-${pkgver}
- patch -p0 -i "${srcdir}"/kdm-zsh-profile.patch
patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
patch -p0 -i "${srcdir}"/fixpath.patch
patch -p0 -i "${srcdir}"/terminate-server.patch