Hi,
Antoine reminded me that there's a new stable release of poppler
available ;-)
I'm currently running a bulk update on amd64 to see wether there's
any fallout from the change of the PSOutputDev constructor.
As always, independent tests and comments are welcome.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.90
diff -u -p -r1.90 Makefile
--- Makefile 13 Dec 2014 19:02:07 -0000 1.90
+++ Makefile 5 Jan 2015 14:29:03 -0000
@@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin
COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.29.0
+V= 0.30.0
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
@@ -14,11 +14,11 @@ PKGNAME-qt= poppler-qt-$V
PKGNAME-qt4= poppler-qt4-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 24.0 # 48.0
+SHARED_LIBS += poppler 25.0 # 49.0
SHARED_LIBS += poppler-glib 13.1 # 14.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
SHARED_LIBS += poppler-qt4 14.0 # 9.0
-SHARED_LIBS += poppler-cpp 6.0 # 2.0
+SHARED_LIBS += poppler-cpp 6.1 # 2.1
DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo 13 Dec 2014 19:02:07 -0000 1.39
+++ distinfo 5 Jan 2015 14:29:03 -0000
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.29.0.tar.xz) = PB4W3I1dhG0IW69lhE7T4Fy95dRPZoL58eKxINZsYsQ=
+SHA256 (poppler-0.30.0.tar.xz) = thbuhp0LH4p6LHHPNG9Vwb/2JMzkut6+F/UG7Izn3fU=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.29.0.tar.xz) = 1600980
+SIZE (poppler-0.30.0.tar.xz) = 1605292
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v
retrieving revision 1.12
diff -u -p -r1.12 patch-configure_ac
--- patches/patch-configure_ac 13 Dec 2014 19:02:07 -0000 1.12
+++ patches/patch-configure_ac 5 Jan 2015 14:29:03 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.12 2014/12/13 19:02:07 kili Exp $
---- configure.ac.orig Thu Dec 4 22:52:06 2014
-+++ configure.ac Mon Dec 8 10:41:54 2014
-@@ -563,6 +563,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
+--- configure.ac.orig Sun Jan 4 23:15:57 2015
++++ configure.ac Mon Jan 5 14:19:19 2015
+@@ -590,6 +590,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
@@ -26,7 +26,7 @@ $OpenBSD: patch-configure_ac,v 1.12 2014
dnl
dnl Try Qt4
dnl
-@@ -595,7 +613,7 @@ AC_SUBST(POPPLER_QT4_LIBS)
+@@ -622,7 +640,7 @@ AC_SUBST(POPPLER_QT4_LIBS)
AC_SUBST(POPPLER_QT4_TEST_LIBS)
if test x$enable_poppler_qt4 = xyes; then
@@ -35,7 +35,7 @@ $OpenBSD: patch-configure_ac,v 1.12 2014
AC_MSG_CHECKING([for Qt4 moc])
mocversion=`$MOCQT4 -v 2>&1`
mocversiongrep=`echo $mocversion | grep "Qt 4"`
-@@ -866,6 +884,9 @@ glib/reference/Makefile
+@@ -907,6 +925,9 @@ glib/reference/Makefile
glib/reference/version.xml
glib/demo/Makefile
test/Makefile
@@ -45,7 +45,7 @@ $OpenBSD: patch-configure_ac,v 1.12 2014
qt4/Makefile
qt4/src/Makefile
qt4/tests/Makefile
-@@ -898,6 +919,7 @@ echo "Building poppler with support for:"
+@@ -939,6 +960,7 @@ echo "Building poppler with support for:"
echo " font configuration: $with_font_configuration"
echo " splash output: $enable_splash_output"
echo " cairo output: $use_cairo"
Index: patches/patch-qt_poppler-document_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-qt_poppler-document_cc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-qt_poppler-document_cc
--- patches/patch-qt_poppler-document_cc 13 Jul 2012 15:04:46 -0000
1.1
+++ patches/patch-qt_poppler-document_cc 5 Jan 2015 14:29:03 -0000
@@ -1,12 +1,16 @@
$OpenBSD: patch-qt_poppler-document_cc,v 1.1 2012/07/13 15:04:46 kili Exp $
---- qt/poppler-document.cc.orig Mon Jul 9 19:01:04 2012
-+++ qt/poppler-document.cc Mon Jul 9 22:37:00 2012
-@@ -326,7 +326,7 @@ bool Document::print(const QString &fileName, QValueLi
+--- qt/poppler-document.cc.orig Mon Jan 5 14:53:48 2015
++++ qt/poppler-document.cc Mon Jan 5 15:02:20 2015
+@@ -326,7 +326,11 @@ bool Document::print(const QString &fileName, QValueLi
bool Document::print(const QString &file, QValueList<int> pageList, double
hDPI, double vDPI, int rotate, int paperWidth, int paperHeight)
{
- PSOutputDev *psOut = new PSOutputDev(file.latin1(), &(data->doc),
data->doc.getXRef(), data->doc.getCatalog(), NULL, 1, data->doc.getNumPages(),
psModePS, paperWidth, paperHeight);
-+ PSOutputDev *psOut = new PSOutputDev(file.latin1(), &(data->doc), NULL, 1,
data->doc.getNumPages(), psModePS, paperWidth, paperHeight);
++ std::vector<int> pages;
++ for (int i = 1; i <= data->doc.getNumPages(); ++i) {
++ pages.push_back(i);
++ }
++ PSOutputDev *psOut = new PSOutputDev(file.latin1(), &(data->doc), NULL,
pages, psModePS, paperWidth, paperHeight);
if (psOut->isOk()) {
QValueList<int>::iterator it;
