Hi,
here's an update to poppler-0.24.0. I didn't yet test it to death,
but I hope to do so during this week. It currently breaks
print/cups-filters (for which I'll send a fix in a few minutes) and
textproc/calibre.
It *may* break editors/libreoffice, which I refuse to give a try
here because of thermal problems (it's too fucking hot at my place).
General tests, tests for the -qt flavor (used by kdegraphics and
koffice) and suggestions (or even diffs) for calibre are welcome.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.76
diff -u -p -r1.76 Makefile
--- Makefile 22 Jun 2013 20:16:46 -0000 1.76
+++ Makefile 5 Aug 2013 11:29:47 -0000
@@ -5,22 +5,22 @@ 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.5
+V= 0.24.0
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
PKGNAME-utils= poppler-utils-$V
PKGNAME-qt= poppler-qt-$V
PKGNAME-qt4= poppler-qt4-$V
-OLDSHIT = poppler-0.16.7
+OLDSHIT = poppler-0.16.7
-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
-SHARED_LIBS += poppler-cpp 4.0 # 2.0
+SHARED_LIBS += poppler 19.0 # 43.0
+SHARED_LIBS += poppler-glib 13.0 # 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
-DISTFILES = ${DISTNAME}${EXTRACT_SUFX} ${OLDSHIT}${EXTRACT_SUFX}
+DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
HOMEPAGE= http://poppler.freedesktop.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.27
diff -u -p -r1.27 distinfo
--- distinfo 22 Jun 2013 20:16:46 -0000 1.27
+++ distinfo 5 Aug 2013 11:29:47 -0000
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.22.5.tar.gz) = 90KjkPG/SmgkUvWWeOYa3TqPK5gQJKL2yrunkWl26Bg=
+SHA256 (poppler-0.24.0.tar.xz) = vcUX6mSKP47L4HRaeftsv5p+LvZH1hVhVESc9QxtDCE=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.22.5.tar.gz) = 2239107
+SIZE (poppler-0.24.0.tar.xz) = 1503420
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-Makefile_in
--- patches/patch-Makefile_in 22 Jun 2013 20:16:46 -0000 1.6
+++ patches/patch-Makefile_in 5 Aug 2013 11:29:47 -0000
@@ -1,16 +1,16 @@
$OpenBSD: patch-Makefile_in,v 1.6 2013/06/22 20:16:46 kili Exp $
---- 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@
+--- 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@
POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT_CXXFLAGS = @POPPLER_QT_CXXFLAGS@
+POPPLER_QT_LIBS = @POPPLER_QT_LIBS@
- POPPLER_VERSION = @POPPLER_VERSION@
- PTHREAD_CC = @PTHREAD_CC@
- PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-@@ -426,6 +428,8 @@ infodir = @infodir@
+ POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+ POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+ POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+@@ -438,6 +440,8 @@ infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -19,31 +19,33 @@ $OpenBSD: patch-Makefile_in,v 1.6 2013/0
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
-@@ -451,12 +455,14 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
+@@ -463,6 +467,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
+@BUILD_POPPLER_QT_TRUE@qt_subdir = qt
+@BUILD_POPPLER_QT_TRUE@qt_pc_file = poppler-qt.pc
+ @BUILD_POPPLER_QT5_TRUE@qt5_subdir = qt5
+ @BUILD_POPPLER_QT5_TRUE@qt5_pc_file = poppler-qt5.pc
@BUILD_POPPLER_QT4_TRUE@qt4_subdir = qt4
- @BUILD_POPPLER_QT4_TRUE@qt4_pc_file = poppler-qt4.pc
+@@ -470,7 +476,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
--SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir)
test $(qt4_subdir) $(cpp_subdir)
-+SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir)
$(qt_subdir) test $(qt4_subdir) $(cpp_subdir)
+-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)
# Add CMake buildsystem files here so they get added on make dist
EXTRA_DIST = README-XPDF poppler.pc.in poppler-uninstalled.pc.in \
-@@ -495,6 +501,7 @@ pkgconfig_DATA = \
+@@ -515,6 +521,7 @@ pkgconfig_DATA = \
$(cairo_pc_file) \
$(splash_pc_file) \
$(glib_pc_file) \
+ $(qt_pc_file) \
$(qt4_pc_file) \
+ $(qt5_pc_file) \
$(cpp_pc_file)
-
-@@ -566,6 +573,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
+@@ -587,6 +594,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.7
diff -u -p -r1.7 patch-configure_ac
--- patches/patch-configure_ac 22 Jun 2013 20:16:46 -0000 1.7
+++ patches/patch-configure_ac 5 Aug 2013 11:29:47 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.7 2013/06/22 20:16:46 kili Exp $
---- 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)
+--- 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)
GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
@@ -26,7 +26,7 @@ $OpenBSD: patch-configure_ac,v 1.7 2013/
dnl
dnl Try Qt4
dnl
-@@ -597,7 +615,7 @@ AC_SUBST(POPPLER_QT4_LIBS)
+@@ -601,7 +619,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.7 2013/
AC_MSG_CHECKING([for Qt4 moc])
mocversion=`$MOCQT4 -v 2>&1`
mocversiongrep=`echo $mocversion | grep "Qt 4"`
-@@ -783,6 +801,9 @@ glib/reference/Makefile
+@@ -856,6 +874,9 @@ glib/reference/Makefile
glib/reference/version.xml
glib/demo/Makefile
test/Makefile
@@ -45,11 +45,11 @@ $OpenBSD: patch-configure_ac,v 1.7 2013/
qt4/Makefile
qt4/src/Makefile
qt4/tests/Makefile
-@@ -809,6 +830,7 @@ echo "Building poppler with support for:"
+@@ -888,6 +909,7 @@ echo "Building poppler with support for:"
echo " font configuration: $with_font_configuration"
echo " splash output: $enable_splash_output"
echo " cairo output: $use_cairo"
+echo " qt wrapper: $enable_poppler_qt"
echo " qt4 wrapper: $enable_poppler_qt4"
+ echo " qt5 wrapper: $enable_poppler_qt5"
echo " glib wrapper: $use_glib"
- echo " introspection: $found_introspection"
Index: patches/patch-poppler_XRef_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.11
diff -u -p -r1.11 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc 21 Jan 2013 19:08:00 -0000 1.11
+++ patches/patch-poppler_XRef_cc 5 Aug 2013 11:29:47 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-poppler_XRef_cc,v 1.11 2013/01/21 19:08:00 kili Exp $
---- 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,
+--- 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,
}
GBool XRef::okToPrint(GBool ignoreOwnerPW) {
Index: patches/patch-qt_poppler-page_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-qt_poppler-page_cc,v
retrieving revision 1.2
diff -u -p -r1.2 patch-qt_poppler-page_cc
--- patches/patch-qt_poppler-page_cc 13 Jul 2012 15:03:19 -0000 1.2
+++ patches/patch-qt_poppler-page_cc 5 Aug 2013 11:29:47 -0000
@@ -1,7 +1,27 @@
$OpenBSD: patch-qt_poppler-page_cc,v 1.2 2012/07/13 15:03:19 kili Exp $
---- qt/poppler-page.cc.orig Mon Jul 9 19:01:04 2012
-+++ qt/poppler-page.cc Mon Jul 9 23:02:19 2012
-@@ -124,7 +124,7 @@ QString Page::getText(const Rectangle &r) const
+--- qt/poppler-page.cc.orig Sat Aug 3 22:54:43 2013
++++ qt/poppler-page.cc Sun Aug 4 23:07:10 2013
+@@ -74,7 +74,10 @@ QImage Page::renderToImage(double xres, double yres, b
+ SplashOutputDev *output_dev;
+ SplashBitmap *bitmap;
+ SplashColorPtr color_ptr;
++ XRef *xref;
++
+ output_dev = data->doc->data->getOutputDev();
++ xref = data->doc->data->doc.getXRef(); // OMFG
+
+ data->doc->data->doc.displayPageSlice(output_dev, data->index + 1, xres,
yres,
+ 0, false, true, false, -1, -1, -1, -1);
+@@ -104,7 +107,7 @@ QImage Page::renderToImage(double xres, double yres, b
+ QImage img( dataPtr, bw, bh, 32, 0, 0, QImage::IgnoreEndian );
+ img = img.copy();
+ // unload underlying xpdf bitmap
+- output_dev->startPage( 0, NULL );
++ output_dev->startPage( 0, NULL, xref);
+
+ return img;
+ #else
+@@ -124,7 +127,7 @@ QString Page::getText(const Rectangle &r) const
QString result;
::Page *p;
@@ -10,7 +30,7 @@ $OpenBSD: patch-qt_poppler-page_cc,v 1.2
data->doc->data->doc.displayPageSlice(output_dev, data->index + 1, 72, 72,
0, false, false, false, -1, -1, -1, -1);
p = data->page;
-@@ -155,7 +155,7 @@ QValueList<TextBox*> Page::textList() const
+@@ -155,7 +158,7 @@ QValueList<TextBox*> Page::textList() const
QValueList<TextBox*> output_list;
@@ -19,7 +39,7 @@ $OpenBSD: patch-qt_poppler-page_cc,v 1.2
data->doc->data->doc.displayPageSlice(output_dev, data->index + 1, 72, 72,
0, false, false, false, -1, -1, -1, -1);
-@@ -239,7 +239,7 @@ QValueList<Link*> Page::links() const
+@@ -239,7 +242,7 @@ QValueList<Link*> Page::links() const
Links *xpdfLinks = data->doc->data->doc.getLinks(data->index + 1);
for (int i = 0; i < xpdfLinks->getNumLinks(); ++i)
{
