Update to poppler-0.30.0.

ok aja@
This commit is contained in:
kili 2015-01-07 14:53:01 +00:00
parent b4c779c89b
commit 307c6dd3c6
4 changed files with 22 additions and 18 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.90 2014/12/13 19:02:07 kili Exp $
# $OpenBSD: Makefile,v 1.91 2015/01/07 14:53:01 kili Exp $
COMMENT-main= PDF rendering library
COMMENT-qt= qt interface to PDF rendering library
COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
V= 0.29.0
V= 0.30.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 24.0 # 48.0
SHARED_LIBS += poppler 25.0 # 49.0
SHARED_LIBS += poppler-glib 13.1 # 14.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
SHARED_LIBS += poppler-qt4 14.0 # 9.0
SHARED_LIBS += poppler-cpp 6.0 # 2.0
SHARED_LIBS += poppler-cpp 6.1 # 2.1
DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz

View File

@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
SHA256 (poppler-0.29.0.tar.xz) = PB4W3I1dhG0IW69lhE7T4Fy95dRPZoL58eKxINZsYsQ=
SHA256 (poppler-0.30.0.tar.xz) = thbuhp0LH4p6LHHPNG9Vwb/2JMzkut6+F/UG7Izn3fU=
SIZE (poppler-0.16.7.tar.gz) = 1952179
SIZE (poppler-0.29.0.tar.xz) = 1600980
SIZE (poppler-0.30.0.tar.xz) = 1605292

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.12 2014/12/13 19:02:07 kili Exp $
--- configure.ac.orig Thu Dec 4 22:52:06 2014
+++ configure.ac Mon Dec 8 10:41:54 2014
@@ -563,6 +563,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
$OpenBSD: patch-configure_ac,v 1.13 2015/01/07 14:53:01 kili Exp $
--- configure.ac.orig Sun Jan 4 23:15:57 2015
+++ configure.ac Mon Jan 5 14:19:19 2015
@@ -590,6 +590,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.12 2014/12/13 19:02:07 kili Exp $
dnl
dnl Try Qt4
dnl
@@ -595,7 +613,7 @@ AC_SUBST(POPPLER_QT4_LIBS)
@@ -622,7 +640,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.12 2014/12/13 19:02:07 kili Exp $
AC_MSG_CHECKING([for Qt4 moc])
mocversion=`$MOCQT4 -v 2>&1`
mocversiongrep=`echo $mocversion | grep "Qt 4"`
@@ -866,6 +884,9 @@ glib/reference/Makefile
@@ -907,6 +925,9 @@ glib/reference/Makefile
glib/reference/version.xml
glib/demo/Makefile
test/Makefile
@ -45,7 +45,7 @@ $OpenBSD: patch-configure_ac,v 1.12 2014/12/13 19:02:07 kili Exp $
qt4/Makefile
qt4/src/Makefile
qt4/tests/Makefile
@@ -898,6 +919,7 @@ echo "Building poppler with support for:"
@@ -939,6 +960,7 @@ echo "Building poppler with support for:"
echo " font configuration: $with_font_configuration"
echo " splash output: $enable_splash_output"
echo " cairo output: $use_cairo"

View File

@ -1,12 +1,16 @@
$OpenBSD: patch-qt_poppler-document_cc,v 1.1 2012/07/13 15:04:46 kili Exp $
--- qt/poppler-document.cc.orig Mon Jul 9 19:01:04 2012
+++ qt/poppler-document.cc Mon Jul 9 22:37:00 2012
@@ -326,7 +326,7 @@ bool Document::print(const QString &fileName, QValueLi
$OpenBSD: patch-qt_poppler-document_cc,v 1.2 2015/01/07 14:53:01 kili Exp $
--- qt/poppler-document.cc.orig Mon Jan 5 14:53:48 2015
+++ qt/poppler-document.cc Mon Jan 5 15:02:20 2015
@@ -326,7 +326,11 @@ bool Document::print(const QString &fileName, QValueLi
bool Document::print(const QString &file, QValueList<int> pageList, double hDPI, double vDPI, int rotate, int paperWidth, int paperHeight)
{
- PSOutputDev *psOut = new PSOutputDev(file.latin1(), &(data->doc), data->doc.getXRef(), data->doc.getCatalog(), NULL, 1, data->doc.getNumPages(), psModePS, paperWidth, paperHeight);
+ PSOutputDev *psOut = new PSOutputDev(file.latin1(), &(data->doc), NULL, 1, data->doc.getNumPages(), psModePS, paperWidth, paperHeight);
+ std::vector<int> pages;
+ for (int i = 1; i <= data->doc.getNumPages(); ++i) {
+ pages.push_back(i);
+ }
+ PSOutputDev *psOut = new PSOutputDev(file.latin1(), &(data->doc), NULL, pages, psModePS, paperWidth, paperHeight);
if (psOut->isOk()) {
QValueList<int>::iterator it;