fix build with gcc4.3

4 files changed, 33 insertions, 2 deletions

diff --git a/sysutils/strigi/Makefile b/sysutils/strigi/Makefile
index 5b2acf74a16..16c495afc12 100644
--- a/sysutils/strigi/Makefile
+++ b/sysutils/strigi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/01/13 13:39:26 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2011/02/17 09:45:00 markd Exp $
 
 DISTNAME=	strigi-0.6.4
 PKGREVISION=	6
@@ -27,6 +27,7 @@ RT_LIB_SCHED=	-lrt
 RT_LIB_SCHED=	# empty
 .endif
 
+CMAKE_ARGS+=	-DENABLE_CPPUNIT=OFF
 .if !empty(RT_LIB_SCHED)
 # these use sched_setscheduler
 CMAKE_ARGS+=	-Dstrigidaemon_LIBS=${RT_LIB_SCHED}
diff --git a/sysutils/strigi/distinfo b/sysutils/strigi/distinfo
index 164931a8a33..e9b39417976 100644
--- a/sysutils/strigi/distinfo
+++ b/sysutils/strigi/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2009/07/23 09:07:11 markd Exp $
+$NetBSD: distinfo,v 1.5 2011/02/17 09:45:00 markd Exp $
 
 SHA1 (strigi-0.6.4.tar.bz2) = e91f31cc59fdfc303b662a8af899efe1365643bf
 RMD160 (strigi-0.6.4.tar.bz2) = 4b72de166b077778caa2b3ff31c2168a62155bd1
 Size (strigi-0.6.4.tar.bz2) = 895552 bytes
 SHA1 (patch-aa) = 96bf66b656731db79f0a52e90e294afef010b252
+SHA1 (patch-src_daemon_strigithread.cpp) = 0356c1cbe6ca490e7a916d65e6b7113c26c4d511
+SHA1 (patch-src_luceneindexer_jsgzipcompressstream.h) = 04a6cf7c2291fc9cd62d7595cda1b0528273ce75
diff --git a/sysutils/strigi/patches/patch-src_daemon_strigithread.cpp b/sysutils/strigi/patches/patch-src_daemon_strigithread.cpp
new file mode 100644
index 00000000000..7263d9f69f2
--- /dev/null
+++ b/sysutils/strigi/patches/patch-src_daemon_strigithread.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_daemon_strigithread.cpp,v 1.1 2011/02/17 09:45:00 markd Exp $
+
+Fix build with gcc4.3
+
+--- src/daemon/strigithread.cpp.orig	2009-02-01 19:56:01.000000000 +0000
++++ src/daemon/strigithread.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include <string>
+ #include <cstring>
++#include <cstdio>
+ #include <errno.h>
+ #include <signal.h>
+ #include <vector>
diff --git a/sysutils/strigi/patches/patch-src_luceneindexer_jsgzipcompressstream.h b/sysutils/strigi/patches/patch-src_luceneindexer_jsgzipcompressstream.h
new file mode 100644
index 00000000000..343da1b99a5
--- /dev/null
+++ b/sysutils/strigi/patches/patch-src_luceneindexer_jsgzipcompressstream.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_luceneindexer_jsgzipcompressstream.h,v 1.1 2011/02/17 09:45:00 markd Exp $
+
+Fix build with gcc4.3
+
+--- src/luceneindexer/jsgzipcompressstream.h.orig	2009-02-01 19:55:38.000000000 +0000
++++ src/luceneindexer/jsgzipcompressstream.h
+@@ -21,6 +21,7 @@
+ #define GZIPCOMPRESSSTREAM_H
+ 
+ #include <strigi/strigiconfig.h>   // (u)int64_t
++#include <cstdio>
+ #include <CLucene/util/streambase.h>
+ #include <CLucene/util/bufferedstream.h>
+