cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to poppler-0.16.5.

Browse Source 
Gnome introspection disabled for now (doesn't compile with gcc-3).
This commit is contained in:
kili 2011-06-04 19:03:19 +00:00
parent 36aaaa2b3f
commit f8fcf38000
6 changed files with 43 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
print/poppler/Makefile
View File

@ -1,26 +1,25 @@
# $OpenBSD: Makefile,v 1.47 2011/06/02 17:09:32 kili Exp $ # $OpenBSD: Makefile,v 1.48 2011/06/04 19:03:19 kili Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
COMMENT-main= PDF rendering library COMMENT-main= PDF rendering library
COMMENT-qt= qt interface to PDF rendering library COMMENT-qt= qt interface to PDF rendering library
COMMENT-qt4= qt4 interface to PDF rendering library COMMENT-qt4= qt4 interface to PDF rendering library
V= 0.14.5 V= 0.16.5
DISTNAME= poppler-$V DISTNAME= poppler-$V
CATEGORIES= print CATEGORIES= print
PKGNAME-main= poppler-$V PKGNAME-main= poppler-$V
REVISION-main= 2
FULLPKGNAME-qt= poppler-qt-$V FULLPKGNAME-qt= poppler-qt-$V
FULLPKGNAME-qt4=poppler-qt4-$V FULLPKGNAME-qt4=poppler-qt4-$V
SHARED_LIBS += poppler 9.0 SHARED_LIBS += poppler 10.0
SHARED_LIBS += poppler-glib 7.0 SHARED_LIBS += poppler-glib 8.0
SHARED_LIBS += poppler-qt 7.0 SHARED_LIBS += poppler-qt 8.0
SHARED_LIBS += poppler-qt4 6.0 SHARED_LIBS += poppler-qt4 7.0
HOMEPAGE= http://poppler.freedesktop.org/ HOMEPAGE= http://poppler.freedesktop.org/
MAINTAINER= Matthias Kilian <kili@openbsd.org> MAINTAINER= Matthias Kilian <kili@openbsd.org>
# GPLv2 # GPLv2
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP= Yes
@ -86,6 +85,7 @@ WANTLIB-qt4= ${cWANTLIB} ICE QtCore QtGui QtXml SM X11 Xau Xdmcp Xext Xi \
CONFIGURE_STYLE=gnu CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+= --enable-xpdf-headers \ CONFIGURE_ARGS+= --enable-xpdf-headers \
--disable-introspection \
--disable-poppler-cpp \ --disable-poppler-cpp \
--enable-utils \ --enable-utils \
--enable-zlib --enable-zlib

10
print/poppler/distinfo
View File

@ -1,5 +1,5 @@
MD5 (poppler-0.14.5.tar.gz) = 9gA48iKEh28CHynxsaD+HA== MD5 (poppler-0.16.5.tar.gz) = K24MJrd6lD3zubsC1nyiNg==
RMD160 (poppler-0.14.5.tar.gz) = gNREGRKwLYl3dAXOA/jhdcTM+p4= RMD160 (poppler-0.16.5.tar.gz) = 3Si+xkvxkFC6LL3Vpx+jmDcN4ho=
SHA1 (poppler-0.14.5.tar.gz) = 4jsRXk68Bsk3MYaIsGp8azMZoAo= SHA1 (poppler-0.16.5.tar.gz) = KZlOCxvhEQQA2UP5uSFnW6GlLrU=
SHA256 (poppler-0.14.5.tar.gz) = yAUxfEwacIAJiujHwqHBuOLHhIWPwuBJQYeO64FkgUw= SHA256 (poppler-0.16.5.tar.gz) = nye5ScDNUu75gWVLjhOs1i4eD5pL3k2Wh22hGthMOdk=
SIZE (poppler-0.14.5.tar.gz) = 1798194 SIZE (poppler-0.16.5.tar.gz) = 1950312

8
print/poppler/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2010/12/24 14:02:12 kili Exp $ $OpenBSD: patch-configure,v 1.3 2011/06/04 19:03:19 kili Exp $
--- configure.orig Sun Nov 7 17:08:48 2010 --- configure.orig Mon Mar 28 23:33:11 2011
+++ configure Wed Nov 10 12:56:41 2010 +++ configure Mon Apr 25 13:00:42 2011
@@ -20802,7 +20802,7 @@ fi @@ -21731,7 +21731,7 @@ fi
if test x$enable_poppler_qt4 = xyes; then if test x$enable_poppler_qt4 = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 moc" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 moc" >&5
$as_echo_n "checking for Qt4 moc... " >&6; } $as_echo_n "checking for Qt4 moc... " >&6; }

26
print/poppler/patches/patch-poppler_SplashOutputDev_cc
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-poppler_SplashOutputDev_cc,v 1.1 2011/03/03 21:25:38 stsp Exp $
Upstream commit 37077aa475d2dee81f87daa05297b201eeb99c87.
Fixes a heap overflow.
--- poppler/SplashOutputDev.cc.orig Sat Feb 19 15:18:31 2011
+++ poppler/SplashOutputDev.cc Sat Feb 19 15:19:20 2011
@@ -2881,14 +2881,14 @@ void SplashOutputDev::beginTransparencyGroup(GfxState
tx = (int)floor(xMin);
if (tx < 0) {
tx = 0;
- } else if (tx > bitmap->getWidth()) {
- tx = bitmap->getWidth();
+ } else if (tx >= bitmap->getWidth()) {
+ tx = bitmap->getWidth() - 1;
}
ty = (int)floor(yMin);
if (ty < 0) {
ty = 0;
- } else if (ty > bitmap->getHeight()) {
- ty = bitmap->getHeight();
+ } else if (ty >= bitmap->getHeight()) {
+ ty = bitmap->getHeight() - 1;
}
w = (int)ceil(xMax) - tx + 1;
if (tx + w > bitmap->getWidth()) {

10
print/poppler/patches/patch-poppler_XRef_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-poppler_XRef_cc,v 1.7 2010/10/09 08:05:30 kili Exp $ $OpenBSD: patch-poppler_XRef_cc,v 1.8 2011/06/04 19:03:19 kili Exp $
--- poppler/XRef.cc.orig Mon Jun 14 20:19:46 2010 --- poppler/XRef.cc.orig Mon Dec 27 21:44:28 2010
+++ poppler/XRef.cc Wed Oct 6 17:22:17 2010 +++ poppler/XRef.cc Mon Apr 25 13:00:42 2011
@@ -926,49 +926,38 @@ void XRef::setEncryption(int permFlagsA, GBool ownerPa @@ -922,49 +922,38 @@ void XRef::setEncryption(int permFlagsA, GBool ownerPa
} }
GBool XRef::okToPrint(GBool ignoreOwnerPW) { GBool XRef::okToPrint(GBool ignoreOwnerPW) {
@ -58,4 +58,4 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.7 2010/10/09 08:05:30 kili Exp $
+ return gTrue; + return gTrue;
} }
Object *XRef::fetch(int num, int gen, Object *obj) { Object *XRef::fetch(int num, int gen, Object *obj, std::set<int> *fetchOriginatorNums) {

31
print/poppler/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.8 2011/03/20 20:52:01 kili Exp $ @comment $OpenBSD: PLIST-main,v 1.9 2011/06/04 19:03:20 kili Exp $
@conflict poppler-qt-<0.5.4p0 @conflict poppler-qt-<0.5.4p0
@pkgpath print/poppler @pkgpath print/poppler
%%SHARED%% %%SHARED%%
@ -10,6 +10,7 @@
@comment @bin bin/pdftoppm @comment @bin bin/pdftoppm
@comment @bin bin/pdftops @comment @bin bin/pdftops
@comment @bin bin/pdftotext @comment @bin bin/pdftotext
@comment @bin bin/poppler-glib-demo
include/poppler/ include/poppler/
include/poppler/Annot.h include/poppler/Annot.h
include/poppler/Array.h include/poppler/Array.h
@ -36,9 +37,11 @@ include/poppler/GfxFont.h
include/poppler/GfxState.h include/poppler/GfxState.h
include/poppler/GfxState_helpers.h include/poppler/GfxState_helpers.h
include/poppler/GlobalParams.h include/poppler/GlobalParams.h
include/poppler/Hints.h
include/poppler/JArithmeticDecoder.h include/poppler/JArithmeticDecoder.h
include/poppler/JBIG2Stream.h include/poppler/JBIG2Stream.h
include/poppler/Lexer.h include/poppler/Lexer.h
include/poppler/Linearization.h
include/poppler/Link.h include/poppler/Link.h
include/poppler/LocalPDFDocBuilder.h include/poppler/LocalPDFDocBuilder.h
include/poppler/Movie.h include/poppler/Movie.h
@ -101,11 +104,11 @@ include/poppler/glib/poppler.h
include/poppler/goo/ include/poppler/goo/
include/poppler/goo/FixedPoint.h include/poppler/goo/FixedPoint.h
include/poppler/goo/GooHash.h include/poppler/goo/GooHash.h
include/poppler/goo/GooLikely.h
include/poppler/goo/GooList.h include/poppler/goo/GooList.h
include/poppler/goo/GooMutex.h include/poppler/goo/GooMutex.h
include/poppler/goo/GooString.h include/poppler/goo/GooString.h
include/poppler/goo/GooTimer.h include/poppler/goo/GooTimer.h
include/poppler/goo/GooVector.h
include/poppler/goo/ImgWriter.h include/poppler/goo/ImgWriter.h
include/poppler/goo/JpegWriter.h include/poppler/goo/JpegWriter.h
include/poppler/goo/PNGWriter.h include/poppler/goo/PNGWriter.h
@ -157,19 +160,27 @@ lib/pkgconfig/poppler.pc
share/gtk-doc/ share/gtk-doc/
share/gtk-doc/html/ share/gtk-doc/html/
share/gtk-doc/html/poppler/ share/gtk-doc/html/poppler/
share/gtk-doc/html/poppler/PopplerAnnot.html
share/gtk-doc/html/poppler/PopplerAttachment.html
share/gtk-doc/html/poppler/PopplerDocument.html
share/gtk-doc/html/poppler/PopplerFormField.html
share/gtk-doc/html/poppler/PopplerLayer.html
share/gtk-doc/html/poppler/PopplerMedia.html
share/gtk-doc/html/poppler/PopplerMovie.html
share/gtk-doc/html/poppler/PopplerPage.html
share/gtk-doc/html/poppler/annotation-glossary.html
share/gtk-doc/html/poppler/api-index-0-12.html
share/gtk-doc/html/poppler/api-index-0-14.html
share/gtk-doc/html/poppler/api-index-0-16.html
share/gtk-doc/html/poppler/api-index-deprecated.html
share/gtk-doc/html/poppler/api-index-full.html
share/gtk-doc/html/poppler/ch01.html share/gtk-doc/html/poppler/ch01.html
share/gtk-doc/html/poppler/home.png share/gtk-doc/html/poppler/home.png
share/gtk-doc/html/poppler/index.html share/gtk-doc/html/poppler/index.html
share/gtk-doc/html/poppler/index.sgml share/gtk-doc/html/poppler/index.sgml
share/gtk-doc/html/poppler/left.png share/gtk-doc/html/poppler/left.png
share/gtk-doc/html/poppler/poppler-poppler-action.html share/gtk-doc/html/poppler/poppler-PopplerAction.html
share/gtk-doc/html/poppler/poppler-poppler-annot.html share/gtk-doc/html/poppler/poppler-Version-and-Features-Information.html
share/gtk-doc/html/poppler/poppler-poppler-document.html
share/gtk-doc/html/poppler/poppler-poppler-enums.html
share/gtk-doc/html/poppler/poppler-poppler-features.html
share/gtk-doc/html/poppler/poppler-poppler-form-field.html
share/gtk-doc/html/poppler/poppler-poppler-layer.html
share/gtk-doc/html/poppler/poppler-poppler-page.html
share/gtk-doc/html/poppler/poppler-poppler.html share/gtk-doc/html/poppler/poppler-poppler.html
share/gtk-doc/html/poppler/poppler.devhelp share/gtk-doc/html/poppler/poppler.devhelp
share/gtk-doc/html/poppler/poppler.devhelp2 share/gtk-doc/html/poppler/poppler.devhelp2