Re: misc/calibre doesn't build; png_struct_def; Z_BEST_COMPRESSION.

[Rhialto <rhialto%falu.nl@localhost>]

On Tue 12 Apr 2011 at 20:15:49 +0200, Rhialto wrote:
> with pkgsrc 2011Q1, in pkg_comp with 5.0 userland running on 5.1.

The following patch makes calibre compile.

However, the version of calibre in pkgsrc is registered to be
vulnerable, and should be updated. calibre-0.6.24 is present,
0.7.54 is available from http://calibre-ebook.com/download_linux.

$NetBSD$

--- src/calibre/ebooks/pdf/images.cpp.dist      2011-04-12 20:05:02.000000000 
+0000
+++ src/calibre/ebooks/pdf/images.cpp   2011-04-12 20:08:11.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "images.h"
 #include "utils.h"
+#include "zlib.h"
 
 #ifdef _WIN32
 inline double round(double x) { return (x-floor(x))>0.5 ? ceil(x) : floor(x); }
@@ -294,7 +295,7 @@
 
 void calibre_png_mem_write(png_structp png_ptr, png_bytep data, png_size_t 
length) {
     if (!png_ptr || length < 1) return;
-    vector<char> *buf = static_cast< vector<char>* >(png_ptr->io_ptr);
+    vector<char> *buf = static_cast< vector<char>* >(png_get_io_ptr(png_ptr));
     buf->reserve(buf->capacity() + length); 
     do {
         buf->push_back(static_cast<char>(*data));

-Olaf.
-- 
___ Olaf 'Rhialto' Seibert  -- There's no point being grown-up if you 
\X/ rhialto/at/xs4all.nl    -- can't be childish sometimes. -The 4th Doctor