[Frugalware-git] frugalware-current: strigi-0.7.7-2-x86_64

Daniel Exner dex at dragonslave.de
Sat Apr 14 21:17:45 CEST 2012


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bedb760ec9bf3a965bf5cd91c86ac1cee80645be

commit bedb760ec9bf3a965bf5cd91c86ac1cee80645be
Author: Daniel Exner <dex at dragonslave.de>
Date:   Sat Apr 14 21:17:37 2012 +0200

strigi-0.7.7-2-x86_64

* release bump
+ added patch for build using GCC 4.7
* cleaned up dependencies
* try to cleanup up2date

diff --git a/source/apps/strigi/FrugalBuild b/source/apps/strigi/FrugalBuild
index dee2d38..ec25d55 100644
--- a/source/apps/strigi/FrugalBuild
+++ b/source/apps/strigi/FrugalBuild
@@ -3,17 +3,17 @@

pkgname=strigi
pkgver=0.7.7
-pkgrel=1
+pkgrel=2
pkgdesc="An advanced, desktop independent search daemon"
if [ "$CARCH" != "ppc" ]; then
Finclude java
fi
-depends=('bzip2' 'dbus' 'clucene>=0.9.21b' 'exiv2>=0.22' 'gamin' 'libxml2>=2.7.8' \
-	'libboost')
+depends=('bzip2' 'dbus-x11' 'exiv2>=0.22' 'gamin' 'libxml2>=2.7.8' 'libboost' 'ffmpeg')
makedepends=('ca-certificates' 'boost')
groups=('apps')
archs=('i686' 'x86_64')
-_F_cmake_confopts="-DENABLE_INOTIFY:BOOL=ON -DENABLE_FAM:BOOL=ON -DLIB_DESTINATION=lib"
+_F_cmake_confopts="-DENABLE_INOTIFY:BOOL=ON -DENABLE_FAM:BOOL=ON -DLIB_DESTINATION=lib \
+	-DENABLE_CLUCENE=OFF -DENABLE_CLUCENE_NG=OFF"
options=('scriptlet')
_F_scm_type="git"
_F_scm_url="git://anongit.kde.org/strigi"
@@ -22,7 +22,7 @@ _F_scm_tag="v${pkgver}"
Finclude cmake scm
url="http://www.vandenoever.info/software/strigi/"

-up2date="lynx -dump https://projects.kde.org/projects/kdesupport/strigi/strigi/repository/revisions/master/raw/ChangeLog | head -n 1 | cut -d ' ' -f 1"
+up2date="lynx -dump http://projects.kde.org/projects/kdesupport/strigi/strigi/repository/revisions/master/raw/ChangeLog | head -n 1 | cut -d ' ' -f 1"
## TODO : Add missing optional depends

subpkgs=("${subpkgs[@]}" "libstrigiqtdbusclient")
@@ -41,6 +41,8 @@ subrodepends=("${subrodepends[@]}" "libstrigiqtdbusclient>=$pkgver strigi>=$pkgv
subgroups=("${subgroups[@]}" 'xapps-extra')
subarchs=("${subarchs[@]}" 'i686 x86_64')

+source=("gcc4.7.patch")
+
build()
{
Funpack_scm
diff --git a/source/apps/strigi/gcc4.7.patch b/source/apps/strigi/gcc4.7.patch
new file mode 100644
index 0000000..e16178e
--- /dev/null
+++ b/source/apps/strigi/gcc4.7.patch
@@ -0,0 +1,20 @@
+commit a8e97f672325557b3fbc84b987299350ec5ac10b
+Author: Rex Dieter <rdieter at fedoraproject.org>
+Date:   Mon Jan 9 11:13:25 2012 -0600
+
+    gcc47 fix, unistd.h header required unconditionally for 'sleep'
+
+diff --git a/bin/daemon/eventlistener/eventlistenerqueue.cpp b/bin/daemon/eventlistener/eventlistenerqueue.cpp
+index 9fcdcb1..1e97599 100644
+--- a/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
++++ b/strigidaemon/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;
+


More information about the Frugalware-git mailing list