Date:2010-01-31 14:35:43 (11 years 25 days ago)
Author:Mirko Vogt
Commit:7664dcda6ed63b2012968d48228362d75fe9ba55
Message:purge out patches which are not needed anymore as they went upstream

Files: cxxtools/patches/0001-fix-compile-error.patch (1 diff)
zimlib/patches/001-fix-cxxtools-option.patch (1 diff)
zimlib/patches/002-disable-tests.patch (1 diff)
zimlib/patches/003-reduce-memory-usage.patch (1 diff)

Change Details

cxxtools/patches/0001-fix-compile-error.patch
1diff --git a/src/fileimpl.cpp b/src/fileimpl.cpp
2index 08edcb9..db8cb7f 100644
3+++ b/src/fileimpl.cpp
4@@ -35,6 +35,7 @@
5 #include <unistd.h>
6 #include <errno.h>
7 #include <string.h>
8+#include <cstdio>
9
10 namespace cxxtools {
11
12diff --git a/src/http/messageheader.cpp b/src/http/messageheader.cpp
13index 9381be7..21ee7c3 100644
14+++ b/src/http/messageheader.cpp
15@@ -30,6 +30,7 @@
16 #include <cxxtools/clock.h>
17 #include <cctype>
18 #include <sstream>
19+#include <cstdio>
20
21 namespace cxxtools {
22
zimlib/patches/001-fix-cxxtools-option.patch
1Index: configure.in
2===================================================================
3+++ b/configure.in (working copy)
4@@ -26,9 +26,9 @@
5 if test "$with_cxxtools" = "yes"
6 then
7   AC_DEFINE(WITH_CXXTOOLS, [1], [defined if cxxtools is used])
8+ AC_CHECK_HEADER([cxxtools/condition.h], , AC_MSG_ERROR([cxxtools headers not found]))
9 fi
10
11-AC_CHECK_HEADER([cxxtools/condition.h], , AC_MSG_ERROR([cxxtools headers not found]))
12 AM_CONDITIONAL(WITH_CXXTOOLS, test "$with_cxxtools" = yes)
13
14 # output
zimlib/patches/002-disable-tests.patch
1Index: Makefile.am
2===================================================================
3+++ b/Makefile.am (working copy)
4@@ -1,8 +1,4 @@
5 SUBDIRS = \
6     src \
7     include \
8- test \
9     zimDump
10-
11-test: all
12- test/zimlib-test
zimlib/patches/003-reduce-memory-usage.patch
1+++ zimlib/src/fileimpl.cpp 2009-10-08 13:02:45.000000000 +0200
2@@ -43,8 +43,8 @@
3   //
4   FileImpl::FileImpl(const char* fname)
5     : zimFile(fname, std::ios::in | std::ios::binary),
6- direntCache(512),
7- clusterCache(16)
8+ direntCache(32),
9+ clusterCache(1)
10   {
11     if (!zimFile)
12       throw ZenoFileFormatError(std::string("can't open zim-file \"") + fname + '"');

Archive Download the corresponding diff file



interactive