diff options
| author | tron <tron> | 2011-04-13 18:25:25 +0000 |
|---|---|---|
| committer | tron <tron> | 2011-04-13 18:25:25 +0000 |
| commit | 4defa20e2d8b3b95526f57c8afb90bd7f2718b1e (patch) | |
| tree | 458584849e60eb2b7344505bdefd0fefbea60152 | |
| parent | 37af6184f2ab8bc0b38ac8ad58f0bcefdc1a6be9 (diff) | |
| download | pkgsrc-4defa20e2d8b3b95526f57c8afb90bd7f2718b1e.tar.gz | |
Pullup ticket #3411 - requested by wiz
misc/calibre: build fix
Revisions pulled up:
- misc/calibre/distinfo 1.3
- misc/calibre/patches/patch-src_calibre_ebooks_pdf_images.cpp 1.1
---
Module Name: pkgsrc
Committed By: wiz
Date: Tue Apr 12 21:48:01 UTC 2011
Modified Files:
pkgsrc/misc/calibre: distinfo
Added Files:
pkgsrc/misc/calibre/patches: patch-src_calibre_ebooks_pdf_images.cpp
Log Message:
Fix build with png-1.5.
| -rw-r--r-- | misc/calibre/distinfo | 3 | ||||
| -rw-r--r-- | misc/calibre/patches/patch-src_calibre_ebooks_pdf_images.cpp | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo index b447855a9ba..a1b69b822dc 100644 --- a/misc/calibre/distinfo +++ b/misc/calibre/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.2 2009/11/18 17:41:20 wiz Exp $ +$NetBSD: distinfo,v 1.2.12.1 2011/04/13 18:25:25 tron Exp $ SHA1 (calibre-0.6.24.tar.gz) = 8484746cb058d7719225b02a843d29bd7626ffa0 RMD160 (calibre-0.6.24.tar.gz) = a7833156b635bfd14842b055e3b44debe64e4752 Size (calibre-0.6.24.tar.gz) = 10953557 bytes SHA1 (patch-aa) = cf794f388d8193c3384f7f36208bef606c14dc6d SHA1 (patch-ac) = da8fedb745ebb29ea7df0a5b7a642384273ae324 +SHA1 (patch-src_calibre_ebooks_pdf_images.cpp) = 31deac71af1f8d6f04978df26104ccd91229950c diff --git a/misc/calibre/patches/patch-src_calibre_ebooks_pdf_images.cpp b/misc/calibre/patches/patch-src_calibre_ebooks_pdf_images.cpp new file mode 100644 index 00000000000..53d471af7cf --- /dev/null +++ b/misc/calibre/patches/patch-src_calibre_ebooks_pdf_images.cpp @@ -0,0 +1,23 @@ +$NetBSD: patch-src_calibre_ebooks_pdf_images.cpp,v 1.1.2.2 2011/04/13 18:25:25 tron Exp $ + +Fix build with png-1.5. + +--- src/calibre/ebooks/pdf/images.cpp.orig 2009-11-16 19:41:31.000000000 +0000 ++++ src/calibre/ebooks/pdf/images.cpp +@@ -6,6 +6,7 @@ + #include <math.h> + #include <iostream> + #include <wand/MagickWand.h> ++#include <zlib.h> + + #include "images.h" + #include "utils.h" +@@ -294,7 +295,7 @@ void PNGWriter::write_splash_bitmap(Spla + + 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)); |