Attachment 178035 Details for Bug 215358 – Patch to update graphics/poppler and slaves ports

[patch] Patch to update graphics/poppler and slaves ports

poppler.diff (text/plain), 4.40 KB, created by Olivier Duchateau on 2016-12-17 20:16:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Duchateau

Created: 2016-12-17 20:16:06 UTC

Size: 4.40 KB

patch

obsolete

>Index: poppler/Makefile
>===================================================================
>--- poppler/Makefile	(rÃ©vision 428796)
>+++ poppler/Makefile	(copie de travail)
>@@ -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 @@
> 		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 @@
> 		--disable-libnss \
> 		--disable-gtk-test \
> 		--without-html-dir \
>-		--disable-static
>+		--disable-static \
>+		--enable-libnss
> 
> INSTALL_TARGET=	install-strip
> 
>@@ -110,11 +112,9 @@
> 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
>Index: poppler/distinfo
>===================================================================
>--- poppler/distinfo	(rÃ©vision 428796)
>+++ poppler/distinfo	(copie de travail)
>@@ -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
>Index: poppler/files/patch-poppler_PDFDoc.cc
>===================================================================
>--- poppler/files/patch-poppler_PDFDoc.cc	(rÃ©vision 428796)
>+++ poppler/files/patch-poppler_PDFDoc.cc	(nonexistent)
>@@ -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;
>-   }
>- 
>
>Modification de propriÃ©tÃ©s sur poppler/files/patch-poppler_PDFDoc.cc
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: poppler/pkg-plist
>===================================================================
>--- poppler/pkg-plist	(rÃ©vision 428796)
>+++ poppler/pkg-plist	(copie de travail)
>@@ -54,6 +54,7 @@
> 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.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
>Index: poppler-qt4/pkg-plist
>===================================================================
>--- poppler-qt4/pkg-plist	(rÃ©vision 428796)
>+++ poppler-qt4/pkg-plist	(copie de travail)
>@@ -8,5 +8,5 @@
> include/poppler/qt4/poppler-qt4.h
> lib/libpoppler-qt4.so
> lib/libpoppler-qt4.so.4
>-lib/libpoppler-qt4.so.4.10.0
>+lib/libpoppler-qt4.so.4.11.0
> libdata/pkgconfig/poppler-qt4.pc
>Index: poppler-qt5/pkg-plist
>===================================================================
>--- poppler-qt5/pkg-plist	(rÃ©vision 428796)
>+++ poppler-qt5/pkg-plist	(copie de travail)
>@@ -8,5 +8,5 @@
> include/poppler/qt5/poppler-qt5.h
> lib/libpoppler-qt5.so
> lib/libpoppler-qt5.so.1
>-lib/libpoppler-qt5.so.1.7.0
>+lib/libpoppler-qt5.so.1.8.0
> libdata/pkgconfig/poppler-qt5.pc

Actions: View | Diff

Attachments on bug 215358: 178035