diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-08 09:02:16 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-08 09:02:16 -0300 |
commit | dec82423b45179c362a4727cc3d63fb2349af369 (patch) | |
tree | 552f0832ffe5dab6305382ea0c0e4a42da17063a /extra/strigi | |
parent | a0f85906119bcb8e7269dee701076946b3ec45ea (diff) | |
parent | ef815a5d80eecd4ba0679a376386741c374e0d1b (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dzen2/PKGBUILD
community/qtcurve-kde4/PKGBUILD
core/openldap/PKGBUILD
extra/geeqie/PKGBUILD
extra/kactivities/PKGBUILD
extra/kdebase-runtime/PKGBUILD
extra/kdebase-workspace/PKGBUILD
extra/kdebindings-korundum/PKGBUILD
extra/kdebindings-kross/PKGBUILD
extra/kdebindings-perlkde/PKGBUILD
extra/kdebindings-perlqt/PKGBUILD
extra/kdebindings-python/PKGBUILD
extra/kdebindings-qtruby/PKGBUILD
extra/kdebindings-qyoto/PKGBUILD
extra/kdebindings-smokegen/PKGBUILD
extra/kdebindings-smokekde/PKGBUILD
extra/kdebindings-smokeqt/PKGBUILD
extra/kdeedu-analitza/PKGBUILD
extra/kdegraphics-ksaneplugin/PKGBUILD
extra/kdegraphics-mobipocket/PKGBUILD
extra/kdegraphics-strigi-analyzer/PKGBUILD
extra/kdegraphics-svgpart/PKGBUILD
extra/kdegraphics-thumbnailers/PKGBUILD
extra/kdepim-runtime/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdepimlibs/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/kdeutils-sweeper/PKGBUILD
extra/libkdcraw/PKGBUILD
extra/libkdeedu/PKGBUILD
extra/libkexiv2/PKGBUILD
extra/libkipi/PKGBUILD
extra/libksane/PKGBUILD
extra/moc/PKGBUILD
extra/strigi/PKGBUILD
extra/vice/PKGBUILD
Diffstat (limited to 'extra/strigi')
-rw-r--r-- | extra/strigi/PKGBUILD | 29 | ||||
-rw-r--r-- | extra/strigi/gcc47.patch | 22 |
2 files changed, 41 insertions, 10 deletions
diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD index e6f83fd19..f4ad2a127 100644 --- a/extra/strigi/PKGBUILD +++ b/extra/strigi/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 144965 2011-12-12 09:11:00Z andrea $ +# $Id: PKGBUILD 164838 2012-08-06 23:07:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=strigi pkgver=0.7.7 -pkgrel=1 +pkgrel=2 pkgdesc="Fast crawling desktop search engine with Qt4 GUI" arch=('i686' 'x86_64' 'mips64el') -url="http://www.vandenoever.info/software/strigi/" +url='http://strigi.sourceforge.net/' license=('GPL2') depends=('exiv2' 'libxml2' 'boost-libs') makedepends=('qt' 'cmake' 'pkg-config' 'boost') optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file' 'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK') #source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('ca0a0fd5c2b99879f6330837aeede996') +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'gcc47.patch') +md5sums=('ca0a0fd5c2b99879f6330837aeede996' + '1acb9b31a4859dc427fc4d387fd8aa2f') build() { - cd "${srcdir}" + pushd ${pkgname}-${pkgver}/strigidaemon + patch -p1 -i "${srcdir}"/gcc47.patch + popd + mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -34,15 +39,19 @@ build() { } package() { - cd "${srcdir}/build/libstreams" + pushd build/libstreams make DESTDIR="${pkgdir}" install + popd - cd "${srcdir}/build/libstreamanalyzer" + pushd build/libstreamanalyzer make DESTDIR="${pkgdir}" install + popd - cd "${srcdir}/build/strigiclient/lib/searchclient/qtdbus" + pushd build/strigiclient/lib/searchclient/qtdbus make DESTDIR="${pkgdir}" install + popd - cd "${srcdir}/build/strigiutils" + pushd build/strigiutils make DESTDIR="${pkgdir}" install + popd } diff --git a/extra/strigi/gcc47.patch b/extra/strigi/gcc47.patch new file mode 100644 index 000000000..d99582563 --- /dev/null +++ b/extra/strigi/gcc47.patch @@ -0,0 +1,22 @@ +From: Rex Dieter <rdieter@fedoraproject.org> +Date: Mon, 09 Jan 2012 17:13:25 +0000 +Subject: gcc47 fix, unistd.h header required unconditionally for 'sleep' +X-Git-Url: http://quickgit.kde.org/?p=strigidaemon.git&a=commitdiff&h=a8e97f672325557b3fbc84b987299350ec5ac10b +--- +gcc47 fix, unistd.h header required unconditionally for 'sleep' +--- + + +--- a/bin/daemon/eventlistener/eventlistenerqueue.cpp ++++ b/bin/daemon/eventlistener/eventlistenerqueue.cpp +@@ -27,9 +27,7 @@ + #include <iostream> + #include <stdio.h> + +-#if defined(__SUNPRO_CC) + #include <unistd.h> +-#endif + + using namespace std; + + |