aboutsummaryrefslogtreecommitdiff
path: root/graphics/poppler
diff options
context:
space:
mode:
authorOlivier Duchateau <olivierd@FreeBSD.org>2017-01-07 10:35:33 +0000
committerOlivier Duchateau <olivierd@FreeBSD.org>2017-01-07 10:35:33 +0000
commitfdeaad54bcca66ef8e27cd60f4a4c7e441dcc018 (patch)
tree8954ded3cbaaa681577e425069821318a17cd7ed /graphics/poppler
parent214abedb66c72fe3a8223f3f70e6a7c26f632b94 (diff)
downloadports-fdeaad54bcca66ef8e27cd60f4a4c7e441dcc018.tar.gz
ports-fdeaad54bcca66ef8e27cd60f4a4c7e441dcc018.zip
Notes
Diffstat (limited to 'graphics/poppler')
-rw-r--r--graphics/poppler/Makefile16
-rw-r--r--graphics/poppler/distinfo6
-rw-r--r--graphics/poppler/files/patch-poppler_PDFDoc.cc17
-rw-r--r--graphics/poppler/pkg-plist5
4 files changed, 14 insertions, 30 deletions
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 15b7b45c48f4..9325fdc00cd8 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= poppler
-PORTVERSION= 0.46.0
-PORTREVISION?= 2
+PORTVERSION= 0.50.0
CATEGORIES= graphics print
MASTER_SITES= http://poppler.freedesktop.org/
@@ -17,7 +16,9 @@ LIB_DEPENDS= libpng.so:graphics/png \
libtiff.so:graphics/tiff \
libfontconfig.so:x11-fonts/fontconfig \
liblcms2.so:graphics/lcms2 \
- libfreetype.so:print/freetype2
+ libfreetype.so:print/freetype2 \
+ libnss3.so:security/nss \
+ libnspr4.so:devel/nspr
RUN_DEPENDS= poppler-data>0:graphics/poppler-data
USES= cpe gmake jpeg libtool localbase pathfix pkgconfig tar:xz
@@ -30,7 +31,8 @@ CONFIGURE_ARGS= --enable-zlib \
--disable-libnss \
--disable-gtk-test \
--without-html-dir \
- --disable-static
+ --disable-static \
+ --enable-libnss
INSTALL_TARGET= install-strip
@@ -110,11 +112,9 @@ CONFIGURE_ARGS+=--disable-libcurl
PLIST_SUB+= CURL="@comment "
.endif
-# stick with openjpeg1 for now due to regression in openjpeg2 (configure)
-# https://bugs.freedesktop.org/show_bug.cgi?id=58906 Comment #35
.if ${PORT_OPTIONS:MOPENJPEG}
-CONFIGURE_ARGS+=--enable-libopenjpeg=openjpeg1
-LIB_DEPENDS+= libopenjpeg.so:graphics/openjpeg15
+CONFIGURE_ARGS+=--enable-libopenjpeg=openjpeg2
+LIB_DEPENDS+= libopenjp2.so:graphics/openjpeg
.else
CONFIGURE_ARGS+=--disable-libopenjpeg
.endif
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index 57ef41c2e263..cf7d50027b14 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1469476012
-SHA256 (poppler-0.46.0.tar.xz) = 967d35d13d61dee2fee656b80efef9e388a9e752bc79b7123f15b49c7769e487
-SIZE (poppler-0.46.0.tar.xz) = 1680940
+TIMESTAMP = 1481980606
+SHA256 (poppler-0.50.0.tar.xz) = c9c93318b789d3933f6e0bad3bc65110280c28eac3f0666284bb9c9a0ab4bc36
+SIZE (poppler-0.50.0.tar.xz) = 1689260
diff --git a/graphics/poppler/files/patch-poppler_PDFDoc.cc b/graphics/poppler/files/patch-poppler_PDFDoc.cc
deleted file mode 100644
index 25be510881a6..000000000000
--- a/graphics/poppler/files/patch-poppler_PDFDoc.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sat, 30 Jul 2016 17:32:59 +0200
-Subject: Fix abort on documents where the docinfo obj is not a dict
-
-Bug #97134
-
---- poppler/PDFDoc.cc.orig 2016-07-05 21:37:01 UTC
-+++ poppler/PDFDoc.cc
-@@ -646,7 +646,7 @@ void PDFDoc::setDocInfoStringEntry(const
- GooString *PDFDoc::getDocInfoStringEntry(const char *key) {
- Object infoObj;
- getDocInfo(&infoObj);
-- if (infoObj.isNull()) {
-+ if (!infoObj.isDict()) {
- return NULL;
- }
-
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
index fe219ee8e146..a4e0e9ca9f31 100644
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -54,6 +54,7 @@ include/poppler/PreScanOutputDev.h
include/poppler/ProfileData.h
include/poppler/Rendition.h
include/poppler/SecurityHandler.h
+include/poppler/SignatureHandler.h
include/poppler/SignatureInfo.h
include/poppler/Sound.h
include/poppler/SplashOutputDev.h
@@ -137,8 +138,8 @@ lib/libpoppler-cpp.so
lib/libpoppler-cpp.so.0
lib/libpoppler-cpp.so.0.3.0
lib/libpoppler.so
-lib/libpoppler.so.63
-lib/libpoppler.so.63.0.0
+lib/libpoppler.so.66
+lib/libpoppler.so.66.0.0
%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
libdata/pkgconfig/poppler-cpp.pc
libdata/pkgconfig/poppler-splash.pc