Update to poppler-0.20.2.
Mostly untested so far (I'm currently building ports depending on
it, and I already know that texlive/base needs patching).
I'd appreciate tests especially for the (legacy) poppler-qt subpackage
(kdegraphics and koffice). Of course, tests with other packages
using poppler are welcome, too.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- Makefile 6 Jun 2012 18:27:34 -0000 1.62
+++ Makefile 11 Jul 2012 12:11:31 -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.18.4
+V= 0.20.2
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
@@ -14,15 +14,11 @@ PKGNAME-qt= poppler-qt-$V
PKGNAME-qt4= poppler-qt4-$V
OLDSHIT = poppler-0.16.7
-REVISION-main= 0
-REVISION-qt= 0
-REVISION-qt4= 0
-
-SHARED_LIBS += poppler 11.0
-SHARED_LIBS += poppler-cpp 1.0
-SHARED_LIBS += poppler-glib 9.0
-SHARED_LIBS += poppler-qt 8.0
-SHARED_LIBS += poppler-qt4 8.0
+SHARED_LIBS += poppler 12.0
+SHARED_LIBS += poppler-cpp 2.0
+SHARED_LIBS += poppler-glib 10.0
+SHARED_LIBS += poppler-qt 9.0
+SHARED_LIBS += poppler-qt4 9.0
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} ${OLDSHIT}${EXTRACT_SUFX}
HOMEPAGE= http://poppler.freedesktop.org/
@@ -67,7 +63,7 @@ BUILD_DEPENDS+= devel/gobject-introspect
LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \
devel/glib2 \
graphics/cairo \
- graphics/lcms \
+ graphics/lcms2 \
graphics/openjpeg \
graphics/png \
graphics/tiff
@@ -85,14 +81,14 @@ WANTLIB-main= ${cWANTLIB} Xext Xfixes ff
glib-2.0 gobject-2.0 gthread-2.0 \
pixman-1 openjpeg \
X11 Xau Xdamage Xdmcp Xrender cairo pcre png \
- pthread-stubs xcb xcb-render lcms GL Xxf86vm \
+ pthread-stubs xcb xcb-render lcms2 GL Xxf86vm \
drm xcb-shm ${MODGETTEXT_WANTLIB}
-WANTLIB-qt= ${cWANTLIB} lcms openjpeg poppler png ${MODQT3_WANTLIB}
+WANTLIB-qt= ${cWANTLIB} lcms2 openjpeg poppler png ${MODQT3_WANTLIB}
WANTLIB-qt4= ${cWANTLIB} ${MODQT4_WANTLIB} ICE QtGui QtXml SM X11 Xext Xi \
- Xinerama Xrender lcms openjpeg png poppler QtCore QtGui QtXml
+ Xinerama Xrender lcms2 openjpeg png poppler QtCore QtGui QtXml
WANTLIB-utils= GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender Xxf86vm \
c cairo drm expat ffi fontconfig freetype glib-2.0 \
- gobject-2.0 gthread-2.0 jpeg lcms m pcre pixman-1 png \
+ gobject-2.0 gthread-2.0 jpeg lcms2 m pcre pixman-1 png \
pthread pthread-stubs stdc++ tiff xcb xcb-render xcb-shm \
openjpeg poppler z ${cWANTLIB} ${MODGETTEXT_WANTLIB}
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo 27 Mar 2012 06:31:05 -0000 1.20
+++ distinfo 11 Jul 2012 12:11:31 -0000
@@ -1,10 +1,10 @@
MD5 (poppler-0.16.7.tar.gz) = Ovoo48jE8GsPvKPJHgY5Tg==
-MD5 (poppler-0.18.4.tar.gz) = EmWPMwhZflfz+v9TjMc7rw==
+MD5 (poppler-0.20.2.tar.gz) = Rd0sFsjE0aOegw5FdFxOJQ==
RMD160 (poppler-0.16.7.tar.gz) = J5Mw5v6vl6IH8zluqxr4NtPR8Ww=
-RMD160 (poppler-0.18.4.tar.gz) = FVMBfpsmDL1iTUPXf89BCvqlfko=
+RMD160 (poppler-0.20.2.tar.gz) = i5NhqXLUPHySOYweIFXN9b4QwaI=
SHA1 (poppler-0.16.7.tar.gz) = Jsc1+GNoj2K1fVFZhj/a1Ccr6J8=
-SHA1 (poppler-0.18.4.tar.gz) = N1PK7Lpxr68p8JfgucUuD4OhClk=
+SHA1 (poppler-0.20.2.tar.gz) = D3RbWT52TSeg4hZF5v69atitKrk=
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.18.4.tar.gz) = M0IRSM3I4EPaKR3s4szhzqYiDUmlDADFbVbWQ1UB1C4=
+SHA256 (poppler-0.20.2.tar.gz) = LevFA04OhUApV9hPsmdHN2WKPb6KPGMeF5Lj+MiM42k=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.18.4.tar.gz) = 1992993
+SIZE (poppler-0.20.2.tar.gz) = 2146312
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in 27 Mar 2012 06:31:05 -0000 1.3
+++ patches/patch-Makefile_in 11 Jul 2012 12:11:31 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.3 2012/03/27 06:31:05 kili Exp $
---- Makefile.in.orig Wed Feb 15 18:22:45 2012
-+++ Makefile.in Mon Mar 26 06:01:36 2012
-@@ -276,6 +276,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
+--- Makefile.in.orig Sun Jun 10 20:45:33 2012
++++ Makefile.in Mon Jul 9 14:47:58 2012
+@@ -290,6 +290,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2012/0
POPPLER_VERSION = @POPPLER_VERSION@
PTHREAD_CC = @PTHREAD_CC@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-@@ -331,6 +333,8 @@ infodir = @infodir@
+@@ -346,6 +348,8 @@ infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2012/0
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
-@@ -356,12 +360,14 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+@@ -371,12 +375,14 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
@BUILD_CAIRO_OUTPUT_TRUE@cairo_pc_file = poppler-cairo.pc
@BUILD_POPPLER_GLIB_TRUE@glib_subdir = glib
@BUILD_POPPLER_GLIB_TRUE@glib_pc_file = poppler-glib.pc
@@ -35,7 +35,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2012/0
# Add CMake buildsystem files here so they get added on make dist
EXTRA_DIST = README-XPDF poppler.pc.in poppler-uninstalled.pc.in \
-@@ -399,6 +405,7 @@ pkgconfig_DATA = \
+@@ -415,6 +421,7 @@ pkgconfig_DATA = \
$(cairo_pc_file) \
$(splash_pc_file) \
$(glib_pc_file) \
@@ -43,7 +43,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2012/0
$(qt4_pc_file) \
$(cpp_pc_file)
-@@ -472,6 +479,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
+@@ -486,6 +493,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
poppler-glib.pc: $(top_builddir)/config.status $(srcdir)/poppler-glib.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
poppler-glib-uninstalled.pc: $(top_builddir)/config.status
$(srcdir)/poppler-glib-uninstalled.pc.in
Index: patches/patch-aclocal_m4
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-aclocal_m4,v
retrieving revision 1.1
diff -u -p -r1.1 patch-aclocal_m4
--- patches/patch-aclocal_m4 26 Nov 2011 19:45:29 -0000 1.1
+++ patches/patch-aclocal_m4 11 Jul 2012 12:11:31 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2011/11/26 19:45:29 kili Exp $
---- aclocal.m4.orig Wed Nov 16 17:26:14 2011
-+++ aclocal.m4 Wed Nov 16 17:26:30 2011
-@@ -2153,6 +2153,7 @@ m4_include([m4/define-dir.m4])
+--- aclocal.m4.orig Sun Jun 10 20:45:31 2012
++++ aclocal.m4 Mon Jul 9 14:47:58 2012
+@@ -2203,6 +2203,7 @@ m4_include([m4/define-dir.m4])
m4_include([m4/gtk-doc.m4])
m4_include([m4/iconv.m4])
m4_include([m4/introspection.m4])
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure_ac
--- patches/patch-configure_ac 27 Mar 2012 06:31:05 -0000 1.3
+++ patches/patch-configure_ac 11 Jul 2012 12:11:31 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.3 2012/03/27 06:31:05 kili Exp $
---- configure.ac.orig Wed Feb 15 18:21:50 2012
-+++ configure.ac Mon Mar 26 08:35:40 2012
-@@ -462,6 +462,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
+--- configure.ac.orig Sun Jun 10 20:40:14 2012
++++ configure.ac Mon Jul 9 14:49:52 2012
+@@ -564,6 +564,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.3 2012/
dnl
dnl Try Qt4
dnl
-@@ -494,7 +512,7 @@ AC_SUBST(POPPLER_QT4_LIBS)
+@@ -596,7 +614,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.3 2012/
AC_MSG_CHECKING([for Qt4 moc])
mocversion=`$MOCQT4 -v 2>&1`
mocversiongrep=`echo $mocversion | grep "Qt 4"`
-@@ -626,6 +644,9 @@ glib/reference/Makefile
+@@ -782,6 +800,9 @@ glib/reference/Makefile
glib/reference/version.xml
glib/demo/Makefile
test/Makefile
@@ -45,11 +45,11 @@ $OpenBSD: patch-configure_ac,v 1.3 2012/
qt4/Makefile
qt4/src/Makefile
qt4/tests/Makefile
-@@ -652,6 +673,7 @@ echo "Building poppler with support for:"
+@@ -808,6 +829,7 @@ echo "Building poppler with support for:"
echo " font configuration: $with_font_configuration"
echo " splash output: $enable_splash_output"
- echo " cairo output: $enable_cairo_output"
-+echo " qt wrapper: $enable_poppler_qt"
+ echo " cairo output: $use_cairo"
++echo " qt wrapper: $enable_poppler_qt"
echo " qt4 wrapper: $enable_poppler_qt4"
- echo " glib wrapper: $enable_poppler_glib"
+ echo " glib wrapper: $use_glib"
echo " introspection: $found_introspection"
Index: patches/patch-poppler_XRef_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.8
diff -u -p -r1.8 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc 4 Jun 2011 19:03:19 -0000 1.8
+++ patches/patch-poppler_XRef_cc 11 Jul 2012 12:11:31 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-poppler_XRef_cc,v 1.8 2011/06/04 19:03:19 kili Exp $
---- poppler/XRef.cc.orig Mon Dec 27 21:44:28 2010
-+++ poppler/XRef.cc Mon Apr 25 13:00:42 2011
-@@ -922,49 +922,38 @@ void XRef::setEncryption(int permFlagsA, GBool ownerPa
+--- poppler/XRef.cc.orig Thu May 10 22:05:44 2012
++++ poppler/XRef.cc Mon Jul 9 14:47:58 2012
+@@ -941,49 +941,38 @@ void XRef::setEncryption(int permFlagsA, GBool ownerPa
}
GBool XRef::okToPrint(GBool ignoreOwnerPW) {
@@ -58,4 +58,4 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.8 20
+ return gTrue;
}
- Object *XRef::fetch(int num, int gen, Object *obj, std::set<int>
*fetchOriginatorNums) {
+ Object *XRef::fetch(int num, int gen, Object *obj, int recursion) {
Index: patches/patch-qt_poppler-document_cc
===================================================================
RCS file: patches/patch-qt_poppler-document_cc
diff -N patches/patch-qt_poppler-document_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-qt_poppler-document_cc 11 Jul 2012 12:11:31 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- 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
+
+ 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);
+
+ if (psOut->isOk()) {
+ QValueList<int>::iterator it;
Index: patches/patch-qt_poppler-page_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-qt_poppler-page_cc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-qt_poppler-page_cc
--- patches/patch-qt_poppler-page_cc 26 Nov 2011 19:45:29 -0000 1.1
+++ patches/patch-qt_poppler-page_cc 11 Jul 2012 12:11:31 -0000
@@ -1,6 +1,24 @@
$OpenBSD: patch-qt_poppler-page_cc,v 1.1 2011/11/26 19:45:29 kili Exp $
---- qt/poppler-page.cc.orig Wed Nov 16 17:58:07 2011
-+++ qt/poppler-page.cc Wed Nov 16 18:10:35 2011
+--- qt/poppler-page.cc.orig Mon Jul 9 19:01:04 2012
++++ qt/poppler-page.cc Mon Jul 9 23:02:19 2012
+@@ -124,7 +124,7 @@ QString Page::getText(const Rectangle &r) const
+ QString result;
+ ::Page *p;
+
+- output_dev = new TextOutputDev(0, gFalse, gFalse, gFalse);
++ output_dev = new TextOutputDev(0, gFalse, 0, gFalse, gFalse);
+ data->doc->data->doc.displayPageSlice(output_dev, data->index + 1, 72, 72,
+ 0, false, false, false, -1, -1, -1, -1);
+ p = data->page;
+@@ -155,7 +155,7 @@ QValueList<TextBox*> Page::textList() const
+
+ QValueList<TextBox*> output_list;
+
+- output_dev = new TextOutputDev(0, gFalse, gFalse, gFalse);
++ output_dev = new TextOutputDev(0, gFalse, 0, gFalse, gFalse);
+
+ data->doc->data->doc.displayPageSlice(output_dev, data->index + 1, 72, 72,
+ 0, false, false, false, -1, -1, -1, -1);
@@ -239,7 +239,7 @@ QValueList<Link*> Page::links() const
Links *xpdfLinks = data->doc->data->doc.getLinks(data->index + 1);
for (int i = 0; i < xpdfLinks->getNumLinks(); ++i)
Index: patches/patch-qt_poppler-private_h
===================================================================
RCS file: patches/patch-qt_poppler-private_h
diff -N patches/patch-qt_poppler-private_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-qt_poppler-private_h 11 Jul 2012 12:11:31 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- qt/poppler-private.h.orig Mon Jul 9 19:01:04 2012
++++ qt/poppler-private.h Mon Jul 9 19:53:26 2012
+@@ -77,7 +77,7 @@ class DocumentData {
+ white[1] = 255;
+ white[2] = 255;
+ m_outputDev = new SplashOutputDev(splashModeXBGR8, 4, gFalse,
white);
+- m_outputDev->startDoc(doc.getXRef());
++ m_outputDev->startDoc(&doc);
+ }
+ #endif
+ return m_outputDev;
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST-main
--- pkg/PLIST-main 6 Jun 2012 18:27:34 -0000 1.15
+++ pkg/PLIST-main 11 Jul 2012 12:11:31 -0000
@@ -88,6 +88,7 @@ include/poppler/cpp/poppler-version.h
include/poppler/fofi/
include/poppler/fofi/FoFiBase.h
include/poppler/fofi/FoFiEncodings.h
+include/poppler/fofi/FoFiIdentifier.h
include/poppler/fofi/FoFiTrueType.h
include/poppler/fofi/FoFiType1.h
include/poppler/fofi/FoFiType1C.h
@@ -178,6 +179,7 @@ share/gtk-doc/html/poppler/api-index-0-1
share/gtk-doc/html/poppler/api-index-0-14.html
share/gtk-doc/html/poppler/api-index-0-16.html
share/gtk-doc/html/poppler/api-index-0-18.html
+share/gtk-doc/html/poppler/api-index-0-20.html
share/gtk-doc/html/poppler/api-index-deprecated.html
share/gtk-doc/html/poppler/api-index-full.html
share/gtk-doc/html/poppler/ch01.html
Index: pkg/PLIST-qt4
===================================================================
RCS file: /cvs/ports/print/poppler/pkg/PLIST-qt4,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-qt4
--- pkg/PLIST-qt4 9 Oct 2010 08:05:30 -0000 1.4
+++ pkg/PLIST-qt4 11 Jul 2012 12:11:31 -0000
@@ -5,6 +5,7 @@ include/poppler/qt4/poppler-annotation.h
include/poppler/qt4/poppler-export.h
include/poppler/qt4/poppler-form.h
include/poppler/qt4/poppler-link.h
+include/poppler/qt4/poppler-media.h
include/poppler/qt4/poppler-optcontent.h
include/poppler/qt4/poppler-page-transition.h
include/poppler/qt4/poppler-qt4.h
Index: pkg/PLIST-utils
===================================================================
RCS file: /cvs/ports/print/poppler/pkg/PLIST-utils,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-utils
--- pkg/PLIST-utils 6 Jun 2012 18:27:34 -0000 1.1
+++ pkg/PLIST-utils 11 Jul 2012 12:11:31 -0000
@@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST-utils,v 1.1 2012/06/06 18:27:34 ajacoutot Exp $
@conflict xpdf-utils-*
-@pkgpath textproc/xpdf,-utils
@conflict poppler-<0.18.4p0
+@pkgpath textproc/xpdf,-utils
+@comment bin/pdfdetach
@bin bin/pdffonts
@bin bin/pdfimages
@bin bin/pdfinfo
@@ -12,6 +13,7 @@
@bin bin/pdftops
@bin bin/pdftotext
@bin bin/pdfunite
+@comment man/man1/pdfdetach.1
@man man/man1/pdffonts.1
@man man/man1/pdfimages.1
@man man/man1/pdfinfo.1
