diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-06 09:47:04 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-06 09:47:04 +0200 |
| commit | 5b1689a2cf3def5dea6a56f577930e7c6df4f003 (patch) | |
| tree | 8ef875217e9d87666706e7f88f579cc579aaa63e /extra/kdepim | |
| parent | 2c0066a33742d4879adc9eeab45e04fba7bafbcb (diff) | |
| parent | fd8249d016683ade99a23251d6ffdf5d5a3e76a4 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/rcs/PKGBUILD
libre/cups-filters-libre/PKGBUILD
Diffstat (limited to 'extra/kdepim')
| -rw-r--r-- | extra/kdepim/PKGBUILD | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index 9ae84a8cd..7eff22114 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179449 2013-03-05 15:46:04Z andrea $ +# $Id: PKGBUILD 181992 2013-04-05 08:57:03Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-ktnef' 'kdepim-libkdepim') -pkgver=4.10.1 +pkgver=4.10.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' @@ -28,10 +28,14 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdepim') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent' 'nepomuk-widgets') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('9d1102ec9ea7ee7b8ddc70011231f173ceb2e5c1') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" + "kleopatra-build-fix.patch::http://bugsfiles.kde.org/attachment.cgi?id=78592") +sha1sums=('61b74cb3bf541040e09252d4dcfaea8a876a2859' + '61a7e31e7daee3358c442d3ac5f74171b45ae2c9') build() { + patch -Np1 -d ${pkgbase}-${pkgver} < ${srcdir}/kleopatra-build-fix.patch + mkdir build cd build cmake ../${pkgbase}-${pkgver} \ |