Attachment 149647 Details for Bug 192068 – Full patch to upgrade graphics/poppler to 0.26.3

[patch] Full patch to upgrade graphics/poppler to 0.26.3

poppler-0.26.3.diff (text/plain), 13.76 KB, created by Olivier Duchateau on 2014-11-20 17:42:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Duchateau

Created: 2014-11-20 17:42:11 UTC

Size: 13.76 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(révision 372949)
>+++ Makefile	(copie de travail)
>@@ -811,6 +811,7 @@
>     SUBDIR += poppler-data
>     SUBDIR += poppler-glib
>     SUBDIR += poppler-qt4
>+    SUBDIR += poppler-qt5
>     SUBDIR += poppler-utils
>     SUBDIR += pornview
>     SUBDIR += potrace
>Index: poppler/Makefile
>===================================================================
>--- poppler/Makefile	(révision 372949)
>+++ poppler/Makefile	(copie de travail)
>@@ -3,8 +3,8 @@
> #   $MCom: ports/graphics/poppler/Makefile,v 1.84 2013/03/12 14:53:49 kwm Exp $
> 
> PORTNAME=	poppler
>-PORTVERSION=	0.24.5
>-PORTREVISION?=	4
>+PORTVERSION=	0.26.3
>+PORTREVISION?=	0
> CATEGORIES=	graphics print
> MASTER_SITES=	http://poppler.freedesktop.org/
> 
>@@ -12,13 +12,17 @@
> COMMENT?=	PDF rendering library
> 
> LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
>+		libpng15.so:${PORTSDIR}/graphics/png \
>+		libtiff.so:${PORTSDIR}/graphics/tiff \
> 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
>-		liblcms2.so:${PORTSDIR}/graphics/lcms2
>+		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
>+		libfreetype.so:${PORTSDIR}/print/freetype2
> RUN_DEPENDS=	poppler-data>0:${PORTSDIR}/graphics/poppler-data
> 
>-USES=		gmake libtool:keepla pathfix pkgconfig tar:xz
>+USES=		gmake libtool pathfix pkgconfig tar:xz
> USE_GNOME=	libxml2
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>@@ -25,7 +29,8 @@
> CONFIGURE_ARGS=	--enable-zlib \
> 		--enable-xpdf-headers \
> 		--disable-gtk-test \
>-		--with-html-dir=${DOCSDIR}
>+		--without-html-dir \
>+		--disable-static
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>@@ -32,10 +37,12 @@
> # see https://bugs.freedesktop.org/show_bug.cgi?id=72499
> CPPFLAGS+=	 -D__LONG_LONG_SUPPORTED
> 
>+INSTALL_TARGET=	install-strip
>+
> .if !defined(SLAVEPORT)
> PORTSCOUT=	limitw:1,even
> 
>-OPTIONS_DEFINE=	CAIRO OPENJPEG
>+OPTIONS_DEFINE=	CAIRO CURL OPENJPEG
> OPTIONS_DEFAULT=CAIRO OPENJPEG
> 
> USES+=		iconv
>@@ -48,7 +55,7 @@
> LIB_DEPENDS+=	libpoppler.so:${PORTSDIR}/graphics/poppler
> 
> .if ${SLAVEPORT}==glib
>-CONFIGURE_ARGS+=--enable-poppler-glib
>+CONFIGURE_ARGS+=--enable-poppler-glib --enable-introspection=yes
> USE_GNOME+=	cairo gnomehier glib20 introspection:build
> BUILD_WRKSRC=	${WRKSRC}/glib
> INSTALL_WRKSRC=	${WRKSRC}/glib
>@@ -66,11 +73,10 @@
> CONFIGURE_ARGS+=--disable-poppler-qt4
> .endif
> 
>-# needs checking when Qt5 is available
> .if ${SLAVEPORT}==qt5
> CONFIGURE_ARGS+=--enable-poppler-qt5
>-CONFIGURE_ENV+=	ac_cv_prog_MOCQT4=${LOCALBASE}/bin/moc-qt5
>-USE_QT5=	gui corelib xml qtestlib moc_build
>+CONFIGURE_ENV+=	MOCQT5=${MOC}
>+USE_QT5=	core gui widgets xml buildtools_build testlib_build
> BUILD_WRKSRC=	${WRKSRC}/qt5
> INSTALL_WRKSRC=	${WRKSRC}/qt5
> .else
>@@ -100,6 +106,15 @@
> PLIST_SUB+=	CAIRO="@comment "
> .endif
> 
>+.if ${PORT_OPTIONS:MCURL}
>+LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
>+CONFIGURE_ARGS+=--enable-libcurl
>+PLIST_SUB+=	CURL=""
>+.else
>+CONFIGURE_ARGS+=--disable-libcurl
>+PLIST_SUB+=	CURL="@comment "
>+.endif
>+
> .if ${PORT_OPTIONS:MOPENJPEG}
> CONFIGURE_ARGS+=--enable-libopenjpeg
> LIB_DEPENDS+=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
>@@ -116,7 +131,7 @@
> 		${WRKSRC}/configure
> .endif
> .if defined(SLAVEPORT) && ${SLAVEPORT}==qt5
>-	@${REINPLACE_CMD} -e 's|MOCQT5=`.*|MOCQT5="${LOCALBASE}/bin/moc-qt5"|' \
>+	@${REINPLACE_CMD} -e 's|MOCQT5=`.*|MOCQT5="${MOC}"|' \
> 		${WRKSRC}/configure
> .endif
> 
>@@ -133,6 +148,5 @@
> 		${STAGEDIR}${PREFIX}/libdata/pkgconfig
> . endif
> .endif
>-	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpoppler*.so.*
> 
> .include <bsd.port.mk>
>Index: poppler/distinfo
>===================================================================
>--- poppler/distinfo	(révision 372949)
>+++ poppler/distinfo	(copie de travail)
>@@ -1,2 +1,2 @@
>-SHA256 (poppler-0.24.5.tar.xz) = a2654910100c923c44e366242495e226db2798254f2fa2781138867348759f84
>-SIZE (poppler-0.24.5.tar.xz) = 1512476
>+SHA256 (poppler-0.26.3.tar.xz) = 88cb1af3574f861bc08853a681be97ae79bf5302782fbac803f877b879a642b1
>+SIZE (poppler-0.26.3.tar.xz) = 1593760
>Index: poppler/files/patch-qt5__Makefile.in
>===================================================================
>--- poppler/files/patch-qt5__Makefile.in	(révision 0)
>+++ poppler/files/patch-qt5__Makefile.in	(copie de travail)
>@@ -0,0 +1,11 @@
>+--- ./qt5/Makefile.in.orig	2014-07-20 16:22:04.000000000 +0000
>++++ ./qt5/Makefile.in	2014-07-22 22:09:00.000000000 +0000
>+@@ -384,7 +384,7 @@
>+ top_builddir = @top_builddir@
>+ top_srcdir = @top_srcdir@
>+ win32_libs = @win32_libs@
>+-SUBDIRS = src tests demos
>++SUBDIRS = src
>+ all: all-recursive
>+ 
>+ .SUFFIXES:
>
>Index: poppler/files/patch-qt5__src__Makefile.in
>===================================================================
>--- poppler/files/patch-qt5__src__Makefile.in	(révision 0)
>+++ poppler/files/patch-qt5__src__Makefile.in	(copie de travail)
>@@ -0,0 +1,20 @@
>+--- ./qt5/src/Makefile.in.orig	2014-07-20 16:22:04.000000000 +0000
>++++ ./qt5/src/Makefile.in	2014-07-22 22:12:19.000000000 +0000
>+@@ -129,7 +129,7 @@
>+ LTLIBRARIES = $(lib_LTLIBRARIES)
>+ am__DEPENDENCIES_1 =
>+ libpoppler_qt5_la_DEPENDENCIES =  \
>+-	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
>++	$(am__DEPENDENCIES_1)
>+ am_libpoppler_qt5_la_OBJECTS = libpoppler_qt5_la-poppler-document.lo \
>+ 	libpoppler_qt5_la-poppler-page.lo \
>+ 	libpoppler_qt5_la-poppler-fontinfo.lo \
>+@@ -505,7 +505,7 @@
>+ 	-Dpoppler_qt5_EXPORTS -fPIC
>+ 
>+ libpoppler_qt5_la_LIBADD = \
>+-	$(top_builddir)/poppler/libpoppler.la	\
>++	-lpoppler	\
>+ 	$(POPPLER_QT5_LIBS)
>+ 
>+ libpoppler_qt5_la_LDFLAGS = -version-info 2:0:1 @create_shared_lib@ @auto_import_flags@
>
>Index: poppler/files/patch-utils_Makefile.in
>===================================================================
>--- poppler/files/patch-utils_Makefile.in	(révision 372949)
>+++ poppler/files/patch-utils_Makefile.in	(copie de travail)
>@@ -1,5 +1,5 @@
>---- utils/Makefile.in.orig	2013-12-02 19:00:03.000000000 +0100
>-+++ utils/Makefile.in	2013-12-02 19:01:25.000000000 +0100
>+--- ./utils/Makefile.in.orig	2014-07-20 16:22:05.000000000 +0000
>++++ ./utils/Makefile.in	2014-07-21 19:54:18.000000000 +0000
> @@ -111,7 +111,7 @@
>  am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1)
>  pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
>@@ -16,13 +16,13 @@
> -pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
> +pdffonts_DEPENDENCIES =
>  am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
>- 	$(am__objects_1)
>+ 	JSInfo.$(OBJEXT) $(am__objects_1)
>  pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
>  pdfimages_LDADD = $(LDADD)
> -pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
> +pdfimages_DEPENDENCIES =
>  am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
>- 	$(am__objects_1)
>+ 	JSInfo.$(OBJEXT) $(am__objects_1)
>  pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
>  pdfinfo_LDADD = $(LDADD)
> -pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
>@@ -52,7 +52,7 @@
>  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
>  pdftohtml_LDADD = $(LDADD)
> -pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
>-+pdftohtml_DEPENDENCIES = 
>++pdftohtml_DEPENDENCIES =
>  pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
>  	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
>  	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
>Index: poppler/pkg-plist
>===================================================================
>--- poppler/pkg-plist	(révision 372949)
>+++ poppler/pkg-plist	(copie de travail)
>@@ -8,6 +8,8 @@
> include/poppler/CharCodeToUnicode.h
> include/poppler/CharTypes.h
> include/poppler/CompactFontTables.h
>+%%CURL%%include/poppler/CurlCachedFile.h
>+%%CURL%%include/poppler/CurlPDFDocBuilder.h
> include/poppler/DateInfo.h
> include/poppler/Decrypt.h
> include/poppler/Dict.h
>@@ -30,6 +32,7 @@
> include/poppler/Linearization.h
> include/poppler/Link.h
> include/poppler/LocalPDFDocBuilder.h
>+include/poppler/MarkedContentOutputDev.h
> include/poppler/Movie.h
> include/poppler/NameToCharCode.h
> include/poppler/NameToUnicodeTable.h
>@@ -57,6 +60,8 @@
> include/poppler/StdinPDFDocBuilder.h
> include/poppler/Stream-CCITT.h
> include/poppler/Stream.h
>+include/poppler/StructElement.h
>+include/poppler/StructTreeRoot.h
> include/poppler/TextOutputDev.h
> include/poppler/UTF.h
> include/poppler/UTF8.h
>@@ -95,6 +100,7 @@
> include/poppler/goo/GooTimer.h
> include/poppler/goo/ImgWriter.h
> include/poppler/goo/JpegWriter.h
>+include/poppler/goo/NetPBMWriter.h
> include/poppler/goo/PNGWriter.h
> include/poppler/goo/TiffWriter.h
> include/poppler/goo/gfile.h
>@@ -126,22 +132,13 @@
> include/poppler/splash/SplashTypes.h
> include/poppler/splash/SplashXPath.h
> include/poppler/splash/SplashXPathScanner.h
>-lib/libpoppler-cpp.a
>-lib/libpoppler-cpp.la
> lib/libpoppler-cpp.so
> lib/libpoppler-cpp.so.0
> lib/libpoppler-cpp.so.0.2.0
>-lib/libpoppler.a
>-lib/libpoppler.la
> lib/libpoppler.so
>-lib/libpoppler.so.44
>-lib/libpoppler.so.44.0.0
>+lib/libpoppler.so.46
>+lib/libpoppler.so.46.0.0
> %%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
> libdata/pkgconfig/poppler-cpp.pc
> libdata/pkgconfig/poppler-splash.pc
> libdata/pkgconfig/poppler.pc
>-@dirrm include/poppler/splash
>-@dirrm include/poppler/goo
>-@dirrm include/poppler/fofi
>-@dirrm include/poppler/cpp
>-@dirrm include/poppler
>Index: poppler-glib/Makefile
>===================================================================
>--- poppler-glib/Makefile	(révision 372949)
>+++ poppler-glib/Makefile	(copie de travail)
>@@ -2,11 +2,11 @@
> # $FreeBSD$
> #   $MCom: ports/graphics/poppler-glib/Makefile,v 1.4 2012/10/14 23:04:21 kwm Exp $
> 
>-PORTREVISION=	1
>+PORTREVISION=	0
> PKGNAMESUFFIX=	-glib
> 
> MAINTAINER=	gnome@FreeBSD.org
>-COMMENT=	Glib bindings to poppler
>+COMMENT=	GLib bindings to poppler
> 
> MASTERDIR=	${.CURDIR}/../../graphics/poppler
> SLAVEPORT=	glib
>Index: poppler-glib/pkg-plist
>===================================================================
>--- poppler-glib/pkg-plist	(révision 372949)
>+++ poppler-glib/pkg-plist	(copie de travail)
>@@ -10,46 +10,11 @@
> include/poppler/glib/poppler-media.h
> include/poppler/glib/poppler-movie.h
> include/poppler/glib/poppler-page.h
>+include/poppler/glib/poppler-structure-element.h
> include/poppler/glib/poppler.h
> lib/girepository-1.0/Poppler-0.18.typelib
>-lib/libpoppler-glib.a
>-lib/libpoppler-glib.la
> lib/libpoppler-glib.so
> lib/libpoppler-glib.so.8
> lib/libpoppler-glib.so.8.6.0
> libdata/pkgconfig/poppler-glib.pc
>-%%DOCSDIR%%/poppler/PopplerAnnot.html
>-%%DOCSDIR%%/poppler/PopplerAttachment.html
>-%%DOCSDIR%%/poppler/PopplerDocument.html
>-%%DOCSDIR%%/poppler/PopplerFormField.html
>-%%DOCSDIR%%/poppler/PopplerLayer.html
>-%%DOCSDIR%%/poppler/PopplerMedia.html
>-%%DOCSDIR%%/poppler/PopplerMovie.html
>-%%DOCSDIR%%/poppler/PopplerPage.html
>-%%DOCSDIR%%/poppler/annotation-glossary.html
>-%%DOCSDIR%%/poppler/api-index-0-12.html
>-%%DOCSDIR%%/poppler/api-index-0-14.html
>-%%DOCSDIR%%/poppler/api-index-0-16.html
>-%%DOCSDIR%%/poppler/api-index-0-18.html
>-%%DOCSDIR%%/poppler/api-index-0-20.html
>-%%DOCSDIR%%/poppler/api-index-0-22.html
>-%%DOCSDIR%%/poppler/api-index-deprecated.html
>-%%DOCSDIR%%/poppler/api-index-full.html
>-%%DOCSDIR%%/poppler/ch01.html
>-%%DOCSDIR%%/poppler/home.png
>-%%DOCSDIR%%/poppler/index.html
>-%%DOCSDIR%%/poppler/index.sgml
>-%%DOCSDIR%%/poppler/left.png
>-%%DOCSDIR%%/poppler/poppler-PopplerAction.html
>-%%DOCSDIR%%/poppler/poppler-Version-and-Features-Information.html
>-%%DOCSDIR%%/poppler/poppler-poppler.html
>-%%DOCSDIR%%/poppler/poppler.devhelp2
>-%%DOCSDIR%%/poppler/right.png
>-%%DOCSDIR%%/poppler/style.css
>-%%DOCSDIR%%/poppler/up.png
> share/gir-1.0/Poppler-0.18.gir
>-@dirrmtry share/gir-1.0
>-@dirrmtry lib/girepository-1.0
>-@dirrmtry %%DOCSDIR%%/poppler
>-@dirrmtry %%DOCSDIR%%
>-@dirrm include/poppler/glib
>Index: poppler-qt4/Makefile
>===================================================================
>--- poppler-qt4/Makefile	(révision 372949)
>+++ poppler-qt4/Makefile	(copie de travail)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> #   $MCom: ports/graphics/poppler-qt4/Makefile,v 1.18 2012/10/14 23:04:21 kwm Exp $
> 
>-PORTREVISION=	1
>+PORTREVISION=	0
> PKGNAMESUFFIX=	-qt4
> 
> MAINTAINER=	gnome@FreeBSD.org
>Index: poppler-qt4/pkg-plist
>===================================================================
>--- poppler-qt4/pkg-plist	(révision 372949)
>+++ poppler-qt4/pkg-plist	(copie de travail)
>@@ -6,9 +6,8 @@
> include/poppler/qt4/poppler-optcontent.h
> include/poppler/qt4/poppler-page-transition.h
> include/poppler/qt4/poppler-qt4.h
>-lib/libpoppler-qt4.a
>-lib/libpoppler-qt4.la
> lib/libpoppler-qt4.so
> lib/libpoppler-qt4.so.4
>-lib/libpoppler-qt4.so.4.3.0
>+lib/libpoppler-qt4.so.4.4.0
> libdata/pkgconfig/poppler-qt4.pc
>+@dirrm include/poppler/qt4
>Index: poppler-qt5/Makefile
>===================================================================
>--- poppler-qt5/Makefile	(révision 0)
>+++ poppler-qt5/Makefile	(copie de travail)
>@@ -0,0 +1,13 @@
>+# $FreeBSD$
>+
>+PORTREVISION=	0
>+PKGNAMESUFFIX=	-qt5
>+
>+MAINTAINER=	gnome@FreeBSD.org
>+COMMENT=	Qt5 bindings to poppler
>+
>+MASTERDIR=	${.CURDIR}/../../graphics/poppler
>+SLAVEPORT=	qt5
>+PLIST=		${.CURDIR}/pkg-plist
>+
>+.include "${MASTERDIR}/Makefile"
>
>Index: poppler-qt5/pkg-plist
>===================================================================
>--- poppler-qt5/pkg-plist	(révision 0)
>+++ poppler-qt5/pkg-plist	(copie de travail)
>@@ -0,0 +1,12 @@
>+include/poppler/qt5/poppler-annotation.h
>+include/poppler/qt5/poppler-export.h
>+include/poppler/qt5/poppler-form.h
>+include/poppler/qt5/poppler-link.h
>+include/poppler/qt5/poppler-media.h
>+include/poppler/qt5/poppler-optcontent.h
>+include/poppler/qt5/poppler-page-transition.h
>+include/poppler/qt5/poppler-qt5.h
>+lib/libpoppler-qt5.so
>+lib/libpoppler-qt5.so.1
>+lib/libpoppler-qt5.so.1.1.0
>+libdata/pkgconfig/poppler-qt5.pc
>
>Index: poppler-utils/Makefile
>===================================================================
>--- poppler-utils/Makefile	(révision 372949)
>+++ poppler-utils/Makefile	(copie de travail)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> #   $MCom: ports/graphics/poppler-utils/Makefile,v 1.8 2012/10/14 23:04:21 kwm Exp $
> 
>-PORTREVISION=	1
>+PORTREVISION=	0
> PKGNAMESUFFIX=	-utils
> 
> MAINTAINER=	gnome@FreeBSD.org

Actions: View | Diff

Attachments on bug 192068: 144916 | 144917 | 144918 | 144919 | 149510 | 149647