[Xapian-discuss] Xapian 0.9.7 released

[Arjen van der Meijden]

Olly Betts wrote:
> On Thu, Oct 12, 2006 at 09:29:52AM +0200, Arjen van der Meijden wrote:
>> Will the "old" 0.9.6ish zlib-patch still work on this version?
>> If not do you have a new version for me?
> 
> Does it apply cleanly?  If it does, it should work fine.

The quartz-version of your patch seems to apply cleanly (it complains 
about a already patched Makefile.am, but I did the flint-version first, 
so that's logical), but the flint-version doesn't:

patching file Makefile.am
Hunk #1 succeeded at 62 (offset 1 line).
patching file backends/flint/flint_table.cc
Hunk #1 succeeded at 70 with fuzz 1 (offset 1 line).
Hunk #2 FAILED at 81.
Hunk #3 succeeded at 1055 (offset -102 lines).
Hunk #4 succeeded at 1261 (offset 1 line).
Hunk #5 succeeded at 1250 (offset -102 lines).
Hunk #6 succeeded at 1363 (offset 1 line).
Hunk #7 succeeded at 1488 (offset -102 lines).
1 out of 7 hunks FAILED -- saving rejects to file 
backends/flint/flint_table.cc.rej
patching file backends/flint/flint_table.h

the file backends/flint/flint_table.cc.rej contains:

***************
*** 80,85 ****
   # endif
   #endif

   // Only useful for platforms like Windows which distinguish between 
text and
   // binary files.
   #ifndef __WIN32__
--- 81,93 ----
   # endif
   #endif

+ #ifdef COMPRESSED_TAGS
+ #include <zlib.h>
+ // Only try to compress tags longer than this many bytes.
+ const size_t COMPRESS_MIN = 4;
+ #define DONT_COMPRESS -1
+ #endif /* COMPRESSED_TAGS */
+
   // Only useful for platforms like Windows which distinguish between 
text and
   // binary files.
   #ifndef __WIN32__

Best regards,

Arjen