Attachment #178035 for bug #215358

View | Details | Raw Unified | Return to bug 215358
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	poppler
PORTVERSION=	0.50.0
PORTREVISION?=	2
CATEGORIES=	graphics print
MASTER_SITES=	http://poppler.freedesktop.org/


		libtiff.so:graphics/tiff \
		libfontconfig.so:x11-fonts/fontconfig \
		liblcms2.so:graphics/lcms2 \
		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

		--disable-libnss \
		--disable-gtk-test \
		--without-html-dir \
		--disable-static \
		--enable-libnss

INSTALL_TARGET=	install-strip


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=openjpeg2
LIB_DEPENDS+=	libopenjp2.so:graphics/openjpeg
.else
CONFIGURE_ARGS+=--disable-libopenjpeg
.endif

Lines 1-3 Link Here

(-)poppler/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1469476012	1	TIMESTAMP = 1481980606
2	SHA256 (poppler-0.46.0.tar.xz) = 967d35d13d61dee2fee656b80efef9e388a9e752bc79b7123f15b49c7769e487	2	SHA256 (poppler-0.50.0.tar.xz) = c9c93318b789d3933f6e0bad3bc65110280c28eac3f0666284bb9c9a0ab4bc36
3	SIZE (poppler-0.46.0.tar.xz) = 1680940	3	SIZE (poppler-0.50.0.tar.xz) = 1689260




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;
   }
 
yes
native
text/plain

Lines 54-59 Link Here

(-)poppler/pkg-plist (-2 / +3 lines)
54	include/poppler/ProfileData.h	54	include/poppler/ProfileData.h
55	include/poppler/Rendition.h	55	include/poppler/Rendition.h
56	include/poppler/SecurityHandler.h	56	include/poppler/SecurityHandler.h
		57	include/poppler/SignatureHandler.h
57	include/poppler/SignatureInfo.h	58	include/poppler/SignatureInfo.h
58	include/poppler/Sound.h	59	include/poppler/Sound.h
59	include/poppler/SplashOutputDev.h	60	include/poppler/SplashOutputDev.h
Lines 137-144 Link Here
137	lib/libpoppler-cpp.so.0	138	lib/libpoppler-cpp.so.0
138	lib/libpoppler-cpp.so.0.3.0	139	lib/libpoppler-cpp.so.0.3.0
139	lib/libpoppler.so	140	lib/libpoppler.so
140	lib/libpoppler.so.63	141	lib/libpoppler.so.66
141	lib/libpoppler.so.63.0.0	142	lib/libpoppler.so.66.0.0
142	%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc	143	%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
143	libdata/pkgconfig/poppler-cpp.pc	144	libdata/pkgconfig/poppler-cpp.pc
144	libdata/pkgconfig/poppler-splash.pc	145	libdata/pkgconfig/poppler-splash.pc

Lines 8-12 Link Here

(-)poppler-qt4/pkg-plist (-1 / +1 lines)
8	include/poppler/qt4/poppler-qt4.h	8	include/poppler/qt4/poppler-qt4.h
9	lib/libpoppler-qt4.so	9	lib/libpoppler-qt4.so
10	lib/libpoppler-qt4.so.4	10	lib/libpoppler-qt4.so.4
11	lib/libpoppler-qt4.so.4.10.0	11	lib/libpoppler-qt4.so.4.11.0
12	libdata/pkgconfig/poppler-qt4.pc	12	libdata/pkgconfig/poppler-qt4.pc

Lines 8-12 Link Here

(-)poppler-qt5/pkg-plist (-1 / +1 lines)
8	include/poppler/qt5/poppler-qt5.h	8	include/poppler/qt5/poppler-qt5.h
9	lib/libpoppler-qt5.so	9	lib/libpoppler-qt5.so
10	lib/libpoppler-qt5.so.1	10	lib/libpoppler-qt5.so.1
11	lib/libpoppler-qt5.so.1.7.0	11	lib/libpoppler-qt5.so.1.8.0
12	libdata/pkgconfig/poppler-qt5.pc	12	libdata/pkgconfig/poppler-qt5.pc

Return to bug 215358

Lines 2-9 Link Here

(-)poppler/Makefile (-8 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= poppler	4	PORTNAME= poppler
5	PORTVERSION= 0.46.0	5	PORTVERSION= 0.50.0
6	PORTREVISION?= 2
7	CATEGORIES= graphics print	6	CATEGORIES= graphics print
8	MASTER_SITES= http://poppler.freedesktop.org/	7	MASTER_SITES= http://poppler.freedesktop.org/
9		8
Lines 17-23 Link Here
17	libtiff.so:graphics/tiff \	16	libtiff.so:graphics/tiff \
18	libfontconfig.so:x11-fonts/fontconfig \	17	libfontconfig.so:x11-fonts/fontconfig \
19	liblcms2.so:graphics/lcms2 \	18	liblcms2.so:graphics/lcms2 \
20	libfreetype.so:print/freetype2	19	libfreetype.so:print/freetype2 \
		20	libnss3.so:security/nss \
		21	libnspr4.so:devel/nspr
21	RUN_DEPENDS= poppler-data>0:graphics/poppler-data	22	RUN_DEPENDS= poppler-data>0:graphics/poppler-data
22		23
23	USES= cpe gmake jpeg libtool localbase pathfix pkgconfig tar:xz	24	USES= cpe gmake jpeg libtool localbase pathfix pkgconfig tar:xz
Lines 30-36 Link Here
30	--disable-libnss \	31	--disable-libnss \
31	--disable-gtk-test \	32	--disable-gtk-test \
32	--without-html-dir \	33	--without-html-dir \
33	--disable-static	34	--disable-static \
		35	--enable-libnss
34		36
35	INSTALL_TARGET= install-strip	37	INSTALL_TARGET= install-strip
36		38
Lines 110-120 Link Here
110	PLIST_SUB+= CURL="@comment "	112	PLIST_SUB+= CURL="@comment "
111	.endif	113	.endif
112		114
113	# stick with openjpeg1 for now due to regression in openjpeg2 (configure)
114	# https://bugs.freedesktop.org/show_bug.cgi?id=58906 Comment #35
115	.if ${PORT_OPTIONS:MOPENJPEG}	115	.if ${PORT_OPTIONS:MOPENJPEG}
116	CONFIGURE_ARGS+=--enable-libopenjpeg=openjpeg1	116	CONFIGURE_ARGS+=--enable-libopenjpeg=openjpeg2
117	LIB_DEPENDS+= libopenjpeg.so:graphics/openjpeg15	117	LIB_DEPENDS+= libopenjp2.so:graphics/openjpeg
118	.else	118	.else
119	CONFIGURE_ARGS+=--disable-libopenjpeg	119	CONFIGURE_ARGS+=--disable-libopenjpeg
120	.endif	120	.endif

Lines 1-17 Link Here

(-)poppler/files/patch-poppler_PDFDoc.cc (-20 lines)
1	From: Albert Astals Cid <aacid@kde.org>
2	Date: Sat, 30 Jul 2016 17:32:59 +0200
3	Subject: Fix abort on documents where the docinfo obj is not a dict
4
5	Bug #97134
6
7	--- poppler/PDFDoc.cc.orig 2016-07-05 21:37:01 UTC
8	+++ poppler/PDFDoc.cc
9	@@ -646,7 +646,7 @@ void PDFDoc::setDocInfoStringEntry(const
10	GooString PDFDoc::getDocInfoStringEntry(const char key) {
11	Object infoObj;
12	getDocInfo(&infoObj);
13	- if (infoObj.isNull()) {
14	+ if (!infoObj.isDict()) {
15	return NULL;
16	}
17
18	yes
19	native
20	text/plain