[pkgsrc/trunk]: pkgsrc/print/web2c web2c: fix poppler-0.74.0 "Guint" type rem...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/55a70eae4697
branches:  trunk
changeset: 329889:55a70eae4697
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Feb 17 11:44:38 2019 +0000

description:
web2c: fix poppler-0.74.0 "Guint" type removal fallout

diffstat:

 print/web2c/distinfo                                       |   4 ++--
 print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc |  11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r 67f48f19dbdd -r 55a70eae4697 print/web2c/distinfo
--- a/print/web2c/distinfo      Sun Feb 17 11:17:37 2019 +0000
+++ b/print/web2c/distinfo      Sun Feb 17 11:44:38 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2018/12/11 13:59:04 ryoon Exp $
+$NetBSD: distinfo,v 1.31 2019/02/17 11:44:38 tnn Exp $
 
 SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
 RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
@@ -8,6 +8,6 @@
 SHA1 (patch-am) = b7b81b1161a2117e756b25b80f9a676575267bdd
 SHA1 (patch-pdftexdir_pdftex-common.h) = 59f32828de5dd032307467d83e43f21382a39330
 SHA1 (patch-pdftexdir_pdftoepdf-newpoppler.cc) = 0fcd475d4dce7778e3f49fb7eb66f79d61f5ba10
-SHA1 (patch-pdftexdir_pdftosrc-newpoppler.cc) = bacaac68c6685fb9b09226e91e3f3a33ab10937a
+SHA1 (patch-pdftexdir_pdftosrc-newpoppler.cc) = 497c4d87ae6882e1488b9e440e011680e7a46f62
 SHA1 (patch-pdftexdir_writeenc.c) = daf41fec97d3d3e46063d8cf4c559d96e1ec69bf
 SHA1 (patch-pdftexdir_writet1.c) = 7d00d5d5d3f884bc1f9946cb3fbcaa7f224df9de
diff -r 67f48f19dbdd -r 55a70eae4697 print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc
--- a/print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc        Sun Feb 17 11:17:37 2019 +0000
+++ b/print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc        Sun Feb 17 11:44:38 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-pdftexdir_pdftosrc-newpoppler.cc,v 1.3 2018/12/11 13:59:04 ryoon Exp $
+$NetBSD: patch-pdftexdir_pdftosrc-newpoppler.cc,v 1.4 2019/02/17 11:44:38 tnn Exp $
 
 --- pdftexdir/pdftosrc-newpoppler.cc.orig      2017-10-17 21:52:13.000000000 +0000
 +++ pdftexdir/pdftosrc-newpoppler.cc
@@ -38,6 +38,15 @@
          if ((p = strrchr(buf, '.')) == 0)
              p = strchr(buf, 0);
          sprintf(p, ".xref");
+@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
+                 Object objStr, obj1, obj2;
+                 int nObjects, first, n;
+                 int localOffset = 0;
+-                Guint firstOffset;
++                unsigned int firstOffset;
+ 
+                 objStr = xref->fetch(e->offset, 0);
+                 assert(objStr.isStream());
 @@ -173,9 +173,9 @@ int main(int argc, char *argv[])
  
                  // parse the header: object numbers and offsets