diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-18 10:54:09 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-18 10:54:09 +0200 |
commit | d4a02502a9a74a21bc0ca0a0fa9813efe0fe70f4 (patch) | |
tree | 3e5dfb37d192bd42d9218934800e1f5aeeb0990e /community/recoll | |
parent | 16d51ac66fa18675d49ef64f4a3c1dbe53b5711a (diff) | |
parent | 637c1cfdcd258a870ad5367cbf47a8a2799039c7 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/shotwell/PKGBUILD
community/recoll/PKGBUILD
cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD
cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD
cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.12.2-ignore-origin-of-privileged-program.patch
cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-__i686.patch
cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD
cross/mips64el-unknown-linux-gnu-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
cross/mips64el-unknown-linux-gnu-glibc/glibc-__i686.patch
staging/nx-common/PKGBUILD
staging/nx/PKGBUILD
testing/devhelp/PKGBUILD
testing/empathy/PKGBUILD
testing/evolution-data-server/PKGBUILD
testing/evolution-ews/PKGBUILD
testing/evolution-exchange/PKGBUILD
testing/evolution/PKGBUILD
testing/folks/PKGBUILD
testing/gcr/PKGBUILD
testing/gnome-control-center/PKGBUILD
testing/gnome-desktop/PKGBUILD
testing/gnome-documents/PKGBUILD
testing/gnome-keyring/PKGBUILD
testing/gnome-panel/PKGBUILD
testing/gnome-session/PKGBUILD
testing/gnome-settings-daemon/PKGBUILD
testing/gnome-terminal/PKGBUILD
testing/gnome-themes-standard/PKGBUILD
testing/gthumb/PKGBUILD
testing/gtkhtml4/PKGBUILD
testing/gtksourceview3/PKGBUILD
testing/gvfs/PKGBUILD
testing/libgnome-keyring/PKGBUILD
testing/librsvg/PKGBUILD
testing/librsvg/librsvg.install
testing/mousetweaks/PKGBUILD
testing/seahorse/PKGBUILD
testing/sushi/PKGBUILD
testing/totem-plparser/PKGBUILD
testing/totem/PKGBUILD
testing/vte3/PKGBUILD
Diffstat (limited to 'community/recoll')
-rw-r--r-- | community/recoll/PKGBUILD | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD index 4a05001dd..d029f6dbe 100644 --- a/community/recoll/PKGBUILD +++ b/community/recoll/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67278 2012-03-06 10:44:14Z arodseth $ +# $Id: PKGBUILD 69444 2012-04-16 11:14:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,13 +6,14 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=recoll -pkgver=1.16.2 -pkgrel=2 +pkgver=1.17.1 +pkgrel=1 pkgdesc="Full text search tool based on Xapian backend" -arch=('x86_64' 'i686' 'mips64el') +arch=('i686' 'x86_64' 'mips64el') url="http://www.lesbonscomptes.com/recoll/" license=('GPL') -depends=('xapian-core>=1.0.15-1' 'qt' 'openssl' 'hicolor-icon-theme') +depends=('xapian-core>=1.0.15-1' 'qt' 'openssl' 'hicolor-icon-theme' 'qtwebkit') +makedepends=('python2') optdepends=('libxslt: for XML based formats (fb2,etc)' 'unzip: for the OpenOffice.org documents' 'xpdf: for pdf' @@ -30,16 +31,21 @@ optdepends=('libxslt: for XML based formats (fb2,etc)' 'aspell-en: English stemming support') install=recoll.install source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-$pkgver.tar.gz") -sha256sums=('f0f29dff2d82ef8541c51963870f31daf28472f3c8822c81c17c346769b77355') +md5sums=('10726fdb6c35898f6349d475fc4097c8') build() { cd "$srcdir/$pkgname-$pkgver" msg2 "Python2 fix" - for file in filters/{rclchm,rclexecm.py,rclics,rclpython,rclzip,rclaudio,rclinfo,rclkar,rcllatinclass.py,rclwar,rclrar} doc/user/usermanual.html; do + export PYTHON=/usr/bin/python2 + for file in filters/{rclchm,rclexecm.py,rclics,rclpython,rclzip,rclaudio,rclinfo,rclkar,rcllatinclass.py,rclwar,rclrar} \ + doc/user/usermanual.html; do sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' "$file" done - sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' desktop/hotrecoll.py + sed -i 's_python$_python2_' desktop/hotrecoll.py + sed -i 's_python _python2 _' python/recoll/Makefile recollinstall* + + sed -i '1,1i#include <unistd.h>' utils/rclionice.cpp ./configure \ --prefix=/usr \ |