Mon Apr 27 21:55:05 2015 UTC ()
Pullup ticket #4688 - requested by joerg
print/pdf2djvu: build fix

Revisions pulled up:
- print/pdf2djvu/distinfo                                       1.7
- print/pdf2djvu/patches/patch-pdf-backend.cc                   1.2
- print/pdf2djvu/patches/patch-pdf-backend.hh                   1.1
- print/pdf2djvu/patches/patch-pdf2djvu.cc                      1.2

---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Fri Apr 24 20:18:48 UTC 2015

   Modified Files:
   	pkgsrc/print/pdf2djvu: distinfo
   	pkgsrc/print/pdf2djvu/patches: patch-pdf-backend.cc patch-pdf2djvu.cc
   Added Files:
   	pkgsrc/print/pdf2djvu/patches: patch-pdf-backend.hh

   Log Message:
   Build with Poppler 0.32.


(tron)
diff -r1.6 -r1.6.14.1 pkgsrc/print/pdf2djvu/distinfo
diff -r1.1 -r1.1.14.1 pkgsrc/print/pdf2djvu/patches/patch-pdf-backend.cc
diff -r0 -r1.1.2.2 pkgsrc/print/pdf2djvu/patches/patch-pdf-backend.hh
diff -r1.1 -r1.1.16.1 pkgsrc/print/pdf2djvu/patches/patch-pdf2djvu.cc
cvs diff -r1.6 -r1.6.14.1 pkgsrc/print/pdf2djvu/distinfo (expand / switch to unified diff)

--- pkgsrc/print/pdf2djvu/distinfo 2013/08/31 14:54:22 1.6
+++ pkgsrc/print/pdf2djvu/distinfo 2015/04/27 21:55:05 1.6.14.1
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.6 2013/08/31 14:54:22 joerg Exp $ 1$NetBSD: distinfo,v 1.6.14.1 2015/04/27 21:55:05 tron Exp $
2 2
3SHA1 (pdf2djvu_0.7.14.tar.gz) = 0023e1719f53452f64b1fffb6e5d20fc29b30308 3SHA1 (pdf2djvu_0.7.14.tar.gz) = 0023e1719f53452f64b1fffb6e5d20fc29b30308
4RMD160 (pdf2djvu_0.7.14.tar.gz) = 5116939c7bc698e3316bf6c86272104cd5040d24 4RMD160 (pdf2djvu_0.7.14.tar.gz) = 5116939c7bc698e3316bf6c86272104cd5040d24
5Size (pdf2djvu_0.7.14.tar.gz) = 320705 bytes 5Size (pdf2djvu_0.7.14.tar.gz) = 320705 bytes
6SHA1 (patch-pdf-backend.cc) = 5fd62a464b6d239dd0b42b40f1188fab55ac9115 6SHA1 (patch-pdf-backend.cc) = 4b22e50aebff955c984403a672ecda17dc5fdb3e
7SHA1 (patch-pdf2djvu.cc) = 63118d7207919417dec983582428c23621c301a1 7SHA1 (patch-pdf-backend.hh) = ccdb39f289c5c9b771fb11354aa800aaf86990c9
 8SHA1 (patch-pdf2djvu.cc) = d2443a896bd898039eb6df048859fc210a5350e1
8SHA1 (patch-system.hh) = dcc18be77d5ff0e7d5f70043efd4ae739c54627a 9SHA1 (patch-system.hh) = dcc18be77d5ff0e7d5f70043efd4ae739c54627a
cvs diff -r1.1 -r1.1.14.1 pkgsrc/print/pdf2djvu/patches/patch-pdf-backend.cc (expand / switch to unified diff)

--- pkgsrc/print/pdf2djvu/patches/patch-pdf-backend.cc 2013/08/31 14:54:23 1.1
+++ pkgsrc/print/pdf2djvu/patches/patch-pdf-backend.cc 2015/04/27 21:55:05 1.1.14.1
@@ -1,13 +1,29 @@ @@ -1,13 +1,29 @@
1$NetBSD: patch-pdf-backend.cc,v 1.1 2013/08/31 14:54:23 joerg Exp $ 1$NetBSD: patch-pdf-backend.cc,v 1.1.14.1 2015/04/27 21:55:05 tron Exp $
2 2
3--- pdf-backend.cc.orig 2013-08-31 13:41:40.000000000 +0000 3--- pdf-backend.cc.orig 2012-09-18 15:27:41.000000000 +0000
4+++ pdf-backend.cc 4+++ pdf-backend.cc
5@@ -54,7 +54,7 @@ static void poppler_error_handler(int po 5@@ -54,7 +54,7 @@ static void poppler_error_handler(int po
6 error_log << std::endl; 6 error_log << std::endl;
7 } 7 }
8 #else 8 #else
9-static void poppler_error_handler(void *data, ErrorCategory category, int pos, char *message) 9-static void poppler_error_handler(void *data, ErrorCategory category, int pos, char *message)
10+static void poppler_error_handler(void *data, ErrorCategory category, Goffset pos, char *message) 10+static void poppler_error_handler(void *data, ErrorCategory category, Goffset pos, char *message)
11 { 11 {
12 std::string format; 12 std::string format;
13 const char *category_name = _("PDF error"); 13 const char *category_name = _("PDF error");
 14@@ -119,15 +119,6 @@ pdf::Environment::Environment(const char
 15 #endif
 16 }
 17
 18-void pdf::Environment::set_antialias(bool value)
 19-{
 20- if (!globalParams->setAntialias(const_cast<char*>(value ? "yes" : "no")))
 21- throw UnableToSetParameter(_("Unable to set antialias parameter"));
 22- if (!globalParams->setVectorAntialias(const_cast<char*>(value ? "yes" : "no")))
 23- throw UnableToSetParameter(_("Unable to set vector antialias parameter"));
 24-}
 25-
 26-
 27 /* class pdf::Document
 28 * ===================
 29 */
File Added: pkgsrc/print/pdf2djvu/patches/Attic/patch-pdf-backend.hh
$NetBSD: patch-pdf-backend.hh,v 1.1.2.2 2015/04/27 21:55:05 tron Exp $

--- pdf-backend.hh.orig	2015-04-24 18:53:21.000000000 +0000
+++ pdf-backend.hh
@@ -113,7 +113,7 @@ namespace pdf
   class Renderer : public pdf::splash::OutputDevice
   {
   public:
-    Renderer(pdf::splash::Color &paper_color, bool monochrome = false) :
+    Renderer(pdf::splash::Color &paper_color, bool antialias, bool monochrome) :
       pdf::splash::OutputDevice(monochrome ? splashModeMono1 : splashModeRGB8, 4, gFalse, paper_color)
     { }
 
@@ -296,7 +296,6 @@ namespace pdf
   {
   public:
     Environment(const char *argv0);
-    void set_antialias(bool value);
     class UnableToSetParameter : public std::runtime_error
     {
     public:
cvs diff -r1.1 -r1.1.16.1 pkgsrc/print/pdf2djvu/patches/patch-pdf2djvu.cc (expand / switch to unified diff)

--- pkgsrc/print/pdf2djvu/patches/patch-pdf2djvu.cc 2013/06/18 20:11:18 1.1
+++ pkgsrc/print/pdf2djvu/patches/patch-pdf2djvu.cc 2015/04/27 21:55:05 1.1.16.1
@@ -1,18 +1,54 @@ @@ -1,18 +1,54 @@
1$NetBSD: patch-pdf2djvu.cc,v 1.1 2013/06/18 20:11:18 joerg Exp $ 1$NetBSD: patch-pdf2djvu.cc,v 1.1.16.1 2015/04/27 21:55:05 tron Exp $
2 2
3--- pdf2djvu.cc.orig 2013-06-18 19:40:16.000000000 +0000 3--- pdf2djvu.cc.orig 2012-09-18 15:27:41.000000000 +0000
4+++ pdf2djvu.cc 4+++ pdf2djvu.cc
5@@ -210,6 +210,13 @@ public: 5@@ -210,6 +210,13 @@ public:
6 friend Command &operator <<(Command &, const Component &); 6 friend Command &operator <<(Command &, const Component &);
7 }; 7 };
8  8
9+Command &operator <<(Command &command, const File &arg) 9+Command &operator <<(Command &command, const File &arg)
10+{ 10+{
11+ const std::string filename(arg); 11+ const std::string filename(arg);
12+ command << filename; 12+ command << filename;
13+ return command; 13+ return command;
14+} 14+}
15+ 15+
16 Command &operator <<(Command &command, const Component &component) 16 Command &operator <<(Command &command, const Component &component)
17 { 17 {
18 command << *component.file; 18 command << *component.file;
 19@@ -625,8 +632,8 @@ public:
 20 this->fill(state);
 21 }
 22
 23- MutedRenderer(pdf::splash::Color &paper_color, bool monochrome, const ComponentList &page_files)
 24- : Renderer(paper_color, monochrome), page_files(page_files)
 25+ MutedRenderer(pdf::splash::Color &paper_color, bool monochrome, bool antialias, const ComponentList &page_files)
 26+ : Renderer(paper_color, monochrome, antialias), page_files(page_files)
 27 {
 28 this->clear();
 29 }
 30@@ -1252,7 +1259,6 @@ static int xmain(int argc, char * const
 31 throw StdoutIsATerminal();
 32
 33 pdf::Environment environment(argv[0]);
 34- environment.set_antialias(config.antialias);
 35
 36 DocumentMap document_map(config.filenames);
 37 intmax_t pdf_byte_size = document_map.get_byte_size();
 38@@ -1386,13 +1392,13 @@ static int xmain(int argc, char * const
 39 debug(1) << doc->getFileName()->getCString() << ":" << std::endl;
 40 debug(0)++;
 41 }
 42- out1.reset(new pdf::Renderer(paper_color, config.monochrome));
 43+ out1.reset(new pdf::Renderer(paper_color, config.monochrome, config.antialias));
 44 out1->start_doc(doc.get());
 45- outm.reset(new MutedRenderer(paper_color, config.monochrome, *page_files));
 46+ outm.reset(new MutedRenderer(paper_color, config.monochrome, config.antialias, *page_files));
 47 outm->start_doc(doc.get());
 48 if (!config.monochrome)
 49 {
 50- outs.reset(new MutedRenderer(paper_color, config.monochrome, *page_files));
 51+ outs.reset(new MutedRenderer(paper_color, config.monochrome, config.antialias, *page_files));
 52 outs->start_doc(doc.get());
 53 }
 54 }