[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [emerge/kde-4.8] portage/kdesupport/strigi: added patch for rubens gcc build
From:       Patrick von Reth <patrick.vonreth () gmail ! com>
Date:       2012-03-07 13:17:37
Message-ID: 20120307131737.373DAA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit e46bcebf732e7c6d85137cc322272888ee9e092a by Patrick von Reth.
Committed on 02/01/2012 at 23:10.
Pushed by vonreth into branch 'kde-4.8'.

added patch for rubens gcc  build
(cherry picked from commit 4c5687af551630ad45322ad5ee610c6d07ec1aff)

A  +26   -0    portage/kdesupport/strigi/strigi-0.7.5-20120102.diff
M  +1    -0    portage/kdesupport/strigi/strigi-0.7.5-20120225.py

http://commits.kde.org/emerge/e46bcebf732e7c6d85137cc322272888ee9e092a

diff --git a/portage/kdesupport/strigi/strigi-0.7.5-20120102.diff \
b/portage/kdesupport/strigi/strigi-0.7.5-20120102.diff new file mode 100644
index 0000000..fb1e2d9
--- /dev/null
+++ b/portage/kdesupport/strigi/strigi-0.7.5-20120102.diff
@@ -0,0 +1,26 @@
+diff -Nru -x '*~' strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/cluceneindexer/cluceneindexmanager.h \
strigi-0.7.5/libstreamanalyzer/plugins/indexers/cluceneindexer/cluceneindexmanager.h \
+--- strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/cluceneindexer/cluceneindexmanager.h	2011-06-02 \
11:29:26.000000000 +0200 ++++ \
strigi-0.7.5/libstreamanalyzer/plugins/indexers/cluceneindexer/cluceneindexmanager.h	2012-01-02 \
23:01:03.557780000 +0100 +@@ -26,6 +26,10 @@
+ #include <string>
+ #include <map>
+ 
++#ifdef _WIN32
++#include <winsock2.h>
++#endif
++
+ /**
+  **/
+ 
+diff -Nru -x '*~' strigi-0.7.5.orig/libstreams/lib/filestreamopener.cpp \
strigi-0.7.5/libstreams/lib/filestreamopener.cpp +--- \
strigi-0.7.5.orig/libstreams/lib/filestreamopener.cpp	2011-06-02 11:28:57.000000000 \
+0200 ++++ strigi-0.7.5/libstreams/lib/filestreamopener.cpp	2012-01-02 \
22:28:40.972319200 +0100 +@@ -26,7 +26,7 @@
+ #include <strigi/fileinputstream.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-
++#undef stat
+ using namespace std;
+ using namespace Strigi;
+ 
diff --git a/portage/kdesupport/strigi/strigi-0.7.5-20120225.py \
b/portage/kdesupport/strigi/strigi-0.7.5-20120225.py index df556c8..a840fef 100644
--- a/portage/kdesupport/strigi/strigi-0.7.5-20120225.py
+++ b/portage/kdesupport/strigi/strigi-0.7.5-20120225.py
@@ -39,6 +39,7 @@ class subinfo(info.infoclass):
         self.patchToApply['0.7.2'] = ("strigi-0.7.2-20101223.diff", 1)
         self.patchToApply['0.7.5'] = ("strigi-0.7.5-20120225.diff", 1)
         self.targetDigests['0.7.2'] = 'b4c1472ef068536acf9c5c4c8f033a97f9c69f9f'
+        self.patchToApply['0.7.5'] = ("strigi-0.7.5-20120102.diff", 1)
 
         self.shortDescription = "a desktop search engine and indexer"
         if emergePlatform.isCrossCompilingEnabled():


[prev in list] [next in list] [prev in thread] [next in thread]