pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print Update poppler packages from 0.59.0 to 0.61.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/0941f59de138
branches: trunk
changeset: 372452:0941f59de138
user: spz <spz%pkgsrc.org@localhost>
date: Fri Dec 08 07:48:11 2017 +0000
description:
Update poppler packages from 0.59.0 to 0.61.1
fixing CVE-2017-14517 CVE-2017-14518 CVE-2017-14519 CVE-2017-14520
CVE-2017-15565
upstream notable changes:
Release 0.61.1
core:
* CairoOutputDev: don't overflow y * stride when accessing image data
cpp:
* Fix for corrupted image files on Windows. Bug #102494
build system:
* Fix incorrect paths in .pc files. Bug #103578
* add the custom buildtests target only once. Bug #103003
Release 0.61.0
core:
* Fix crashes in broken files
* Cleanup unused functions from GlobalParams
* Tweak LZWStream::processNextCode error handling. Bug #103174
* Warning fixes
* Remove t1lib code
qt5:
* Clean up the remaining Splash code in Arthur backend. Bug #103117
* ArthurOutputDev: Properly implement saveState/restoreState. Bug #103118
* Fix leak in ArthurOutputDev::updateFont. Bug #103508
build system:
* Use GNUInstallDirs. Bug #103211
* mingw: Install pkg-config files
* mingw: change library names to include the soversion. Bug #103157
* Fix installing a .cc file as header
* Use -pthread flag instead of -lpthread
Release 0.60.1
qt5:
* ArthurOutputDev: Add missing 'return' in error paths
build system:
* FindLIBOPENJPEG.cmake: Add CheckCXXSourceCompiles
Release 0.60.0
core:
* Enable libcurl support by default
* PSOutputDev: Fix wrong text generation. Bug #102760
* Added methods to get and set the font size of text fields. Bug #101692
* CairoOutputDev: Do not extend the pattern in drawImageMaskRegular
* CairoOutputDev: do not use the custom downscaling for rendering images when using cairo >= 1.14
* Fix build with old clang
* Fix various crashes in broken files
* Fix some warnings
* Add some constness to the basic classes
* Remove unused functions from GlobalParams
qt5:
* Added methods to get and set the font size of text fields. Bug #101692
* Add whether renderToImage shows annotations
* ArthurOutputDev: Replace Splash font rendering by Qt font rendering
* ArthurOutputDev: Implement the drawSoftMaskedImage method
* ArthurOutputDev: Fix several small bugs related to dash pattern handling
* Fix two minor typos
build system:
* cmake is now the default build system
* autotools based build system has been removed
utils:
* pdfinfo: don't truncate dest name
diffstat:
print/poppler-cpp/Makefile | 35 ++--
print/poppler-cpp/PLIST | 6 +-
print/poppler-glib/Makefile | 39 +++-
print/poppler-glib/PLIST | 11 +-
print/poppler-includes/Makefile | 34 ++--
print/poppler-includes/PLIST | 9 +-
print/poppler-includes/files/dir.sed | 3 -
print/poppler-includes/files/extract.sed | 6 +-
print/poppler-qt4/Makefile | 20 +-
print/poppler-qt4/PLIST | 7 +-
print/poppler-qt5/Makefile | 22 +-
print/poppler-qt5/PLIST | 7 +-
print/poppler-utils/Makefile | 33 ++--
print/poppler/Makefile | 33 ++--
print/poppler/Makefile.common | 8 +-
print/poppler/PLIST | 6 +-
print/poppler/buildlink3.mk | 4 +-
print/poppler/distinfo | 19 +-
print/poppler/patches/patch-aa | 25 ---
print/poppler/patches/patch-ab | 131 -------------------
print/poppler/patches/patch-ag | 25 ---
print/poppler/patches/patch-ar | 37 -----
print/poppler/patches/patch-as | 16 --
print/poppler/patches/patch-gtkdoc.py | 14 ++
print/poppler/patches/patch-poppler_Form.cc | 14 --
print/poppler/patches/patch-poppler_StructElement.cc | 14 --
print/poppler/patches/patch-qt5_src_Makefile.in | 25 ---
27 files changed, 184 insertions(+), 419 deletions(-)
diffs (truncated from 937 to 300 lines):
diff -r 48fc2e492660 -r 0941f59de138 print/poppler-cpp/Makefile
--- a/print/poppler-cpp/Makefile Fri Dec 08 02:17:38 2017 +0000
+++ b/print/poppler-cpp/Makefile Fri Dec 08 07:48:11 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/08/14 19:26:04 nros Exp $
+# $NetBSD: Makefile,v 1.14 2017/12/08 07:48:12 spz Exp $
.include "../../print/poppler/Makefile.common"
@@ -9,20 +9,26 @@
CONFLICTS+= poppler<0.4.5nb1
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
-PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cpp.pc.in
+PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cpp.pc.cmake
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+# Don't build the cairo graphics backend, required by glib.
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CAIRO=TRUE
# Don't build the cairo graphics backend, required by glib.
-CONFIGURE_ARGS+= --disable-cairo-output
-# Don't build the splash graphics backend.
-CONFIGURE_ARGS+= --disable-splash-output
-# Don't compile poppler qt wrapper.
-CONFIGURE_ARGS+= --disable-poppler-qt
+CMAKE_ARGS+= -DENABLE_SPLASH=OFF
# Don't compile GTK+ test program.
-CONFIGURE_ARGS+= --disable-gtk-test
-CONFIGURE_ARGS+= --disable-utils
+CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
+# Don't compile GLib wrapper which also needs gtk2
+CMAKE_ARGS+= -DENABLE_GLIB=OFF
+# Don't build and install the tools
+CMAKE_ARGS+= -DENABLE_UTILS=OFF
+# Compile poppler cpp wrapper.
+CMAKE_ARGS+= -DENABLE_CPP=ON
+# Don't compile poppler qt4 wrapper.
+CMAKE_ARGS+= -DENABLE_QT4=OFF
+# Don't compile poppler qt5 wrapper.
+CMAKE_ARGS+= -DENABLE_QT5=OFF
+# Don't build libcurl based HTTP support. ## might want to include
+CMAKE_ARGS+= -DENABLE_LIBCURL=OFF
BUILDLINK_API_DEPENDS.poppler+= poppler-${POPPLER_VERS}{,nb*}
.include "../../print/poppler/buildlink3.mk"
@@ -39,9 +45,8 @@
CHECK_BUILTIN.iconv:= no
.if !empty(USE_BUILTIN.iconv:M[nN][oO])
-CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
-.else
-CONFIGURE_ARGS+= --with-libiconv-prefix
+CMAKE_ARGS+= -DICONV_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.iconv}/include
+CMAKE_ARGS+= -DICONV_LIBRARIES:PATH=${BUILDLINK_PREFIX.iconv}/lib
.endif
post-install:
diff -r 48fc2e492660 -r 0941f59de138 print/poppler-cpp/PLIST
--- a/print/poppler-cpp/PLIST Fri Dec 08 02:17:38 2017 +0000
+++ b/print/poppler-cpp/PLIST Fri Dec 08 07:48:11 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2011/10/20 16:32:57 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/12/08 07:48:12 spz Exp $
include/poppler/cpp/poppler-document.h
include/poppler/cpp/poppler-embedded-file.h
include/poppler/cpp/poppler-font.h
@@ -10,5 +10,7 @@
include/poppler/cpp/poppler-rectangle.h
include/poppler/cpp/poppler-toc.h
include/poppler/cpp/poppler-version.h
-lib/libpoppler-cpp.la
+lib/libpoppler-cpp.so
+lib/libpoppler-cpp.so.0
+lib/libpoppler-cpp.so.0.3.0
lib/pkgconfig/poppler-cpp.pc
diff -r 48fc2e492660 -r 0941f59de138 print/poppler-glib/Makefile
--- a/print/poppler-glib/Makefile Fri Dec 08 02:17:38 2017 +0000
+++ b/print/poppler-glib/Makefile Fri Dec 08 07:48:11 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2017/10/15 23:19:12 prlw1 Exp $
+# $NetBSD: Makefile,v 1.66 2017/12/08 07:48:12 spz Exp $
.include "../../print/poppler/Makefile.common"
@@ -9,28 +9,39 @@
CONFLICTS+= poppler<0.4.5nb1
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
-PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-glib.pc.in
+PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-glib.pc.cmake
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+USE_TOOLS+= python
+
# Build the cairo graphics backend, required by glib.
-CONFIGURE_ARGS+= --enable-cairo-output
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CAIRO=FALSE
# Don't build the splash graphics backend.
-CONFIGURE_ARGS+= --disable-splash-output
-# Don't compile poppler qt wrapper.
-CONFIGURE_ARGS+= --disable-poppler-qt
+CMAKE_ARGS+= -DENABLE_SPLASH=OFF
# Don't compile GTK+ test program.
-CONFIGURE_ARGS+= --disable-gtk-test
-CONFIGURE_ARGS+= --disable-utils
-CONFIGURE_ARGS+= --disable-poppler-cpp
+CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
+# Compile GLib wrapper which also needs gtk2
+CMAKE_ARGS+= -DENABLE_GLIB=ON
+# Generate glib API documentation.
+CMAKE_ARGS+= -DENABLE_GTK_DOC=ON
+# Don't build and install the tools
+CMAKE_ARGS+= -DENABLE_UTILS=OFF
+# Don't compile poppler cpp wrapper.
+CMAKE_ARGS+= -DENABLE_CPP=OFF
+# Don't compile poppler qt4 wrapper.
+CMAKE_ARGS+= -DENABLE_QT4=OFF
+# Don't compile poppler qt5 wrapper.
+CMAKE_ARGS+= -DENABLE_QT5=OFF
+# Don't build libcurl based HTTP support. ## might want to include
+CMAKE_ARGS+= -DENABLE_LIBCURL=OFF
+
+# enable for verbose build messages
+#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE
CFLAGS.FreeBSD+= -DLLONG_MAX=__LLONG_MAX
BUILDLINK_API_DEPENDS.poppler+= poppler-${POPPLER_VERS}{,nb*}
.include "../../print/poppler/buildlink3.mk"
-BUILD_DIRS= goo fofi poppler glib
INSTALL_DIRS= glib
INSTALLATION_DIRS+= lib/pkgconfig
@@ -39,8 +50,10 @@
${INSTALL_DATA} ${WRKSRC}/poppler-cairo.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
+.include "../../lang/python/tool.mk"
BUILDLINK_ABI_DEPENDS.glib2+= glib2>=2.41.0
.include "../../devel/glib2/buildlink3.mk"
+.include "../../textproc/gtk-doc/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff -r 48fc2e492660 -r 0941f59de138 print/poppler-glib/PLIST
--- a/print/poppler-glib/PLIST Fri Dec 08 02:17:38 2017 +0000
+++ b/print/poppler-glib/PLIST Fri Dec 08 07:48:11 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2016/08/01 14:11:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22 2017/12/08 07:48:12 spz Exp $
include/poppler/glib/poppler-action.h
include/poppler/glib/poppler-annot.h
include/poppler/glib/poppler-attachment.h
@@ -13,11 +13,15 @@
include/poppler/glib/poppler-page.h
include/poppler/glib/poppler-structure-element.h
include/poppler/glib/poppler.h
-lib/libpoppler-glib.la
+lib/libpoppler-glib.so
+lib/libpoppler-glib.so.8
+lib/libpoppler-glib.so.8.9.0
lib/pkgconfig/poppler-cairo.pc
lib/pkgconfig/poppler-glib.pc
+share/gtk-doc/html/poppler/PopplerAction.html
share/gtk-doc/html/poppler/PopplerAnnot.html
share/gtk-doc/html/poppler/PopplerAttachment.html
+share/gtk-doc/html/poppler/PopplerColor.html
share/gtk-doc/html/poppler/PopplerDocument.html
share/gtk-doc/html/poppler/PopplerFormField.html
share/gtk-doc/html/poppler/PopplerLayer.html
@@ -44,9 +48,8 @@
share/gtk-doc/html/poppler/left.png
share/gtk-doc/html/poppler/poppler-Error-handling.html
share/gtk-doc/html/poppler/poppler-PDF-Utility-functions.html
-share/gtk-doc/html/poppler/poppler-PopplerAction.html
-share/gtk-doc/html/poppler/poppler-PopplerColor.html
share/gtk-doc/html/poppler/poppler-Version-and-Features-Information.html
+share/gtk-doc/html/poppler/poppler-poppler-features.html
share/gtk-doc/html/poppler/poppler.devhelp2
share/gtk-doc/html/poppler/right-insensitive.png
share/gtk-doc/html/poppler/right.png
diff -r 48fc2e492660 -r 0941f59de138 print/poppler-includes/Makefile
--- a/print/poppler-includes/Makefile Fri Dec 08 02:17:38 2017 +0000
+++ b/print/poppler-includes/Makefile Fri Dec 08 07:48:11 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2017/05/22 08:40:10 adam Exp $
+# $NetBSD: Makefile,v 1.19 2017/12/08 07:48:12 spz Exp $
.include "../../print/poppler/Makefile.common"
@@ -9,28 +9,34 @@
CONFLICTS+= poppler-0.5.1 poppler-0.5.1nb1 poppler-0.5.1nb2
-GNU_CONFIGURE= yes
NO_BUILD= yes
+CMAKE_ARGS+= -DENABLE_XPDF_HEADERS=ON
+
INCDIR=${DESTDIR}${PREFIX}/include
.include "../../mk/bsd.prefs.mk"
do-install:
${INSTALL_DATA_DIR} ${INCDIR}
- for subdir in fofi poppler goo splash; \
- do \
- mf=${WRKSRC}/"$$subdir"/Makefile.am; \
- d=`sed -n -f ${FILESDIR}/dir.sed "$$mf"`; \
- ${INSTALL_DATA_DIR} ${INCDIR}/"$$d"; \
- sed -n -f ${FILESDIR}/extract.sed "$$mf" \
- | { while read f; \
- do \
- ${INSTALL_DATA} ${WRKSRC}/"$$subdir/$$f" ${INCDIR}/"$$d"; \
- done }; \
- done
- ${INSTALL_DATA} ${WRKSRC}/poppler/SplashOutputDev.h ${INCDIR}/poppler
+ ${INSTALL_DATA_DIR} ${INCDIR}/poppler
+ sed -n -f $(FILESDIR)/extract.sed ${WRKSRC}/CMakeLists.txt \
+ | grep ^poppler/ | { while read f; \
+ do \
+ ${INSTALL_DATA} ${WRKSRC}/"$$f" ${INCDIR}/poppler; \
+ done };
${INSTALL_DATA} ${WRKSRC}/poppler/poppler-config.h ${INCDIR}/poppler
+ for d in goo fofi splash; do \
+ ${INSTALL_DATA_DIR} ${INCDIR}/poppler/"$$d"; \
+ sed -n -f $(FILESDIR)/extract.sed ${WRKSRC}/CMakeLists.txt \
+ | grep "^$$d/" | { while read f; \
+ do \
+ ${INSTALL_DATA} ${WRKSRC}/"$$f" ${INCDIR}/poppler/"$$d"; \
+ done }; \
+ done
+ # do these actually belong here?
+ ${INSTALL_DATA} ${WRKSRC}/poppler/SignatureInfo.h ${INCDIR}/poppler
+ ${INSTALL_DATA} ${WRKSRC}/goo/NetPBMWriter.h ${INCDIR}/poppler/goo
BUILDLINK_DEPMETHOD.fontconfig= build
.include "../../fonts/fontconfig/buildlink3.mk"
diff -r 48fc2e492660 -r 0941f59de138 print/poppler-includes/PLIST
--- a/print/poppler-includes/PLIST Fri Dec 08 02:17:38 2017 +0000
+++ b/print/poppler-includes/PLIST Fri Dec 08 07:48:11 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2016/04/15 14:36:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2017/12/08 07:48:12 spz Exp $
include/poppler/Annot.h
include/poppler/Array.h
include/poppler/BuiltinFont.h
@@ -9,6 +9,8 @@
include/poppler/CharCodeToUnicode.h
include/poppler/CharTypes.h
include/poppler/CompactFontTables.h
+include/poppler/CurlCachedFile.h
+include/poppler/CurlPDFDocBuilder.h
include/poppler/DateInfo.h
include/poppler/Decrypt.h
include/poppler/Dict.h
@@ -27,6 +29,8 @@
include/poppler/Hints.h
include/poppler/JArithmeticDecoder.h
include/poppler/JBIG2Stream.h
+include/poppler/JPEG2000Stream.h
+include/poppler/JPXStream.h
include/poppler/Lexer.h
include/poppler/Linearization.h
include/poppler/Link.h
@@ -115,9 +119,6 @@
include/poppler/splash/SplashPattern.h
include/poppler/splash/SplashScreen.h
include/poppler/splash/SplashState.h
-include/poppler/splash/SplashT1Font.h
-include/poppler/splash/SplashT1FontEngine.h
-include/poppler/splash/SplashT1FontFile.h
include/poppler/splash/SplashTypes.h
include/poppler/splash/SplashXPath.h
include/poppler/splash/SplashXPathScanner.h
diff -r 48fc2e492660 -r 0941f59de138 print/poppler-includes/files/dir.sed
--- a/print/poppler-includes/files/dir.sed Fri Dec 08 02:17:38 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-1,/if ENABLE_XPDF_HEADERS/ d
-/endif/,$ d
-s,^[a-z_]*_includedir = ..includedir./,,p
diff -r 48fc2e492660 -r 0941f59de138 print/poppler-includes/files/extract.sed
--- a/print/poppler-includes/files/extract.sed Fri Dec 08 02:17:38 2017 +0000
+++ b/print/poppler-includes/files/extract.sed Fri Dec 08 07:48:11 2017 +0000
@@ -1,3 +1,3 @@
-1,/if ENABLE_XPDF_HEADERS/ d
-/endif/,$ d
-s/ \([A-Za-z0-9_-]*\.h\).*/\1/p
+1,/if(ENABLE_XPDF_HEADERS)/ d
+/^endif/,$ d
+s/^ *\([a-z]*\/[A-Za-z0-9_-]*\.h\).*/\1/p
diff -r 48fc2e492660 -r 0941f59de138 print/poppler-qt4/Makefile
--- a/print/poppler-qt4/Makefile Fri Dec 08 02:17:38 2017 +0000
+++ b/print/poppler-qt4/Makefile Fri Dec 08 07:48:11 2017 +0000
Home |
Main Index |
Thread Index |
Old Index