[arch-commits] Commit in strigi/trunk (PKGBUILD gcc47.patch)

[Andrea Scarpino]

    Date: Monday, July 30, 2012 @ 03:24:51
  Author: andrea
Revision: 164312

upgpkg: strigi 0.7.7-2

exiv rebuild

Added:
  strigi/trunk/gcc47.patch
Modified:
  strigi/trunk/PKGBUILD

-------------+
 PKGBUILD    |   25 +++++++++++++++++--------
 gcc47.patch |   22 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-30 05:37:44 UTC (rev 164311)
+++ PKGBUILD	2012-07-30 07:24:51 UTC (rev 164312)
@@ -4,7 +4,7 @@
 
 pkgname=strigi
 pkgver=0.7.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast crawling desktop search engine with Qt4 GUI"
 arch=('i686' 'x86_64')
 url='http://strigi.sourceforge.net/'
@@ -14,11 +14,16 @@
 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 @@
 }
 
 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
 }

Added: gcc47.patch
===================================================================
--- gcc47.patch	                        (rev 0)
+++ gcc47.patch	2012-07-30 07:24:51 UTC (rev 164312)
@@ -0,0 +1,22 @@
+From: Rex Dieter <rdieter at 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;
+ 
+