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.

4 files changed, 81 insertions, 7 deletions

diff --git a/print/pdf2djvu/distinfo b/print/pdf2djvu/distinfo
index 4954b1cdc3b..dd18ff5b8bd 100644
--- a/print/pdf2djvu/distinfo
+++ b/print/pdf2djvu/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2013/08/31 14:54:22 joerg Exp $
+$NetBSD: distinfo,v 1.6.14.1 2015/04/27 21:55:05 tron Exp $
 
 SHA1 (pdf2djvu_0.7.14.tar.gz) = 0023e1719f53452f64b1fffb6e5d20fc29b30308
 RMD160 (pdf2djvu_0.7.14.tar.gz) = 5116939c7bc698e3316bf6c86272104cd5040d24
 Size (pdf2djvu_0.7.14.tar.gz) = 320705 bytes
-SHA1 (patch-pdf-backend.cc) = 5fd62a464b6d239dd0b42b40f1188fab55ac9115
-SHA1 (patch-pdf2djvu.cc) = 63118d7207919417dec983582428c23621c301a1
+SHA1 (patch-pdf-backend.cc) = 4b22e50aebff955c984403a672ecda17dc5fdb3e
+SHA1 (patch-pdf-backend.hh) = ccdb39f289c5c9b771fb11354aa800aaf86990c9
+SHA1 (patch-pdf2djvu.cc) = d2443a896bd898039eb6df048859fc210a5350e1
 SHA1 (patch-system.hh) = dcc18be77d5ff0e7d5f70043efd4ae739c54627a
diff --git a/print/pdf2djvu/patches/patch-pdf-backend.cc b/print/pdf2djvu/patches/patch-pdf-backend.cc
index 7406d2cf1d8..e2db2408b27 100644
--- a/print/pdf2djvu/patches/patch-pdf-backend.cc
+++ b/print/pdf2djvu/patches/patch-pdf-backend.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-pdf-backend.cc,v 1.1 2013/08/31 14:54:23 joerg Exp $
+$NetBSD: patch-pdf-backend.cc,v 1.1.14.1 2015/04/27 21:55:05 tron Exp $
 
---- pdf-backend.cc.orig	2013-08-31 13:41:40.000000000 +0000
+--- pdf-backend.cc.orig	2012-09-18 15:27:41.000000000 +0000
 +++ pdf-backend.cc
 @@ -54,7 +54,7 @@ static void poppler_error_handler(int po
    error_log << std::endl;
@@ -11,3 +11,19 @@ $NetBSD: patch-pdf-backend.cc,v 1.1 2013/08/31 14:54:23 joerg Exp $
  {
    std::string format;
    const char *category_name = _("PDF error");
+@@ -119,15 +119,6 @@ pdf::Environment::Environment(const char
+ #endif
+ }
+ 
+-void pdf::Environment::set_antialias(bool value)
+-{
+-  if (!globalParams->setAntialias(const_cast<char*>(value ? "yes" : "no")))
+-    throw UnableToSetParameter(_("Unable to set antialias parameter"));
+-  if (!globalParams->setVectorAntialias(const_cast<char*>(value ? "yes" : "no")))
+-    throw UnableToSetParameter(_("Unable to set vector antialias parameter"));
+-}
+-
+-
+ /* class pdf::Document
+  * ===================
+  */
diff --git a/print/pdf2djvu/patches/patch-pdf-backend.hh b/print/pdf2djvu/patches/patch-pdf-backend.hh
new file mode 100644
index 00000000000..18b75a5c33e
--- /dev/null
+++ b/print/pdf2djvu/patches/patch-pdf-backend.hh
@@ -0,0 +1,21 @@
+$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:
diff --git a/print/pdf2djvu/patches/patch-pdf2djvu.cc b/print/pdf2djvu/patches/patch-pdf2djvu.cc
index a05aa287aae..66230fe2f94 100644
--- a/print/pdf2djvu/patches/patch-pdf2djvu.cc
+++ b/print/pdf2djvu/patches/patch-pdf2djvu.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-pdf2djvu.cc,v 1.1 2013/06/18 20:11:18 joerg Exp $
+$NetBSD: patch-pdf2djvu.cc,v 1.1.16.1 2015/04/27 21:55:05 tron Exp $
 
---- pdf2djvu.cc.orig	2013-06-18 19:40:16.000000000 +0000
+--- pdf2djvu.cc.orig	2012-09-18 15:27:41.000000000 +0000
 +++ pdf2djvu.cc
 @@ -210,6 +210,13 @@ public:
    friend Command &operator <<(Command &, const Component &);
@@ -16,3 +16,39 @@ $NetBSD: patch-pdf2djvu.cc,v 1.1 2013/06/18 20:11:18 joerg Exp $
  Command &operator <<(Command &command, const Component &component)
  {
    command << *component.file;
+@@ -625,8 +632,8 @@ public:
+     this->fill(state);
+   }
+ 
+-  MutedRenderer(pdf::splash::Color &paper_color, bool monochrome, const ComponentList &page_files)
+-  : Renderer(paper_color, monochrome), page_files(page_files)
++  MutedRenderer(pdf::splash::Color &paper_color, bool monochrome, bool antialias, const ComponentList &page_files)
++  : Renderer(paper_color, monochrome, antialias), page_files(page_files)
+   {
+     this->clear();
+   }
+@@ -1252,7 +1259,6 @@ static int xmain(int argc, char * const 
+     throw StdoutIsATerminal();
+ 
+   pdf::Environment environment(argv[0]);
+-  environment.set_antialias(config.antialias);
+ 
+   DocumentMap document_map(config.filenames);
+   intmax_t pdf_byte_size = document_map.get_byte_size();
+@@ -1386,13 +1392,13 @@ static int xmain(int argc, char * const 
+         debug(1) << doc->getFileName()->getCString() << ":" << std::endl;
+         debug(0)++;
+       }
+-      out1.reset(new pdf::Renderer(paper_color, config.monochrome));
++      out1.reset(new pdf::Renderer(paper_color, config.monochrome, config.antialias));
+       out1->start_doc(doc.get());
+-      outm.reset(new MutedRenderer(paper_color, config.monochrome, *page_files));
++      outm.reset(new MutedRenderer(paper_color, config.monochrome, config.antialias, *page_files));
+       outm->start_doc(doc.get());
+       if (!config.monochrome)
+       {
+-        outs.reset(new MutedRenderer(paper_color, config.monochrome, *page_files));
++        outs.reset(new MutedRenderer(paper_color, config.monochrome, config.antialias, *page_files));
+         outs->start_doc(doc.get());
+       }
+     }