Update to poppler-0.22.0.
I successfully built the following ports with it on amd64:
editors/gummi
editors/texmaker
editors/texworks,-main
graphics/evince,-main
graphics/gimp/stable
graphics/inkscape
print/apvlv
print/epdfview
print/py-poppler
print/texlive/base
productivity/impressive
textproc/calibre
textproc/zathura
x11/kde/graphics3,-main
x11/kde/office3
x11/xfce4/tumbler
Tested gummi, evince, aplvl, epdfview, impressive, zathura, tumbler.
This one needs a patch I'll send in a separate mail:
print/cups-filters
I did not yet even try to build editors/libreoffice with it.
Please test/comment/ok.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- Makefile 5 Nov 2012 19:32:27 -0000 1.70
+++ Makefile 19 Jan 2013 19:08:40 -0000
@@ -5,24 +5,20 @@ COMMENT-qt= qt interface to PDF renderin
COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.20.5
+V= 0.22.0
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
-REVISION-main= 0
PKGNAME-utils= poppler-utils-$V
-REVISION-utils= 0
PKGNAME-qt= poppler-qt-$V
-REVISION-qt= 0
PKGNAME-qt4= poppler-qt4-$V
-REVISION-qt4= 0
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 15.0 # 28.0
-SHARED_LIBS += poppler-glib 11.0 # 12.0
-SHARED_LIBS += poppler-qt 10.0 # 3.0
-SHARED_LIBS += poppler-qt4 11.0 # 4.0
-SHARED_LIBS += poppler-cpp 3.0 # 2.0
+SHARED_LIBS += poppler 16.0 # 34.0
+SHARED_LIBS += poppler-glib 12.0 # 14.0
+SHARED_LIBS += poppler-qt 11.0 # 3.0
+SHARED_LIBS += poppler-qt4 12.0 # 6.0
+SHARED_LIBS += poppler-cpp 4.0 # 2.0
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} ${OLDSHIT}${EXTRACT_SUFX}
@@ -83,17 +79,17 @@ LIB_DEPENDS-qt4=${MODQT4_LIB_DEPENDS} \
LIB_DEPENDS-utils=${MODGETTEXT_LIB_DEPENDS} \
print/poppler
-WANTLIB-main= ${cWANTLIB} Xext Xfixes ffi \
- glib-2.0 gobject-2.0 gthread-2.0 \
+WANTLIB-main= ${cWANTLIB} Xext ffi \
+ gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
pixman-1 openjpeg \
- X11 Xau Xdamage Xdmcp Xrender cairo pcre png \
- pthread-stubs xcb xcb-render lcms2 GL Xxf86vm \
- drm xcb-shm ${MODGETTEXT_WANTLIB}
+ X11 Xau Xdmcp Xrender cairo pcre png \
+ pthread-stubs xcb xcb-render lcms2 \
+ xcb-shm ${MODGETTEXT_WANTLIB}
WANTLIB-qt= ${cWANTLIB} lcms2 openjpeg poppler png ${MODQT3_WANTLIB}
WANTLIB-qt4= ${cWANTLIB} ${MODQT4_WANTLIB} ICE QtGui QtXml SM X11 Xext Xi \
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 \
+WANTLIB-utils= X11 Xau Xdmcp Xext Xrender \
+ c cairo expat ffi fontconfig freetype glib-2.0 \
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.24
diff -u -p -r1.24 distinfo
--- distinfo 15 Oct 2012 17:44:33 -0000 1.24
+++ distinfo 19 Jan 2013 19:08:40 -0000
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.20.5.tar.gz) = xtcEil8BHb3h9XnSG8/dZStHLZ0cYH3emqie/5YEVLY=
+SHA256 (poppler-0.22.0.tar.gz) = hGhFCRwtEl9bYDaA1ieoAHmoK5PRmfNMxJc2utXVueY=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.20.5.tar.gz) = 2158387
+SIZE (poppler-0.22.0.tar.gz) = 2210986
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure_ac
--- patches/patch-configure_ac 13 Jul 2012 15:03:19 -0000 1.4
+++ patches/patch-configure_ac 19 Jan 2013 19:08:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.4 2012/07/13 15:03:19 kili Exp $
---- 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)
+--- configure.ac.orig Sat Dec 29 19:45:50 2012
++++ configure.ac Fri Jan 18 19:23:07 2013
+@@ -565,6 +565,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.4 2012/
dnl
dnl Try Qt4
dnl
-@@ -596,7 +614,7 @@ AC_SUBST(POPPLER_QT4_LIBS)
+@@ -597,7 +615,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.4 2012/
AC_MSG_CHECKING([for Qt4 moc])
mocversion=`$MOCQT4 -v 2>&1`
mocversiongrep=`echo $mocversion | grep "Qt 4"`
-@@ -782,6 +800,9 @@ glib/reference/Makefile
+@@ -783,6 +801,9 @@ glib/reference/Makefile
glib/reference/version.xml
glib/demo/Makefile
test/Makefile
@@ -45,7 +45,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2012/
qt4/Makefile
qt4/src/Makefile
qt4/tests/Makefile
-@@ -808,6 +829,7 @@ echo "Building poppler with support for:"
+@@ -809,6 +830,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-poppler_XRef_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.10
diff -u -p -r1.10 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc 27 Sep 2012 18:45:34 -0000 1.10
+++ patches/patch-poppler_XRef_cc 19 Jan 2013 19:08:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-poppler_XRef_cc,v 1.10 2012/09/27 18:45:34 ajacoutot Exp $
---- poppler/XRef.cc.orig Sun Sep 9 23:33:55 2012
-+++ poppler/XRef.cc Thu Sep 27 18:19:11 2012
-@@ -945,49 +945,38 @@ void XRef::setEncryption(int permFlagsA, GBool ownerPa
+--- poppler/XRef.cc.orig Fri Dec 28 01:17:03 2012
++++ poppler/XRef.cc Fri Jan 18 19:23:05 2013
+@@ -976,49 +976,38 @@ void XRef::getEncryptionParameters(Guchar **fileKeyA,
}
GBool XRef::okToPrint(GBool ignoreOwnerPW) {
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST-main
--- pkg/PLIST-main 13 Jul 2012 15:03:19 -0000 1.16
+++ pkg/PLIST-main 19 Jan 2013 19:08:40 -0000
@@ -63,6 +63,7 @@ include/poppler/StdinPDFDocBuilder.h
include/poppler/Stream-CCITT.h
include/poppler/Stream.h
include/poppler/TextOutputDev.h
+include/poppler/UTF.h
include/poppler/UTF8.h
include/poppler/UnicodeCClassTables.h
include/poppler/UnicodeCompTables.h
@@ -120,6 +121,7 @@ include/poppler/goo/PNGWriter.h
include/poppler/goo/TiffWriter.h
include/poppler/goo/gfile.h
include/poppler/goo/gmem.h
+include/poppler/goo/grandom.h
include/poppler/goo/gstrtod.h
include/poppler/goo/gtypes.h
include/poppler/poppler-config.h
@@ -180,6 +182,7 @@ share/gtk-doc/html/poppler/api-index-0-1
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-0-22.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
