Hi,
I already sent this diff to Antoine last night, but now I can confirm
that it doesn't break any builds and that our pdf viewers using
poppler still work (tested on amd64).
Further tests and comments are welcome.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.87
diff -u -p -r1.87 Makefile
--- Makefile 1 Oct 2014 21:44:48 -0000 1.87
+++ Makefile 16 Nov 2014 22:58:52 -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.5
+V= 0.28.1
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
@@ -14,10 +14,10 @@ PKGNAME-qt= poppler-qt-$V
PKGNAME-qt4= poppler-qt4-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 22.0 # 46.0
+SHARED_LIBS += poppler 23.0 # 47.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
+SHARED_LIBS += poppler-qt4 14.0 # 9.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.37
diff -u -p -r1.37 distinfo
--- distinfo 1 Oct 2014 21:44:48 -0000 1.37
+++ distinfo 16 Nov 2014 21:27:25 -0000
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.26.5.tar.xz) = 3n3l+jN0MeXR83LoV3s3BzIvHbwdwopw8pJ0dvE00e4=
+SHA256 (poppler-0.28.1.tar.xz) = LM9uI0IJqlCCupnTVH5nmM2HWOepIccsAK7fDVeT/QY=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.26.5.tar.xz) = 1595232
+SIZE (poppler-0.28.1.tar.xz) = 1600332
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
retrieving revision 1.9
diff -u -p -r1.9 patch-Makefile_in
--- patches/patch-Makefile_in 10 Aug 2014 07:56:40 -0000 1.9
+++ patches/patch-Makefile_in 16 Nov 2014 22:46:15 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.9 2014/08/10 07:56:40 ajacoutot Exp $
---- Makefile.in.orig Sun Jul 20 18:22:03 2014
-+++ Makefile.in Thu Jul 24 11:09:52 2014
+--- Makefile.in.orig Tue Nov 4 19:46:21 2014
++++ Makefile.in Sun Nov 16 23:46:02 2014
@@ -376,6 +376,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.9 2014/0
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
-@@ -463,6 +467,8 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
+@@ -463,13 +467,15 @@ 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,16 +28,15 @@ $OpenBSD: patch-Makefile_in,v 1.9 2014/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
+ @BUILD_POPPLER_QT4_TRUE@qt4_pc_file = poppler-qt4.pc
@BUILD_POPPLER_CPP_TRUE@cpp_subdir = cpp
@BUILD_POPPLER_CPP_TRUE@cpp_pc_file = poppler-cpp.pc
- @BUILD_UTILS_TRUE@utils_subdir = utils
--SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir)
test $(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
-+SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir)
$(qt_subdir) test $(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
+-SUBDIRS = goo fofi $(splash_subdir) poppler utils $(glib_subdir) test
$(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
++SUBDIRS = goo fofi $(splash_subdir) poppler utils $(glib_subdir) test
$(qt_subdir) $(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
# 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 = \
+@@ -514,6 +520,7 @@ pkgconfig_DATA = \
$(cairo_pc_file) \
$(splash_pc_file) \
$(glib_pc_file) \
@@ -45,7 +44,7 @@ $OpenBSD: patch-Makefile_in,v 1.9 2014/0
$(qt4_pc_file) \
$(qt5_pc_file) \
$(cpp_pc_file)
-@@ -587,6 +594,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
+@@ -586,6 +593,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.10
diff -u -p -r1.10 patch-configure_ac
--- patches/patch-configure_ac 28 May 2014 19:45:54 -0000 1.10
+++ patches/patch-configure_ac 16 Nov 2014 22:46:15 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.10 2014/05/28 19:45:54 kili Exp $
---- 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)
+--- configure.ac.orig Tue Nov 4 19:45:17 2014
++++ configure.ac Sun Nov 16 23:41:54 2014
+@@ -563,6 +563,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.10 2014
dnl
dnl Try Qt4
dnl
-@@ -589,7 +607,7 @@ AC_SUBST(POPPLER_QT4_LIBS)
+@@ -595,7 +613,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.10 2014
AC_MSG_CHECKING([for Qt4 moc])
mocversion=`$MOCQT4 -v 2>&1`
mocversiongrep=`echo $mocversion | grep "Qt 4"`
-@@ -844,6 +862,9 @@ glib/reference/Makefile
+@@ -864,6 +882,9 @@ glib/reference/Makefile
glib/reference/version.xml
glib/demo/Makefile
test/Makefile
@@ -45,7 +45,7 @@ $OpenBSD: patch-configure_ac,v 1.10 2014
qt4/Makefile
qt4/src/Makefile
qt4/tests/Makefile
-@@ -876,6 +897,7 @@ echo "Building poppler with support for:"
+@@ -896,6 +917,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: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v
retrieving revision 1.20
diff -u -p -r1.20 PLIST-main
--- pkg/PLIST-main 10 Aug 2014 07:56:40 -0000 1.20
+++ pkg/PLIST-main 16 Nov 2014 23:03:41 -0000
@@ -198,7 +198,9 @@ 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-PDF-Utility-functions.html
share/gtk-doc/html/poppler/poppler-PopplerAction.html
+share/gtk-doc/html/poppler/poppler-PopplerColor.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
