diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-09-03 16:10:12 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-09-03 16:10:12 -0300 |
commit | 037bcb846a6662420bd0f5d1edaad58bda4c86a7 (patch) | |
tree | 82494884d013c7b2cc9cd5df16c54cae0712d472 /community/shotwell/PKGBUILD | |
parent | 830afd54d0d990fdb982292bed4c97f577dc195d (diff) | |
parent | 3aa73e2018f321c9ccff8eca801b1c2fa9f18fa8 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/darkhttpd/PKGBUILD
community/gnome-panel/PKGBUILD
community/gpicview/PKGBUILD
community/iftop/PKGBUILD
community/lazarus/PKGBUILD
community/netsurf/PKGBUILD
community/polkit-gnome/PKGBUILD
community/texvc/PKGBUILD
community/unbound/PKGBUILD
community/xfmedia/PKGBUILD
core/glibc/PKGBUILD
extra/arora/PKGBUILD
extra/cairo/PKGBUILD
extra/graphviz/PKGBUILD
extra/libmng/PKGBUILD
extra/mesa/PKGBUILD
extra/nx/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/sqlite/PKGBUILD
libre/midori-libre/PKGBUILD
~fauno/distccd-zeroconf/PKGBUILD
~fauno/kyotocabinet/PKGBUILD
~fauno/kyototycoon/PKGBUILD
Diffstat (limited to 'community/shotwell/PKGBUILD')
-rw-r--r-- | community/shotwell/PKGBUILD | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 44dac8510..7d8805616 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92942 2013-06-19 21:09:47Z bpiotrowski $ +# $Id: PKGBUILD 96421 2013-08-28 11:35:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell pkgver=0.14.1 -pkgrel=4 +pkgrel=5 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64' 'mips64el') url="http://yorba.org/shotwell/" @@ -17,15 +17,18 @@ makedepends=('intltool' 'vala>=0.17.2' 'libunique3') install=shotwell.install source=("http://yorba.org/download/shotwell/stable/shotwell-$pkgver.tar.xz" "no-libexec.patch" - "libraw-0.15.2.patch") + "libraw-0.15.2.patch" + "FS35899.patch::http://redmine.yorba.org/projects/shotwell/repository/revisions/4f635ba4236dbbb8cb3f8b7bdd201432961fb283/diff/src/AppDirs.vala?format=diff") md5sums=('bb5783f9265e1ce2d4c9f354987c3ab1' 'b4124e022c98b4382530e6fbcef965e2' - '3ad21364f82229122f48452f5c74dfde') + '3ad21364f82229122f48452f5c74dfde' + '9f9690f4b860f52ffd44f8ab6d4fd3b5') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 <$srcdir/no-libexec.patch patch -Rp1 <$srcdir/libraw-0.15.2.patch + patch -p1 <$srcdir/FS35899.patch } build() { |