aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lauer <patrick@gentoo.org>2012-11-05 11:13:58 +0800
committerPatrick Lauer <patrick@gentoo.org>2012-11-05 11:13:58 +0800
commit0578cf927c2ba51837e121f792aa4d241947154f (patch)
tree17a5999ae23b638abfa7c2eca11c935e23d0a21a
parent[kde-base/kde-env] Drop redundant die. (diff)
downloadkde-0578cf927c2ba51837e121f792aa4d241947154f.tar.gz
kde-0578cf927c2ba51837e121f792aa4d241947154f.tar.bz2
kde-0578cf927c2ba51837e121f792aa4d241947154f.zip
Revert "[app-misc/strigi] Try another potential fix for bug #427050."
This reverts commit 962df890adcbe3e3a91a4d11d7579d32834337da.
-rw-r--r--app-misc/strigi/files/strigi-fix-sleep.patch11
-rw-r--r--app-misc/strigi/strigi-9999.ebuild7
2 files changed, 17 insertions, 1 deletions
diff --git a/app-misc/strigi/files/strigi-fix-sleep.patch b/app-misc/strigi/files/strigi-fix-sleep.patch
new file mode 100644
index 0000000000..ab690c0205
--- /dev/null
+++ b/app-misc/strigi/files/strigi-fix-sleep.patch
@@ -0,0 +1,11 @@
+--- 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 14f18624da..3aa0780d1c 100644
--- a/app-misc/strigi/strigi-9999.ebuild
+++ b/app-misc/strigi/strigi-9999.ebuild
@@ -53,11 +53,16 @@ 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 pull origin master || die
+ git submodule foreach git checkout 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