Hi,

this is an update of print/poppler to 0.59, not to be committed
yet, but to let people test builds against old (0.57) and new (0.59)
poppler.

The main change (introduced in poppler-0.58) is an improved Object
API, which unfortunately is incompatible to the old one and thus
breaks some stuff (graphics/gdcm -- i just sent a diff for it,
print/texlive/base, sent an incomplete diff, graphics/inkscape, i
have a diff, but it's kind of "working with new poppler only).

Ciao,
        Kili

Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.126
diff -u -p -r1.126 Makefile
--- Makefile    15 Sep 2017 19:52:26 -0000      1.126
+++ Makefile    20 Sep 2017 21:29:42 -0000
@@ -5,7 +5,7 @@ COMMENT-qt4=    qt4 interface to PDF render
 COMMENT-qt5=   Qt5 interface to PDF rendering library
 COMMENT-utils= PDF conversion tools and utilities
 
-V=             0.57.0
+V=             0.59.0
 DISTNAME=      poppler-$V
 CATEGORIES=    print
 PKGNAME-main=  poppler-$V
@@ -15,10 +15,10 @@ PKGNAME-qt5=        poppler-qt5-$V
 
 EXTRACT_SUFX=  .tar.xz
 
-SHARED_LIBS += poppler              44.0     # 68.0
+SHARED_LIBS += poppler              45.0     # 70.0
 SHARED_LIBS += poppler-glib         17.0     # 17.0
 SHARED_LIBS += poppler-qt4          20.1     # 15.0
-SHARED_LIBS += poppler-qt5          4.0      # 11.0
+SHARED_LIBS += poppler-qt5          4.1      # 11.0
 SHARED_LIBS += poppler-cpp          8.0      # 3.0
 
 HOMEPAGE=      http://poppler.freedesktop.org/
@@ -42,7 +42,7 @@ MULTI_PACKAGES=-main -qt4 -qt5 -utils
 .include <bsd.port.arch.mk>
 
 # c++-11
-COMPILER=      gcc
+COMPILER=      base-clang ports-gcc
 
 cWANTLIB=      expat freetype fontconfig jpeg m pthread tiff z
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.64
diff -u -p -r1.64 distinfo
--- distinfo    28 Aug 2017 19:08:30 -0000      1.64
+++ distinfo    20 Sep 2017 21:29:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.57.0.tar.xz) = DqN95xt9t4IS68ed9Z+ZtmQJopwurE2ILa6fI5f+RNg=
-SIZE (poppler-0.57.0.tar.xz) = 1703300
+SHA256 (poppler-0.59.0.tar.xz) = o9YmskzRTvqYZOElhLIsnDL1HEZBfXwQyhdlHyl8lkE=
+SIZE (poppler-0.59.0.tar.xz) = 1712004
Index: patches/patch-poppler_Form_cc
===================================================================
RCS file: patches/patch-poppler_Form_cc
diff -N patches/patch-poppler_Form_cc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-poppler_Form_cc       20 Sep 2017 21:29:42 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: poppler/Form.cc
+--- poppler/Form.cc.orig
++++ poppler/Form.cc
+@@ -28,6 +28,7 @@
+ #endif
+ 
+ #include <set>
++#include <ctype.h>
+ #include <limits>
+ #include <stddef.h>
+ #include <string.h>
Index: patches/patch-poppler_XRef_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.17
diff -u -p -r1.17 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc       17 Dec 2016 01:20:10 -0000      1.17
+++ patches/patch-poppler_XRef_cc       20 Sep 2017 21:29:42 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-poppler_XRef_cc,v 1.17 2016/12/17 01:20:10 kili Exp $
---- poppler/XRef.cc.orig       Thu Dec 15 20:08:06 2016
-+++ poppler/XRef.cc    Fri Dec 16 14:16:46 2016
-@@ -1090,49 +1090,38 @@ void XRef::getEncryptionParameters(Guchar **fileKeyA, 
+Index: poppler/XRef.cc
+--- poppler/XRef.cc.orig
++++ poppler/XRef.cc
+@@ -1049,49 +1049,38 @@ void XRef::getEncryptionParameters(Guchar **fileKeyA, 
  }
  
  GBool XRef::okToPrint(GBool ignoreOwnerPW) {
@@ -58,4 +59,4 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.17 2
 +  return gTrue;
  }
  
- Object *XRef::getCatalog(Object *catalog) {
+ Object XRef::getCatalog() {
Index: patches/patch-qt5_src_Makefile_in
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-qt5_src_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-qt5_src_Makefile_in
--- patches/patch-qt5_src_Makefile_in   17 Dec 2016 01:20:10 -0000      1.4
+++ patches/patch-qt5_src_Makefile_in   20 Sep 2017 21:29:42 -0000
@@ -1,8 +1,9 @@
 $OpenBSD: patch-qt5_src_Makefile_in,v 1.4 2016/12/17 01:20:10 kili Exp $
 Reorder linking to make sure libestdc++ is picked up earlier than libstdc++.
---- qt5/src/Makefile.in.orig   Thu Dec 15 23:36:31 2016
-+++ qt5/src/Makefile.in        Fri Dec 16 14:16:48 2016
-@@ -521,8 +521,8 @@ libpoppler_qt5_la_CXXFLAGS = \
+Index: qt5/src/Makefile.in
+--- qt5/src/Makefile.in.orig
++++ qt5/src/Makefile.in
+@@ -522,8 +522,8 @@ libpoppler_qt5_la_CXXFLAGS = \
        -Dpoppler_qt5_EXPORTS
  
  libpoppler_qt5_la_LIBADD = \
@@ -12,4 +13,4 @@ Reorder linking to make sure libestdc++ 
 +      $(top_builddir)/poppler/libpoppler.la
  
  libpoppler_qt5_la_LDFLAGS = \
-       -version-info 9:0:8                     \
+       -version-info 11:0:10                   \

Reply via email to