diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-06 10:25:36 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-06 10:25:36 +0200 |
| commit | 5f875caf9e31730faff78cfa1fc99c30717a924d (patch) | |
| tree | 64da821f3be8e6f7a61a55ae2aa3d7de5ad33e89 /extra/kdesdk | |
| parent | a791587b609550b73cd867a642338769dc7c117d (diff) | |
| parent | d9c1fc1bcca8fd5cd3566fc6b183fe23065778bc (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/rsyslog/PKGBUILD
extra/boost/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdegames/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdepim/PKGBUILD
libre/kdenetwork-libre/PKGBUILD
multilib/lib32-expat/PKGBUILD
multilib/lib32-libldap/PKGBUILD
multilib/lib32-openal/PKGBUILD
multilib/lib32-p11-kit/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
testing/pcmciautils/PKGBUILD
testing/systemd/PKGBUILD
testing/util-linux/PKGBUILD
Diffstat (limited to 'extra/kdesdk')
| -rw-r--r-- | extra/kdesdk/PKGBUILD | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index 49474efb0..43f727a52 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153595 2012-03-16 11:45:06Z andrea $ +# $Id: PKGBUILD 155653 2012-04-04 14:17:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -22,7 +22,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-scripts' 'kdesdk-strigi-analyzer' 'kdesdk-umbrello') -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -32,7 +32,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' 'kdebase-lib') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'fix-python2-path.patch') -sha1sums=('5104445024047ae01099e7baa8e5b47a63b76198' +sha1sums=('8c02ce158f42fa80b5f8536d885e3e232614bc7f' '923cabd7a877cf9a68efeb24fbf3d5827e1d949e') build() { @@ -104,7 +104,7 @@ package_kdesdk-kcachegrind() { package_kdesdk-kdeaccounts-plugin() { pkgdesc='KDE Repository Accounts' - depends=('kdepim-runtime') + depends=('kdebase-runtime' 'kdepimlibs') cd $srcdir/build/kdeaccounts-plugin make DESTDIR=$pkgdir install } @@ -236,7 +236,9 @@ package_kdesdk-scripts() { # Fix python 2 path sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/bin/{{kde-systemsettings-tree,kdelnk2desktop,zonetab2pot}.py,kde_generate_export_header} + "${pkgdir}"/usr/bin/kde-systemsettings-tree.py + sed -i 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \ + "${pkgdir}"/usr/bin/{{kdelnk2desktop,zonetab2pot}.py,kde_generate_export_header} } package_kdesdk-strigi-analyzer() { |