diff options
| -rw-r--r-- | app-misc/strigi/Manifest | 5 | ||||
| -rw-r--r-- | app-misc/strigi/files/strigi-0.6.4-gcc44.patch | 40 | ||||
| -rw-r--r-- | app-misc/strigi/files/strigi-0.6.5-gcc4.4-missing-headers.patch | 22 | ||||
| -rw-r--r-- | app-misc/strigi/files/strigi-disable_java.patch | 19 | ||||
| -rw-r--r-- | app-misc/strigi/strigi-9999.ebuild | 14 |
5 files changed, 4 insertions, 96 deletions
diff --git a/app-misc/strigi/Manifest b/app-misc/strigi/Manifest index db3f8fbbe7e..7c00fa830de 100644 --- a/app-misc/strigi/Manifest +++ b/app-misc/strigi/Manifest @@ -1,5 +1,2 @@ -AUX strigi-0.6.4-gcc44.patch 1024 RMD160 194d69ba906c4da9ead9349545f26567dadc8ed2 SHA1 37c4622dd3b3b96de268e8ef15f52d8dea284d49 SHA256 94c594b16c0189706d0b0d565648b685a53910721f2340251ce7197ad5c213df -AUX strigi-0.6.5-gcc4.4-missing-headers.patch 1020 RMD160 91e447323303315a1f8fe282afce6add0f4c802a SHA1 308c03e5fd1b1671ea2690ceaff2426050390f92 SHA256 a16029a8caaede0c0427865a06a308fd6de0f526840b88274fab5ada0233c3c8 -AUX strigi-disable_java.patch 784 RMD160 870decf02f7bda63bae9a6f7df0b26caed753fdc SHA1 09dc828ecef7287e7286277713d07f84d6ff72bf SHA256 f267a0a804d96e9ef4cac1138f98572bec17906021282b4db905b804c33b956d -EBUILD strigi-9999.ebuild 2777 RMD160 1ea7fa6c7c254fda30babb25cd7e39cc8f154d0b SHA1 f0e405b64850110806a74c36038139c84603c36a SHA256 93083aa882365c21fb478f396919544d125c045feecf66ff3d4abb2b05c78d12 +EBUILD strigi-9999.ebuild 2430 RMD160 09de7a7743d1b51a38d522ac66989b8c311371bd SHA1 bfb232381cd1b59d424181da730879a104ef5b8a SHA256 902785cffbc73958868327d09b426e5862513e43369408821aa56bc73ba4842d MISC metadata.xml 486 RMD160 6eb5e37e0646dc21260e2938d9aa6286489e10cd SHA1 d600420837886e1d487266009b803ca76643c571 SHA256 2a4f8b7f0572075a608b0a3fb2e62321b4dbdd61b231cf72218246f0351cda12 diff --git a/app-misc/strigi/files/strigi-0.6.4-gcc44.patch b/app-misc/strigi/files/strigi-0.6.4-gcc44.patch deleted file mode 100644 index e209a930f65..00000000000 --- a/app-misc/strigi/files/strigi-0.6.4-gcc44.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- strigi-0.6.4.orig/src/daemon/dbus/dbuscpp/dbusmessagereader.h -+++ strigi-0.6.4/src/daemon/dbus/dbuscpp/dbusmessagereader.h -@@ -23,6 +23,7 @@ - #define DBUS_API_SUBJECT_TO_CHANGE 1 - #include <dbus/dbus.h> - -+#include <stdint.h> - #include <set> - #include <map> - #include <string> ---- strigi-0.6.4.orig/src/daemon/eventlistener/inotifylistener.h -+++ strigi-0.6.4/src/daemon/eventlistener/inotifylistener.h -@@ -24,6 +24,7 @@ - #include "strigi_thread.h" - #include <map> - #include <vector> -+#include <stdio.h> - - class Event; - class PollingListener; ---- strigi-0.6.4.orig/src/daemon/strigithread.h -+++ strigi-0.6.4/src/daemon/strigithread.h -@@ -22,6 +22,7 @@ - - #include <strigi_thread.h> - #include <string> -+#include <stdio.h> - - extern "C" void *threadstarter(void *); - ---- strigi-0.6.4.orig/src/streamanalyzer/indexpluginloader.h -+++ strigi-0.6.4/src/streamanalyzer/indexpluginloader.h -@@ -25,6 +25,7 @@ - #include <vector> - #include <map> - #include <string> -+#include <stdio.h> - - namespace Strigi { - class IndexManager; diff --git a/app-misc/strigi/files/strigi-0.6.5-gcc4.4-missing-headers.patch b/app-misc/strigi/files/strigi-0.6.5-gcc4.4-missing-headers.patch deleted file mode 100644 index c4eef570f46..00000000000 --- a/app-misc/strigi/files/strigi-0.6.5-gcc4.4-missing-headers.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nuar strigi-0.6.5.orig/src/estraierindexer/estraierindexmanager.cpp strigi-0.6.5/src/estraierindexer/estraierindexmanager.cpp ---- strigi-0.6.5.orig/src/estraierindexer/estraierindexmanager.cpp 2008-05-19 22:30:35.000000000 +0200 -+++ strigi-0.6.5/src/estraierindexer/estraierindexmanager.cpp 2009-05-18 11:06:21.296581521 +0200 -@@ -23,6 +23,7 @@ - #include "estraierindexwriter.h" - #include "strigi_thread.h" - #include "indexplugin.h" -+#include <cstdio> - #include <cstring> - #include <iostream> - #include <assert.h> -diff -Nuar strigi-0.6.5.orig/src/estraierindexer/estraierindexreader.cpp strigi-0.6.5/src/estraierindexer/estraierindexreader.cpp ---- strigi-0.6.5.orig/src/estraierindexer/estraierindexreader.cpp 2008-05-19 22:30:35.000000000 +0200 -+++ strigi-0.6.5/src/estraierindexer/estraierindexreader.cpp 2009-05-18 11:17:30.476583471 +0200 -@@ -21,6 +21,7 @@ - #include "estraierindexmanager.h" - #include "query.h" - #include <estraier.h> -+#include <cstdio> - #include <cstring> - #include <set> - #include <sstream> diff --git a/app-misc/strigi/files/strigi-disable_java.patch b/app-misc/strigi/files/strigi-disable_java.patch deleted file mode 100644 index 496ef577b18..00000000000 --- a/app-misc/strigi/files/strigi-disable_java.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- src/xsd/CMakeLists.txt.orig 2009-02-28 23:23:33.000000000 +0300 -+++ src/xsd/CMakeLists.txt 2009-03-01 00:08:08.000000000 +0300 -@@ -22,6 +22,8 @@ endif (LIBXML2_FOUND) - # javac >= 1.5 is required to compile the xsd parser - OPTION(ENABLE_REGENERATEXSD - "regenerate xsd parser from *.xsd files(not normally required)" ON) -+ -+if(${ENABLE_REGENERATEXSD}) - find_package(Java) - if (JAVA_COMPILE) - execute_process(COMMAND ${JAVA_COMPILE} "-version" ERROR_VARIABLE -@@ -31,6 +33,7 @@ if (JAVA_COMPILE) - endif (JAVAC_VERSION MATCHES " 1\\.[56]" AND NOT JAVAC_VERSION MATCHES "g[ci]j") - MESSAGE("Java5 found ${JAVAC5_FOUND}") - endif (JAVA_COMPILE) -+endif(${ENABLE_REGENERATEXSD}) - - # loop over all xsd files - set(XSDFILES "${CMAKE_CURRENT_SOURCE_DIR}/strigidaemonconfiguration.xsd" diff --git a/app-misc/strigi/strigi-9999.ebuild b/app-misc/strigi/strigi-9999.ebuild index a1b61e59341..03dc875c50a 100644 --- a/app-misc/strigi/strigi-9999.ebuild +++ b/app-misc/strigi/strigi-9999.ebuild @@ -42,12 +42,6 @@ DEPEND="${COMMONDEPEND} test? ( dev-util/cppunit )" RDEPEND="${COMMONDEPEND}" -PATCHES=( - "${FILESDIR}/${PN}-0.6.4-gcc44.patch" - "${FILESDIR}/${PN}-0.6.5-gcc4.4-missing-headers.patch" - "${FILESDIR}/${PN}-disable_java.patch" -) - src_prepare() { # subverison has own src_prepare # so this is not required on stable ebuild @@ -55,14 +49,12 @@ src_prepare() { } src_configure() { - # Strigi needs either expat or libxml2. - # However libxml2 seems to be required in both cases, linking to 2 xml parsers - # is just silly, so we forcefully disable linking to expat. # Enabled: POLLING (only reliable way to check for files changed.) mycmakeargs=( - -DENABLE_EXPAT=OFF -DENABLE_POLLING=ON - -DFORCE_DEPS=ON -DENABLE_CPPUNIT=OFF + -DENABLE_POLLING=ON + -DFORCE_DEPS=ON + -DENABLE_CPPUNIT=OFF -DENABLE_REGENERATEXSD=OFF $(cmake-utils_use_enable clucene) $(cmake-utils_use_enable dbus) |