[gentoo-commits] proj/kde:master commit in: app-misc/strigi/, app-misc/strigi/files/

[Michael Palimaka]

commit:     962df890adcbe3e3a91a4d11d7579d32834337da
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 30 13:34:58 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Oct 30 13:34:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=962df890

[app-misc/strigi] Try another potential fix for bug #427050.

Package-Manager: portage-2.1.11.31

---
 app-misc/strigi/files/strigi-fix-sleep.patch |   11 -----------
 app-misc/strigi/strigi-9999.ebuild           |    7 +------
 2 files changed, 1 insertions(+), 17 deletions(-)

diff --git a/app-misc/strigi/files/strigi-fix-sleep.patch b/app-misc/strigi/files/strigi-fix-sleep.patch
deleted file mode 100644
index ab690c0..0000000
--- a/app-misc/strigi/files/strigi-fix-sleep.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- eventlistenerqueue2.cpp     2012-10-09 11:53:24.662572336 +0800
-+++ eventlistenerqueue.cpp      2012-10-09 11:53:41.269242216 +0800
-@@ -26,6 +26,7 @@
- #include <algorithm>
- #include <iostream>
- #include <stdio.h>
-+#include <unistd.h>
- 
- #if defined(__SUNPRO_CC)
- #include <unistd.h>
-

diff --git a/app-misc/strigi/strigi-9999.ebuild b/app-misc/strigi/strigi-9999.ebuild
index 3aa0780..14f1862 100644
--- a/app-misc/strigi/strigi-9999.ebuild
+++ b/app-misc/strigi/strigi-9999.ebuild
@@ -53,16 +53,11 @@ if [[ ${PV} == 9999 ]] ; then
 		git config --global url."git://anongit.kde.org/".insteadOf "kde:" || die
 		git-2_src_unpack
 		pushd "${S}" > /dev/null || die
-		git submodule foreach git checkout master || die
+		git submodule foreach git pull origin master || die
 		popd > /dev/null || die
 	}
 fi
 
-src_prepare() {
-	cd ${S}/strigidaemon/bin/daemon/eventlistener
-	epatch ${FILESDIR}/strigi-fix-sleep.patch || die "Fail"
-}
-
 src_configure() {
 	# Enabled: POLLING (only reliable way to check for files changed.)
 	# Disabled: xine - recommended upstream to keep it this way