aja@ wants a new poppler, so here's a preview update to 0.22.5.
Summaries of changes at http://poppler.freedesktop.org/releases.html
There's an incompatible change in the constructor of CTStream, so
libpoppler gets a moajor bump. I didn't spot any interface changes
or extensions in the other libraries, so no bumps here.
I also replaced the wantlib mess by a different wantlib mess.
Not yet tested seriously (except for building it, comparing build
logs, looking at diffs betwwen 0.22.2 and 0.22.5 etc.). I'll do
some real tests (on amd64) until next weekend.
Comments, test reports (and oks) are welcome.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.75
diff -u -p -r1.75 Makefile
--- Makefile 4 Jun 2013 18:41:56 -0000 1.75
+++ Makefile 17 Jun 2013 21:33:32 -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.22.2
+V= 0.22.5
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
@@ -14,7 +14,7 @@ PKGNAME-qt= poppler-qt-$V
PKGNAME-qt4= poppler-qt4-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 17.0 # 35.0
+SHARED_LIBS += poppler 18.0 # 37.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
@@ -73,23 +73,20 @@ LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} \
LIB_DEPENDS-qt4=${MODQT4_LIB_DEPENDS} \
print/poppler
-LIB_DEPENDS-utils=${MODGETTEXT_LIB_DEPENDS} \
- print/poppler
+LIB_DEPENDS-utils= print/poppler
-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 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= 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}
+WANTLIB-main= ${cWANTLIB} Xext ffi gio-2.0 glib-2.0 gmodule-2.0 \
+ gobject-2.0 pixman-1 openjpeg X11 Xrender cairo pcre \
+ png pthread-stubs xcb xcb-render lcms2 xcb-shm \
+ ${MODGETTEXT_WANTLIB}
+WANTLIB-qt= ${cWANTLIB} lcms2 openjpeg poppler png pthread-stubs \
+ ${MODQT3_WANTLIB}
+WANTLIB-qt4= ${cWANTLIB} ${MODQT4_WANTLIB} ICE QtGui QtXml SM X11 \
+ Xext Xi Xinerama Xrender lcms2 openjpeg png poppler \
+ pthread-stubs QtCore QtGui QtXml
+WANTLIB-utils= X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \
+ png pthread-stubs xcb xcb-render xcb-shm openjpeg \
+ poppler z ${cWANTLIB}
CONFIGURE_STYLE=autoconf
AUTOCONF_VERSION=2.69
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.26
diff -u -p -r1.26 distinfo
--- distinfo 19 Mar 2013 19:58:06 -0000 1.26
+++ distinfo 17 Jun 2013 21:33:32 -0000
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.22.2.tar.gz) = EIc274QGkxf2xb6stSaPO3mez0AeNT4jlhF3Lq6KZi0=
+SHA256 (poppler-0.22.5.tar.gz) = 90KjkPG/SmgkUvWWeOYa3TqPK5gQJKL2yrunkWl26Bg=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.22.2.tar.gz) = 2215737
+SIZE (poppler-0.22.5.tar.gz) = 2239107
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile_in
--- patches/patch-Makefile_in 27 Sep 2012 18:45:34 -0000 1.5
+++ patches/patch-Makefile_in 17 Jun 2013 21:33:32 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.5 2012/09/27 18:45:34 ajacoutot Exp $
---- Makefile.in.orig Mon Sep 10 19:33:11 2012
-+++ Makefile.in Thu Sep 27 18:19:15 2012
-@@ -312,6 +312,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
+--- Makefile.in.orig Sun Jun 16 18:24:09 2013
++++ Makefile.in Mon Jun 17 20:42:57 2013
+@@ -370,6 +370,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.5 2012/0
POPPLER_VERSION = @POPPLER_VERSION@
PTHREAD_CC = @PTHREAD_CC@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-@@ -368,6 +370,8 @@ infodir = @infodir@
+@@ -426,6 +428,8 @@ infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2012/0
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
-@@ -393,12 +397,14 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
+@@ -451,12 +455,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.5 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 \
-@@ -437,6 +443,7 @@ pkgconfig_DATA = \
+@@ -495,6 +501,7 @@ pkgconfig_DATA = \
$(cairo_pc_file) \
$(splash_pc_file) \
$(glib_pc_file) \
@@ -43,7 +43,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2012/0
$(qt4_pc_file) \
$(cpp_pc_file)
-@@ -508,6 +515,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
+@@ -566,6 +573,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.3
diff -u -p -r1.3 patch-aclocal_m4
--- patches/patch-aclocal_m4 19 Mar 2013 19:58:06 -0000 1.3
+++ patches/patch-aclocal_m4 17 Jun 2013 21:33:32 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-aclocal_m4,v 1.3 2013/03/19 19:58:06 kili Exp $
---- aclocal.m4.orig Mon Mar 11 18:47:31 2013
-+++ aclocal.m4 Sun Mar 17 23:41:08 2013
-@@ -2191,6 +2191,7 @@ m4_include([m4/define-dir.m4])
+--- aclocal.m4.orig Sun Jun 16 18:24:08 2013
++++ aclocal.m4 Mon Jun 17 20:42:57 2013
+@@ -2202,6 +2202,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.6
diff -u -p -r1.6 patch-configure_ac
--- patches/patch-configure_ac 19 Mar 2013 19:58:06 -0000 1.6
+++ patches/patch-configure_ac 17 Jun 2013 21:33:32 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.6 2013/03/19 19:58:06 kili Exp $
---- configure.ac.orig Mon Mar 11 18:45:38 2013
-+++ configure.ac Sun Mar 17 23:41:08 2013
-@@ -564,6 +564,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
+--- configure.ac.orig Sun Jun 16 18:22:02 2013
++++ configure.ac Mon Jun 17 20:42:57 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.6 2013/
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.6 2013/
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.6 2013/
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"
