Update to poppler-0.12.4.

Use the converters/libiconv MODULE (prompted by ajacoutot).

ok ajacoutot@, edd@ (except for the patch hunk move bits, but I
really prefer a silent `make update-patches')
This commit is contained in:
kili 2010-05-08 17:09:48 +00:00
parent 0876471306
commit 58d821bbc6
3 changed files with 24 additions and 19 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.30 2009/11/21 21:57:50 kili Exp $
# $OpenBSD: Makefile,v 1.31 2010/05/08 17:09:48 kili Exp $
COMMENT-main= PDF rendering library
COMMENT-qt= qt interface to PDF rendering library
COMMENT-qt4= qt4 interface to PDF rendering library
V= 0.12.2
V= 0.12.4
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
@ -65,22 +65,27 @@ QT4INC= -I${MODQT4_INCDIR}
WANTLIB= expat freetype fontconfig jpeg m z
MODULES+= devel/gettext
MODULES+= converters/libiconv devel/gettext
LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \
gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 \
lcms::graphics/lcms \
openjpeg::graphics/openjpeg \
xml2::textproc/libxml
LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} poppler::print/poppler
LIB_DEPENDS-qt4=QtCore,QtGui,QtXml::x11/qt4 poppler::print/poppler
LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} \
${MODLIBICONV_LIB_DEPENDS} \
poppler::print/poppler
LIB_DEPENDS-qt4=QtCore,QtGui,QtXml::x11/qt4 \
${MODLIBICONV_LIB_DEPENDS} \
poppler::print/poppler
WANTLIB-main= ${WANTLIB} Xcursor Xext Xfixes Xi Xinerama Xrandr gio-2.0 \
glib-2.0 gmodule-2.0 gobject-2.0 pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pixman-1 \
glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 pango-1.0 \
pangocairo-1.0 pangoft2-1.0 pixman-1 \
X11 Xau Xcomposite Xdamage Xdmcp Xrender cairo glitz pcre png \
pthread-stubs xcb
WANTLIB-qt= ${WANTLIB} iconv lcms xml2
WANTLIB-qt4= ${WANTLIB} iconv lcms xml2
pthread-stubs xcb xcb-render xcb-render-util
WANTLIB-qt= ${WANTLIB} lcms openjpeg xml2
WANTLIB-qt4= ${WANTLIB} lcms openjpeg xml2
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --enable-xpdf-headers \

View File

@ -1,5 +1,5 @@
MD5 (poppler-0.12.2.tar.gz) = YMALVaz33Tib8lbReK9wvw==
RMD160 (poppler-0.12.2.tar.gz) = 0sBv0jAS4WUFrl5eztfL1NA8Cyw=
SHA1 (poppler-0.12.2.tar.gz) = MTjEVvfmpCkQAQmsbNWpSEN7nwQ=
SHA256 (poppler-0.12.2.tar.gz) = vr+4wLCR9EAmoMDWF5CgSQsEs8ATL4K9CznoYb2vJxk=
SIZE (poppler-0.12.2.tar.gz) = 1614984
MD5 (poppler-0.12.4.tar.gz) = QVU0b5NpsZJWnOkYT/c+Qw==
RMD160 (poppler-0.12.4.tar.gz) = nCEuu4/D1MvFMvHIJkKMxNGVy1s=
SHA1 (poppler-0.12.4.tar.gz) = MGUH4Pv0dza0ViGGGPBDohbCY+8=
SHA256 (poppler-0.12.4.tar.gz) = KvoqVL1MywnpL4K2S8r6ldOaQEo7PbnWpfytDgIphXo=
SIZE (poppler-0.12.4.tar.gz) = 1674400

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-poppler_XRef_cc,v 1.5 2009/11/21 21:57:50 kili Exp $
--- poppler/XRef.cc.orig Sun Oct 18 00:23:09 2009
+++ poppler/XRef.cc Fri Nov 20 20:30:45 2009
@@ -856,45 +856,38 @@ void XRef::setEncryption(int permFlagsA, GBool ownerPa
$OpenBSD: patch-poppler_XRef_cc,v 1.6 2010/05/08 17:09:48 kili Exp $
--- poppler/XRef.cc.orig Sun Jan 17 01:06:57 2010
+++ poppler/XRef.cc Fri May 7 23:04:39 2010
@@ -881,45 +881,38 @@ void XRef::setEncryption(int permFlagsA, GBool ownerPa
}
GBool XRef::okToPrint(GBool ignoreOwnerPW) {