Update to poppler-0.26.0.
This breaks graphics/inkscape (patch for this will follow in a
separate mail).
Everything else still builds fine on amd64 (tested with dpb -uR).
Runtime testing done with gummi and a couple of pdf viewers (evince,
epdfview, apvlv).
ok?
Ciao,
Kili
ps: the only relevant change in patches/ is patches/patch-glib_poppler_h
(which is kind of funny, because without it, the build fails); all
other changes are only context changes.
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.81
diff -u -p -r1.81 Makefile
--- Makefile 3 Jan 2014 13:50:04 -0000 1.81
+++ Makefile 28 Apr 2014 10:35:17 -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.24.5
+V= 0.26.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 20.0 # 44.0
-SHARED_LIBS += poppler-glib 13.0 # 14.0
+SHARED_LIBS += poppler 21.0 # 46.0
+SHARED_LIBS += poppler-glib 13.1 # 14.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
-SHARED_LIBS += poppler-qt4 13.0 # 7.0
-SHARED_LIBS += poppler-cpp 5.0 # 2.0
+SHARED_LIBS += poppler-qt4 13.1 # 8.0
+SHARED_LIBS += poppler-cpp 6.0 # 2.0
DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.32
diff -u -p -r1.32 distinfo
--- distinfo 3 Jan 2014 13:50:04 -0000 1.32
+++ distinfo 28 Apr 2014 10:35:17 -0000
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.24.5.tar.xz) = omVJEBAMkjxE42YkJJXiJtsnmCVPL6J4ETiGc0h1n4Q=
+SHA256 (poppler-0.26.0.tar.xz) = hUcDL8j/NLpfR7R+3f5n0PL/D/zc9dGJ9S3FFncMYh8=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.24.5.tar.xz) = 1512476
+SIZE (poppler-0.26.0.tar.xz) = 1591180
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-Makefile_in
--- patches/patch-Makefile_in 15 Aug 2013 18:40:20 -0000 1.7
+++ patches/patch-Makefile_in 28 Apr 2014 10:35:17 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.7 2013/08/15 18:40:20 kili Exp $
---- Makefile.in.orig Mon Jul 29 19:13:28 2013
-+++ Makefile.in Sat Aug 3 22:06:57 2013
-@@ -376,6 +376,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
+--- Makefile.in.orig Fri Apr 25 00:42:56 2014
++++ Makefile.in Sun Apr 27 12:07:50 2014
+@@ -377,6 +377,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.7 2013/0
POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
-@@ -438,6 +440,8 @@ infodir = @infodir@
+@@ -439,6 +441,8 @@ infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2013/0
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
-@@ -463,6 +467,8 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
+@@ -464,6 +468,8 @@ 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
@@ -28,7 +28,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2013/0
@BUILD_POPPLER_QT5_TRUE@qt5_subdir = qt5
@BUILD_POPPLER_QT5_TRUE@qt5_pc_file = poppler-qt5.pc
@BUILD_POPPLER_QT4_TRUE@qt4_subdir = qt4
-@@ -470,7 +476,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
+@@ -471,7 +477,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
@BUILD_POPPLER_CPP_TRUE@cpp_subdir = cpp
@BUILD_POPPLER_CPP_TRUE@cpp_pc_file = poppler-cpp.pc
@BUILD_UTILS_TRUE@utils_subdir = utils
@@ -37,7 +37,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2013/0
# Add CMake buildsystem files here so they get added on make dist
EXTRA_DIST = README-XPDF poppler.pc.in poppler-uninstalled.pc.in \
-@@ -515,6 +521,7 @@ pkgconfig_DATA = \
+@@ -516,6 +522,7 @@ pkgconfig_DATA = \
$(cairo_pc_file) \
$(splash_pc_file) \
$(glib_pc_file) \
@@ -45,7 +45,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2013/0
$(qt4_pc_file) \
$(qt5_pc_file) \
$(cpp_pc_file)
-@@ -587,6 +594,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
+@@ -588,6 +595,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-configure_ac
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v
retrieving revision 1.8
diff -u -p -r1.8 patch-configure_ac
--- patches/patch-configure_ac 15 Aug 2013 18:40:20 -0000 1.8
+++ patches/patch-configure_ac 28 Apr 2014 10:35:17 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.8 2013/08/15 18:40:20 kili Exp $
---- configure.ac.orig Mon Jul 29 19:10:39 2013
-+++ configure.ac Sat Aug 3 22:05:07 2013
-@@ -569,6 +569,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
+--- configure.ac.orig Fri Apr 25 00:40:07 2014
++++ configure.ac Sun Apr 27 12:07:50 2014
+@@ -554,6 +554,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.8 2013/
dnl
dnl Try Qt4
dnl
-@@ -601,7 +619,7 @@ AC_SUBST(POPPLER_QT4_LIBS)
+@@ -586,7 +604,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.8 2013/
AC_MSG_CHECKING([for Qt4 moc])
mocversion=`$MOCQT4 -v 2>&1`
mocversiongrep=`echo $mocversion | grep "Qt 4"`
-@@ -856,6 +874,9 @@ glib/reference/Makefile
+@@ -841,6 +859,9 @@ glib/reference/Makefile
glib/reference/version.xml
glib/demo/Makefile
test/Makefile
@@ -45,7 +45,7 @@ $OpenBSD: patch-configure_ac,v 1.8 2013/
qt4/Makefile
qt4/src/Makefile
qt4/tests/Makefile
-@@ -888,6 +909,7 @@ echo "Building poppler with support for:"
+@@ -873,6 +894,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-glib_poppler_h
===================================================================
RCS file: patches/patch-glib_poppler_h
diff -N patches/patch-glib_poppler_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-glib_poppler_h 28 Apr 2014 10:35:17 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+This typedef is already in poppler-structure-element.h, which is
+#included by poppler.h.
+
+--- glib/poppler.h.orig Sun Feb 9 23:08:52 2014
++++ glib/poppler.h Sun Apr 27 12:43:33 2014
+@@ -210,7 +210,6 @@ typedef struct _PopplerAnnotSquare PopplerAnno
+ typedef struct _PopplerQuadrilateral PopplerQuadrilateral;
+ typedef struct _PopplerStructureElement PopplerStructureElement;
+ typedef struct _PopplerStructureElementIter PopplerStructureElementIter;
+-typedef struct _PopplerTextSpan PopplerTextSpan;
+
+ typedef enum
+ {
Index: patches/patch-poppler_XRef_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.12
diff -u -p -r1.12 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc 15 Aug 2013 18:40:20 -0000 1.12
+++ patches/patch-poppler_XRef_cc 28 Apr 2014 10:35:17 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-poppler_XRef_cc,v 1.12 2013/08/15 18:40:20 kili Exp $
---- poppler/XRef.cc.orig Thu Jun 6 01:04:53 2013
-+++ poppler/XRef.cc Sat Aug 3 22:05:07 2013
-@@ -1075,49 +1075,38 @@ void XRef::getEncryptionParameters(Guchar **fileKeyA,
+--- poppler/XRef.cc.orig Sun Apr 6 16:08:14 2014
++++ poppler/XRef.cc Sun Apr 27 12:07:49 2014
+@@ -1076,49 +1076,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.18
diff -u -p -r1.18 PLIST-main
--- pkg/PLIST-main 14 Sep 2013 09:52:00 -0000 1.18
+++ pkg/PLIST-main 28 Apr 2014 10:35:17 -0000
@@ -34,6 +34,7 @@ include/poppler/Lexer.h
include/poppler/Linearization.h
include/poppler/Link.h
include/poppler/LocalPDFDocBuilder.h
+include/poppler/MarkedContentOutputDev.h
include/poppler/Movie.h
include/poppler/NameToCharCode.h
include/poppler/NameToUnicodeTable.h
@@ -61,6 +62,8 @@ include/poppler/StdinCachedFile.h
include/poppler/StdinPDFDocBuilder.h
include/poppler/Stream-CCITT.h
include/poppler/Stream.h
+include/poppler/StructElement.h
+include/poppler/StructTreeRoot.h
include/poppler/TextOutputDev.h
include/poppler/UTF.h
include/poppler/UTF8.h
@@ -105,6 +108,7 @@ include/poppler/glib/poppler-layer.h
include/poppler/glib/poppler-media.h
include/poppler/glib/poppler-movie.h
include/poppler/glib/poppler-page.h
+include/poppler/glib/poppler-structure-element.h
include/poppler/glib/poppler.h
include/poppler/goo/
include/poppler/goo/FixedPoint.h
@@ -116,6 +120,7 @@ include/poppler/goo/GooString.h
include/poppler/goo/GooTimer.h
include/poppler/goo/ImgWriter.h
include/poppler/goo/JpegWriter.h
+include/poppler/goo/NetPBMWriter.h
include/poppler/goo/PNGWriter.h
include/poppler/goo/TiffWriter.h
include/poppler/goo/gfile.h
@@ -178,6 +183,7 @@ share/gtk-doc/html/poppler/PopplerLayer.
share/gtk-doc/html/poppler/PopplerMedia.html
share/gtk-doc/html/poppler/PopplerMovie.html
share/gtk-doc/html/poppler/PopplerPage.html
+share/gtk-doc/html/poppler/PopplerStructureElement.html
share/gtk-doc/html/poppler/annotation-glossary.html
share/gtk-doc/html/poppler/api-index-0-12.html
share/gtk-doc/html/poppler/api-index-0-14.html
@@ -191,11 +197,14 @@ share/gtk-doc/html/poppler/ch01.html
share/gtk-doc/html/poppler/home.png
share/gtk-doc/html/poppler/index.html
share/gtk-doc/html/poppler/index.sgml
+share/gtk-doc/html/poppler/left-insensitive.png
share/gtk-doc/html/poppler/left.png
share/gtk-doc/html/poppler/poppler-PopplerAction.html
share/gtk-doc/html/poppler/poppler-Version-and-Features-Information.html
share/gtk-doc/html/poppler/poppler-poppler.html
share/gtk-doc/html/poppler/poppler.devhelp2
+share/gtk-doc/html/poppler/right-insensitive.png
share/gtk-doc/html/poppler/right.png
share/gtk-doc/html/poppler/style.css
+share/gtk-doc/html/poppler/up-insensitive.png
share/gtk-doc/html/poppler/up.png
