Minor update to poppler-0.26.1, plus some wantlib adjustion.
core:
* Use field value V for radio buttons. Bug #75979
* Fix extraction of text in some files. Bug #78145
* Only add annotations of the current page when splitting.
Bug #77549
build system:
* autoconf: Fix libopenjpeg 1.5 detection on some systems.
Bug #78389
glib:
* Fix multiple definition of PopplerTextSpan
Everything still builds fine. Test and comments are welcome.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.82
diff -u -p -r1.82 Makefile
--- Makefile 28 Apr 2014 16:48:27 -0000 1.82
+++ Makefile 27 May 2014 19:06: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.26.0
+V= 0.26.1
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 21.0 # 46.0
+SHARED_LIBS += poppler 21.1 # 46.0
SHARED_LIBS += poppler-glib 13.1 # 14.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
SHARED_LIBS += poppler-qt4 13.1 # 8.0
@@ -84,9 +84,10 @@ WANTLIB-main= ${cWANTLIB} Xext ffi gio-2
${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-qt4= ${cWANTLIB} ${MODQT4_WANTLIB} ICE QtCore QtGui QtXml \
+ SM X11 Xext Xi Xinerama Xrender ffi glib-2.0 \
+ gobject-2.0 gthread-2.0 iconv intl lcms2 openjpeg \
+ png poppler pcre pthread-stubs xcb
WANTLIB-utils= X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \
png pthread-stubs xcb xcb-render xcb-shm openjpeg \
poppler z ${cWANTLIB}
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.33
diff -u -p -r1.33 distinfo
--- distinfo 28 Apr 2014 16:48:27 -0000 1.33
+++ distinfo 27 May 2014 18:35:07 -0000
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.26.0.tar.xz) = hUcDL8j/NLpfR7R+3f5n0PL/D/zc9dGJ9S3FFncMYh8=
+SHA256 (poppler-0.26.1.tar.xz) = yMlZw/YFoX7SHiz+wtk3m+XgyAHbTtrV57LkSmzvIUw=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.26.0.tar.xz) = 1591180
+SIZE (poppler-0.26.1.tar.xz) = 1592884
Index: patches/patch-aclocal_m4
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-aclocal_m4,v
retrieving revision 1.6
diff -u -p -r1.6 patch-aclocal_m4
--- patches/patch-aclocal_m4 17 Dec 2013 18:48:25 -0000 1.6
+++ patches/patch-aclocal_m4 27 May 2014 18:35:54 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-aclocal_m4,v 1.6 2013/12/17 18:48:25 kili Exp $
---- aclocal.m4.orig Wed Nov 27 00:17:01 2013
-+++ aclocal.m4 Fri Dec 13 22:01:25 2013
-@@ -2315,6 +2315,7 @@ m4_include([m4/define-dir.m4])
+--- aclocal.m4.orig Fri May 23 20:10:53 2014
++++ aclocal.m4 Tue May 27 20:35:49 2014
+@@ -2370,6 +2370,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.9
diff -u -p -r1.9 patch-configure_ac
--- patches/patch-configure_ac 28 Apr 2014 16:48:27 -0000 1.9
+++ patches/patch-configure_ac 27 May 2014 18:35:54 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.9 2014/04/28 16:48:27 kili Exp $
---- 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)
+--- configure.ac.orig Fri May 23 20:05:06 2014
++++ configure.ac Tue May 27 20:35:49 2014
+@@ -557,6 +557,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.9 2014/
dnl
dnl Try Qt4
dnl
-@@ -586,7 +604,7 @@ AC_SUBST(POPPLER_QT4_LIBS)
+@@ -589,7 +607,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.9 2014/
AC_MSG_CHECKING([for Qt4 moc])
mocversion=`$MOCQT4 -v 2>&1`
mocversiongrep=`echo $mocversion | grep "Qt 4"`
-@@ -841,6 +859,9 @@ glib/reference/Makefile
+@@ -844,6 +862,9 @@ glib/reference/Makefile
glib/reference/version.xml
glib/demo/Makefile
test/Makefile
@@ -45,7 +45,7 @@ $OpenBSD: patch-configure_ac,v 1.9 2014/
qt4/Makefile
qt4/src/Makefile
qt4/tests/Makefile
-@@ -873,6 +894,7 @@ echo "Building poppler with support for:"
+@@ -876,6 +897,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
--- patches/patch-glib_poppler_h 28 Apr 2014 16:48:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-glib_poppler_h,v 1.1 2014/04/28 16:48:27 kili Exp $
-
-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
- {
