--- a/components/desktop/poppler/Makefile Mon Apr 17 11:12:35 2017 -0700
+++ b/components/desktop/poppler/Makefile Mon Apr 17 13:51:21 2017 -0700
@@ -26,15 +26,15 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= poppler
-COMPONENT_VERSION= 0.33.0
+COMPONENT_VERSION= 0.52.0
COMPONENT_PROJECT_URL= http://poppler.freedesktop.org/
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH= \
- sha256:a5fa6d7f7dc5382b48caca82b147c54bdffda02698611af76db5326ba64995a6
+ sha256:528b661738839f9a25f6e580fcd2d5db007e0a1948580c6489f0062798ca1992
COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= library/poppler
COMPONENT_ANITYA_ID= 3686
-TPNO_POPPLER= 25617
+TPNO_POPPLER= 34169
COMPONENT_NAME_1= poppler-data
COMPONENT_VERSION_1= 0.4.7
@@ -72,6 +72,12 @@
CFLAGS += -std=c11
CXXFLAGS += -std=c++11 -D__STDC_WANT_LIB_EXT1__=1
+# There isn't a 64-bit version of pkg-config's nss.pc, so set these "manually".
+MPSLIB.32 = -L/usr/lib/mps -R/usr/lib/mps
+MPSLIB.64 = -L/usr/lib/mps/64 -R/usr/lib/mps/64
+NSS3_LIBS = $(MPSLIB.$(BITS)) -lnss3 -lsmime3 -lssl3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl -lposix4
+CONFIGURE_OPTIONS += NSS3_LIBS="$(NSS3_LIBS)"
+
# Reduce build time dependencies since we don't ship this and can't run as an
# automated test.
CONFIGURE_OPTIONS += --disable-gtk-test
@@ -118,6 +124,8 @@
REQUIRED_PACKAGES += library/glib2
REQUIRED_PACKAGES += library/lcms2
REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += library/nspr
+REQUIRED_PACKAGES += library/security/nss
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += system/library/c++-runtime
REQUIRED_PACKAGES += system/library/fontconfig
--- a/components/desktop/poppler/poppler.p5m Mon Apr 17 11:12:35 2017 -0700
+++ b/components/desktop/poppler/poppler.p5m Mon Apr 17 13:51:21 2017 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr/share/gtk-doc/html/poppler/(.+)$ -> \
@@ -38,13 +38,14 @@
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2012/051 value=PSARC/2016/025 \
- value=PSARC/2016/321
+ value=PSARC/2016/321 value=PSARC/2017/043
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
file path=usr/bin/pdfdetach
file path=usr/bin/pdffonts
file path=usr/bin/pdfimages
file path=usr/bin/pdfinfo
file path=usr/bin/pdfseparate
+file path=usr/bin/pdfsig
file path=usr/bin/pdftocairo
file path=usr/bin/pdftohtml
file path=usr/bin/pdftoppm
@@ -107,6 +108,8 @@
file path=usr/include/poppler/ProfileData.h
file path=usr/include/poppler/Rendition.h
file path=usr/include/poppler/SecurityHandler.h
+file path=usr/include/poppler/SignatureHandler.h
+file path=usr/include/poppler/SignatureInfo.h
file path=usr/include/poppler/Sound.h
file path=usr/include/poppler/SplashOutputDev.h
file path=usr/include/poppler/StdinCachedFile.h
@@ -200,36 +203,36 @@
file path=usr/include/poppler/splash/SplashXPath.h
file path=usr/include/poppler/splash/SplashXPathScanner.h
file path=usr/lib/$(MACH64)/girepository-1.0/Poppler-0.18.typelib
-link path=usr/lib/$(MACH64)/libpoppler-cpp.so target=libpoppler-cpp.so.0.2.1
-link path=usr/lib/$(MACH64)/libpoppler-cpp.so.0 target=libpoppler-cpp.so.0.2.1
-file path=usr/lib/$(MACH64)/libpoppler-cpp.so.0.2.1
-link path=usr/lib/$(MACH64)/libpoppler-glib.so target=libpoppler-glib.so.8.7.0
-# Need to include the old libpoppler-glib.so.5 sym link to allow evince to
+link path=usr/lib/$(MACH64)/libpoppler-cpp.so target=libpoppler-cpp.so.0.3.0
+link path=usr/lib/$(MACH64)/libpoppler-cpp.so.0 target=libpoppler-cpp.so.0.3.0
+file path=usr/lib/$(MACH64)/libpoppler-cpp.so.0.3.0
+link path=usr/lib/$(MACH64)/libpoppler-glib.so target=libpoppler-glib.so.8.8.0
+link path=usr/lib/$(MACH64)/libpoppler-glib.so.8 target=libpoppler-glib.so.8.8.0
+file path=usr/lib/$(MACH64)/libpoppler-glib.so.8.8.0
+link path=usr/lib/$(MACH64)/libpoppler.so target=libpoppler.so.66.0.0
+# Need to include the old libpoppler.so.52 sym link to allow evince to
# correctly run while we go through this transition period.
-link path=usr/lib/$(MACH64)/libpoppler-glib.so.5 target=libpoppler-glib.so.8
-link path=usr/lib/$(MACH64)/libpoppler-glib.so.8 target=libpoppler-glib.so.8.7.0
-file path=usr/lib/$(MACH64)/libpoppler-glib.so.8.7.0
-link path=usr/lib/$(MACH64)/libpoppler.so target=libpoppler.so.52.0.0
-link path=usr/lib/$(MACH64)/libpoppler.so.52 target=libpoppler.so.52.0.0
-file path=usr/lib/$(MACH64)/libpoppler.so.52.0.0
+link path=usr/lib/$(MACH64)/libpoppler.so.52 target=libpoppler.so.66
+link path=usr/lib/$(MACH64)/libpoppler.so.66 target=libpoppler.so.66.0.0
+file path=usr/lib/$(MACH64)/libpoppler.so.66.0.0
file path=usr/lib/$(MACH64)/pkgconfig/poppler-cairo.pc
file path=usr/lib/$(MACH64)/pkgconfig/poppler-cpp.pc
file path=usr/lib/$(MACH64)/pkgconfig/poppler-glib.pc
file path=usr/lib/$(MACH64)/pkgconfig/poppler-splash.pc
file path=usr/lib/$(MACH64)/pkgconfig/poppler.pc
file path=usr/lib/girepository-1.0/Poppler-0.18.typelib
-link path=usr/lib/libpoppler-cpp.so target=libpoppler-cpp.so.0.2.1
-link path=usr/lib/libpoppler-cpp.so.0 target=libpoppler-cpp.so.0.2.1
-file path=usr/lib/libpoppler-cpp.so.0.2.1
-link path=usr/lib/libpoppler-glib.so target=libpoppler-glib.so.8.7.0
-# Need to include the old libpoppler-glib.so.5 sym link to allow evince to
+link path=usr/lib/libpoppler-cpp.so target=libpoppler-cpp.so.0.3.0
+link path=usr/lib/libpoppler-cpp.so.0 target=libpoppler-cpp.so.0.3.0
+file path=usr/lib/libpoppler-cpp.so.0.3.0
+link path=usr/lib/libpoppler-glib.so target=libpoppler-glib.so.8.8.0
+link path=usr/lib/libpoppler-glib.so.8 target=libpoppler-glib.so.8.8.0
+file path=usr/lib/libpoppler-glib.so.8.8.0
+link path=usr/lib/libpoppler.so target=libpoppler.so.66.0.0
+# Need to include the old libpoppler.so.52 sym link to allow evince to
# correctly run while we go through this transition period.
-link path=usr/lib/libpoppler-glib.so.5 target=libpoppler-glib.so.8
-link path=usr/lib/libpoppler-glib.so.8 target=libpoppler-glib.so.8.7.0
-file path=usr/lib/libpoppler-glib.so.8.7.0
-link path=usr/lib/libpoppler.so target=libpoppler.so.52.0.0
-link path=usr/lib/libpoppler.so.52 target=libpoppler.so.52.0.0
-file path=usr/lib/libpoppler.so.52.0.0
+link path=usr/lib/libpoppler.so.52 target=libpoppler.so.66
+link path=usr/lib/libpoppler.so.66 target=libpoppler.so.66.0.0
+file path=usr/lib/libpoppler.so.66.0.0
file path=usr/lib/pkgconfig/poppler-cairo.pc
file path=usr/lib/pkgconfig/poppler-cpp.pc
file path=usr/lib/pkgconfig/poppler-glib.pc
@@ -241,6 +244,7 @@
file path=usr/share/man/man1/pdfimages.1
file path=usr/share/man/man1/pdfinfo.1
file path=usr/share/man/man1/pdfseparate.1
+file path=usr/share/man/man1/pdfsig.1
file path=usr/share/man/man1/pdftocairo.1
file path=usr/share/man/man1/pdftohtml.1
file path=usr/share/man/man1/pdftoppm.1