diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-01 09:26:02 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-01 09:26:02 -0300 |
| commit | 0a3fcfa45dd6a820799b111a8bac0830faf459e5 (patch) | |
| tree | ee0d56252a19caafe61e05716e1a0daf49402a3b /extra/kdebase-workspace/PKGBUILD | |
| parent | cf1a5af5ed7c29ec510e4606473103cffe96c245 (diff) | |
| parent | 83a318800db22408628e60c9e1730578efcfee37 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/webfs/PKGBUILD
extra/gconf-editor/PKGBUILD
extra/gnutls/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/transmission/PKGBUILD
Diffstat (limited to 'extra/kdebase-workspace/PKGBUILD')
| -rw-r--r-- | extra/kdebase-workspace/PKGBUILD | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index a00e293a4..e45e4f56b 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 169946 2012-10-30 22:46:25Z heftig $ +# $Id: PKGBUILD 170060 2012-10-31 10:38:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.9.2 -pkgrel=5 +pkgrel=6 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-workspace' @@ -26,18 +26,22 @@ backup=('usr/share/config/kdm/kdmrc') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate' 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' - 'logind-support.patch') + 'logind-support.patch' + 'logind-support2.patch' + 'fix-mesa9.patch') sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' '660eae40a707d2711d8d7f32a93214865506b795' - 'b7980f2e199963caf8e92b499042d244ece2fca0' + '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b' 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae' 'c079ebd157c836ba996190f0d2bcea1a7828d02c' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' 'd509dac592bd8b310df27991b208c95b6d907514' - 'ccde71c42e19feaf40d3bd76e7396a0cb6df012f') + 'ccde71c42e19feaf40d3bd76e7396a0cb6df012f' + '8f27ebd4bcc2f833a73d453837f4522b2be0aa1f' + 'c57583555bf8acd213295316512b92b6dc07703e') build() { cd ${_pkgname}-${pkgver} @@ -51,6 +55,9 @@ build() { patch -p0 -i "${srcdir}"/terminate-server.patch # KDEBUG#307412 (fixed upstream) patch -p1 -i "${srcdir}"/logind-support.patch + patch -p1 -i "${srcdir}"/logind-support2.patch + # KDEBUG#308385 (fixed upstream) + patch -p1 -i "${srcdir}"/fix-mesa9.patch cd ../ |