From eb990e3febe75b369d0318e79497ea873f9e3d3c Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 1 Oct 2015 05:36:36 +0000 Subject: Update poppler* to 0.36.0: Release 0.36.0 core: * Patch to support RichMedia annotations * Splash: Fix wrong memory access. Bug #91686 * Cairo: fix size of transparency group surface. Bug #66229 * Fix bounds check in Linearization::getPageFirst. Bug #91200 * File Saving improvements * Add premultiplied alpha channel to SplashBitmap * Fix for xref table creation. Bug #90790 * Fix JBIG2Decode infinite loop and stack overflow. Bug #91186 * Minor optimization in text extraction qt4: * Basic support for RichMedia annotations * Change default image format * Minor optimizations qt5: * Basic support for RichMedia annotations * Change default image format * Minor optimizationsHEADmaster cpp: * Fix utf8/utf16 conversion. Bug #91644 build system: * Do not hardcode -fPIC in Makefile.am * cmake: Allow configuring SHARE_INSTALL_DIR. Bug #90293 glib: * utils: * pdfunite: Insert embedded files in result pdf. Bug #90066 * pdftotext: Add -bbox-layout option. Bug #89941 Release 0.35.0 core: * Fix assert in broken file. Bug #91344 * Adjust memory layout computation of GooString * Make SplashBitmap XBGR transfer alpha channel * Splash: Fix wrong writes on non rgb outputs. Bug #90570 * Splash: remove ifndef in Windows code * GlobalParamsWin bugfixes. Bug #91053 qt4: * Switch default image format * Add IgnorePaperColor render flag qt5: * Improve efficiency of Poppler::Page::renderToImage * Switch default image format * Add IgnorePaperColor render flag build system: * Allow configuring SPLASH_CMYK support * Add configure --enable-build-type. Bug #90796 glib: * Explicitly link against pthread * Deprecation fixes utils: * pdftocairo: Fix cast to pointer from integer of different size on win64 --- print/poppler-cpp/buildlink3.mk | 4 ++-- print/poppler-glib/buildlink3.mk | 4 ++-- print/poppler-includes/buildlink3.mk | 4 ++-- print/poppler-qt4/buildlink3.mk | 4 ++-- print/poppler-qt5/buildlink3.mk | 4 ++-- print/poppler/Makefile.common | 4 ++-- print/poppler/buildlink3.mk | 4 ++-- print/poppler/distinfo | 12 ++++++------ print/poppler/patches/patch-aa | 12 ++++++------ print/poppler/patches/patch-qt5_src_Makefile.in | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) (limited to 'print') diff --git a/print/poppler-cpp/buildlink3.mk b/print/poppler-cpp/buildlink3.mk index 41b56e8951c..1e1cb60290b 100644 --- a/print/poppler-cpp/buildlink3.mk +++ b/print/poppler-cpp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2015/07/15 15:09:37 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2015/10/01 05:36:36 wiz Exp $ BUILDLINK_TREE+= poppler-cpp @@ -6,7 +6,7 @@ BUILDLINK_TREE+= poppler-cpp POPPLER_CPP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.poppler-cpp+= poppler-cpp>=0.16.7 -BUILDLINK_ABI_DEPENDS.poppler-cpp+= poppler-cpp>=0.34.0 +BUILDLINK_ABI_DEPENDS.poppler-cpp+= poppler-cpp>=0.36.0 BUILDLINK_PKGSRCDIR.poppler-cpp?= ../../print/poppler-cpp .include "../../print/poppler/buildlink3.mk" diff --git a/print/poppler-glib/buildlink3.mk b/print/poppler-glib/buildlink3.mk index e45c02695b2..ec2ca232bde 100644 --- a/print/poppler-glib/buildlink3.mk +++ b/print/poppler-glib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.45 2015/07/15 15:09:37 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.46 2015/10/01 05:36:36 wiz Exp $ BUILDLINK_TREE+= poppler-glib @@ -6,7 +6,7 @@ BUILDLINK_TREE+= poppler-glib POPPLER_GLIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.5.1 -BUILDLINK_ABI_DEPENDS.poppler-glib+= poppler-glib>=0.34.0 +BUILDLINK_ABI_DEPENDS.poppler-glib+= poppler-glib>=0.36.0 BUILDLINK_PKGSRCDIR.poppler-glib?= ../../print/poppler-glib .include "../../devel/glib2/buildlink3.mk" diff --git a/print/poppler-includes/buildlink3.mk b/print/poppler-includes/buildlink3.mk index d361c06d973..11ac12dd7a0 100644 --- a/print/poppler-includes/buildlink3.mk +++ b/print/poppler-includes/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2015/07/15 15:09:37 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2015/10/01 05:36:36 wiz Exp $ BUILDLINK_TREE+= poppler-includes @@ -8,7 +8,7 @@ POPPLER_INCLUDES_BUILDLINK3_MK:= BUILDLINK_DEPMETHOD.poppler-includes?= build BUILDLINK_API_DEPENDS.poppler-includes+= poppler-includes>=0.22.2 -BUILDLINK_ABI_DEPENDS.poppler-includes?= poppler-includes>=0.34.0 +BUILDLINK_ABI_DEPENDS.poppler-includes?= poppler-includes>=0.36.0 BUILDLINK_PKGSRCDIR.poppler-includes?= ../../print/poppler-includes .endif # POPPLER_INCLUDES_BUILDLINK3_MK diff --git a/print/poppler-qt4/buildlink3.mk b/print/poppler-qt4/buildlink3.mk index 94e8c53c06b..7db04620824 100644 --- a/print/poppler-qt4/buildlink3.mk +++ b/print/poppler-qt4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.26 2015/07/15 15:09:37 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.27 2015/10/01 05:36:37 wiz Exp $ BUILDLINK_TREE+= poppler-qt4 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= poppler-qt4 POPPLER_QT4_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.poppler-qt4+= poppler-qt4>=0.6.1 -BUILDLINK_ABI_DEPENDS.poppler-qt4+= poppler-qt4>=0.34.0 +BUILDLINK_ABI_DEPENDS.poppler-qt4+= poppler-qt4>=0.36.0 BUILDLINK_PKGSRCDIR.poppler-qt4?= ../../print/poppler-qt4 .include "../../print/poppler/buildlink3.mk" diff --git a/print/poppler-qt5/buildlink3.mk b/print/poppler-qt5/buildlink3.mk index bef36ef89fe..18826247fb4 100644 --- a/print/poppler-qt5/buildlink3.mk +++ b/print/poppler-qt5/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2015/07/15 15:09:37 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2015/10/01 05:36:37 wiz Exp $ BUILDLINK_TREE+= poppler-qt5 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= poppler-qt5 POPPLER_QT5_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.poppler-qt5+= poppler-qt5>=0.26.0 -BUILDLINK_ABI_DEPENDS.poppler-qt5?= poppler-qt5>=0.34.0 +BUILDLINK_ABI_DEPENDS.poppler-qt5?= poppler-qt5>=0.36.0 BUILDLINK_PKGSRCDIR.poppler-qt5?= ../../print/poppler-qt5 .include "../../print/poppler/buildlink3.mk" diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common index b453f060305..d59c5af0889 100644 --- a/print/poppler/Makefile.common +++ b/print/poppler/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.74 2015/07/14 09:03:05 wiz Exp $ +# $NetBSD: Makefile.common,v 1.75 2015/10/01 05:36:36 wiz Exp $ # # used by print/poppler/Makefile # used by print/poppler-cpp/Makefile @@ -8,7 +8,7 @@ # used by print/poppler-qt5/Makefile # used by print/poppler-utils/Makefile -POPPLER_VERS= 0.34.0 +POPPLER_VERS= 0.36.0 DISTNAME= poppler-${POPPLER_VERS} CATEGORIES= print MASTER_SITES= http://poppler.freedesktop.org/ diff --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk index 0ddc89eea69..88547b2cd39 100644 --- a/print/poppler/buildlink3.mk +++ b/print/poppler/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.44 2015/07/15 15:09:38 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.45 2015/10/01 05:36:36 wiz Exp $ BUILDLINK_TREE+= poppler @@ -6,7 +6,7 @@ BUILDLINK_TREE+= poppler POPPLER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.poppler+= poppler>=0.5.1 -BUILDLINK_ABI_DEPENDS.poppler+= poppler>=0.34.0 +BUILDLINK_ABI_DEPENDS.poppler+= poppler>=0.36.0 BUILDLINK_PKGSRCDIR.poppler?= ../../print/poppler .include "../../graphics/lcms2/buildlink3.mk" diff --git a/print/poppler/distinfo b/print/poppler/distinfo index 6c41ae74edd..2e3abec894d 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.101 2015/07/14 09:03:05 wiz Exp $ +$NetBSD: distinfo,v 1.102 2015/10/01 05:36:36 wiz Exp $ -SHA1 (poppler-0.34.0.tar.xz) = f204cb6a57730971ef561732a269e7bafc8e8476 -RMD160 (poppler-0.34.0.tar.xz) = 6c353c84246c2f00fc8d7f88822dd9f97883d487 -Size (poppler-0.34.0.tar.xz) = 1615264 bytes -SHA1 (patch-aa) = 4ff366a6da2a9bd125af18f6413d9b445ca3307a +SHA1 (poppler-0.36.0.tar.xz) = 23f79efde487617b4c1a327f4a5cb4988b86026e +RMD160 (poppler-0.36.0.tar.xz) = 3c32db6da419d338a7fe68c50584c0d0168cf7fa +Size (poppler-0.36.0.tar.xz) = 1629984 bytes +SHA1 (patch-aa) = 15839af8b9ca17662d721428a96ff74f1bb7ba72 SHA1 (patch-ab) = 55bcf94d51f5c9c5bf999f7b4fa63afebe77c83c SHA1 (patch-ag) = d4df4fdf141186e1cc653bb467b31b3335d733ff SHA1 (patch-aq) = da845661ef7f7aca3072dbeebde0444b4d8f01aa SHA1 (patch-ar) = b064ff2dc9080ff5f1a1361e7798480ace11f3a3 SHA1 (patch-as) = 1238357e57fa310ba9c9f00768c46074b8325739 -SHA1 (patch-qt5_src_Makefile.in) = 8bd1456b2cfc61ea25bbc1ae6fa10e2c9c482828 +SHA1 (patch-qt5_src_Makefile.in) = 8288b41e87a4f14d6a1fd361564e1356f9673dd9 diff --git a/print/poppler/patches/patch-aa b/print/poppler/patches/patch-aa index 345d6911893..72cfc19fe4d 100644 --- a/print/poppler/patches/patch-aa +++ b/print/poppler/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.14 2014/11/20 16:03:46 wiz Exp $ +$NetBSD: patch-aa,v 1.15 2015/10/01 05:36:36 wiz Exp $ Use installed copy of poppler library so we can have a separate poppler-glib package. ---- glib/Makefile.in.orig 2014-11-04 18:46:21.000000000 +0000 +--- glib/Makefile.in.orig 2015-09-09 22:06:58.000000000 +0000 +++ glib/Makefile.in @@ -134,7 +134,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) @@ -12,14 +12,14 @@ poppler-glib package. - $(top_builddir)/poppler/libpoppler.la \ + $(prefix)/lib/libpoppler.la \ $(top_builddir)/poppler/libpoppler-cairo.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) - am__objects_1 = libpoppler_glib_la-poppler-enums.lo -@@ -553,7 +553,7 @@ libpoppler_glib_la_CPPFLAGS = \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +@@ -554,7 +554,7 @@ libpoppler_glib_la_CPPFLAGS = \ $(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES) libpoppler_glib_la_LIBADD = \ - $(top_builddir)/poppler/libpoppler.la \ + $(prefix)/lib/libpoppler.la \ $(top_builddir)/poppler/libpoppler-cairo.la \ + $(PTHREAD_LIBS) \ $(POPPLER_GLIB_LIBS) \ - $(FREETYPE_LIBS) diff --git a/print/poppler/patches/patch-qt5_src_Makefile.in b/print/poppler/patches/patch-qt5_src_Makefile.in index c1b70f333cf..d443835d0f9 100644 --- a/print/poppler/patches/patch-qt5_src_Makefile.in +++ b/print/poppler/patches/patch-qt5_src_Makefile.in @@ -1,9 +1,9 @@ -$NetBSD: patch-qt5_src_Makefile.in,v 1.2 2014/11/20 16:03:46 wiz Exp $ +$NetBSD: patch-qt5_src_Makefile.in,v 1.3 2015/10/01 05:36:36 wiz Exp $ Use installed copy of poppler library so we can have a separate poppler-qt5 package. ---- qt5/src/Makefile.in.orig 2014-11-04 18:46:22.000000000 +0000 +--- qt5/src/Makefile.in.orig 2015-09-09 22:07:00.000000000 +0000 +++ qt5/src/Makefile.in @@ -129,7 +129,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) @@ -15,7 +15,7 @@ poppler-qt5 package. libpoppler_qt5_la-poppler-page.lo \ libpoppler_qt5_la-poppler-fontinfo.lo \ @@ -505,7 +505,7 @@ libpoppler_qt5_la_CXXFLAGS = \ - -Dpoppler_qt5_EXPORTS -fPIC + -Dpoppler_qt5_EXPORTS libpoppler_qt5_la_LIBADD = \ - $(top_builddir)/poppler/libpoppler.la \ -- cgit v1.2.3