pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/print
Module Name: pkgsrc
Committed By: spz
Date: Fri Dec 8 07:48:12 UTC 2017
Modified Files:
pkgsrc/print/poppler: Makefile Makefile.common PLIST buildlink3.mk
distinfo
pkgsrc/print/poppler-cpp: Makefile PLIST
pkgsrc/print/poppler-glib: Makefile PLIST
pkgsrc/print/poppler-includes: Makefile PLIST
pkgsrc/print/poppler-includes/files: extract.sed
pkgsrc/print/poppler-qt4: Makefile PLIST
pkgsrc/print/poppler-qt5: Makefile PLIST
pkgsrc/print/poppler-utils: Makefile
Added Files:
pkgsrc/print/poppler/patches: patch-gtkdoc.py
Removed Files:
pkgsrc/print/poppler-includes/files: dir.sed
pkgsrc/print/poppler/patches: patch-aa patch-ab patch-ag patch-ar
patch-as patch-poppler_Form.cc patch-poppler_StructElement.cc
patch-qt5_src_Makefile.in
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/print/poppler/Makefile
cvs rdiff -u -r1.92 -r1.93 pkgsrc/print/poppler/Makefile.common
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/poppler/PLIST
cvs rdiff -u -r1.56 -r1.57 pkgsrc/print/poppler/buildlink3.mk
cvs rdiff -u -r1.122 -r1.123 pkgsrc/print/poppler/distinfo
cvs rdiff -u -r1.13 -r1.14 pkgsrc/print/poppler-cpp/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/poppler-cpp/PLIST
cvs rdiff -u -r1.65 -r1.66 pkgsrc/print/poppler-glib/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/print/poppler-glib/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/print/poppler-includes/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/print/poppler-includes/PLIST
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/print/poppler-includes/files/dir.sed
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/print/poppler-includes/files/extract.sed
cvs rdiff -u -r1.48 -r1.49 pkgsrc/print/poppler-qt4/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/poppler-qt4/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/print/poppler-qt5/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/poppler-qt5/PLIST
cvs rdiff -u -r1.34 -r1.35 pkgsrc/print/poppler-utils/Makefile
cvs rdiff -u -r1.17 -r0 pkgsrc/print/poppler/patches/patch-aa
cvs rdiff -u -r1.22 -r0 pkgsrc/print/poppler/patches/patch-ab
cvs rdiff -u -r1.12 -r0 pkgsrc/print/poppler/patches/patch-ag
cvs rdiff -u -r1.7 -r0 pkgsrc/print/poppler/patches/patch-ar
cvs rdiff -u -r1.5 -r0 pkgsrc/print/poppler/patches/patch-as \
pkgsrc/print/poppler/patches/patch-qt5_src_Makefile.in
cvs rdiff -u -r0 -r1.1 pkgsrc/print/poppler/patches/patch-gtkdoc.py
cvs rdiff -u -r1.1 -r0 pkgsrc/print/poppler/patches/patch-poppler_Form.cc \
pkgsrc/print/poppler/patches/patch-poppler_StructElement.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/print/poppler/Makefile
diff -u pkgsrc/print/poppler/Makefile:1.66 pkgsrc/print/poppler/Makefile:1.67
--- pkgsrc/print/poppler/Makefile:1.66 Tue Oct 29 19:05:23 2013
+++ pkgsrc/print/poppler/Makefile Fri Dec 8 07:48:11 2017
@@ -1,32 +1,35 @@
-# $NetBSD: Makefile,v 1.66 2013/10/29 19:05:23 drochner Exp $
+# $NetBSD: Makefile,v 1.67 2017/12/08 07:48:11 spz Exp $
.include "../../print/poppler/Makefile.common"
COMMENT= PDF rendering library
MAINTAINER= reed%reedmedia.net@localhost
-USE_TOOLS+= gmake
-
-#PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cairo.pc.in
-PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-splash.pc.in
-PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler.pc.in
-GNU_CONFIGURE= yes
+#PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cairo.pc.cmake
+PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-splash.pc.cmake
+PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler.pc.cmake
INSTALLATION_DIRS+= include/poppler share/doc/poppler
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
# TODO: Later add an option to choose Splash versus Cairo backend.
# Build the Splash graphics backend.
-CONFIGURE_ARGS+= --enable-splash-output
-# Don't build the cairo graphics backend.
-CONFIGURE_ARGS+= --disable-cairo-output
+CMAKE_ARGS+= -DENABLE_SPLASH=ON
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CAIRO=TRUE
# Don't compile GTK+ test program.
-CONFIGURE_ARGS+= --disable-gtk-test
+CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
# Don't compile GLib wrapper which also needs gtk2
-CONFIGURE_ARGS+= --disable-poppler-glib
+CMAKE_ARGS+= -DENABLE_GLIB=OFF
# Don't build and install the tools
-CONFIGURE_ARGS+= --disable-utils
-CONFIGURE_ARGS+= --disable-poppler-cpp
+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
+
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/print/poppler/Makefile.common
diff -u pkgsrc/print/poppler/Makefile.common:1.92 pkgsrc/print/poppler/Makefile.common:1.93
--- pkgsrc/print/poppler/Makefile.common:1.92 Mon Sep 4 19:57:18 2017
+++ pkgsrc/print/poppler/Makefile.common Fri Dec 8 07:48:11 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.92 2017/09/04 19:57:18 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.93 2017/12/08 07:48:11 spz 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.59.0
+POPPLER_VERS= 0.61.1
DISTNAME= poppler-${POPPLER_VERS}
CATEGORIES= print
MASTER_SITES= https://poppler.freedesktop.org/
@@ -24,8 +24,10 @@ USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
USE_LANGUAGES= c c++
+USE_CMAKE= yes
+
# Don't accidentally find libtiff
-CONFIGURE_ARGS+= --disable-libtiff
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=TRUE
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mclang)
Index: pkgsrc/print/poppler/PLIST
diff -u pkgsrc/print/poppler/PLIST:1.7 pkgsrc/print/poppler/PLIST:1.8
--- pkgsrc/print/poppler/PLIST:1.7 Sun Jun 14 21:16:22 2009
+++ pkgsrc/print/poppler/PLIST Fri Dec 8 07:48:11 2017
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 21:16:22 joerg Exp $
-lib/libpoppler.la
+@comment $NetBSD: PLIST,v 1.8 2017/12/08 07:48:11 spz Exp $
+lib/libpoppler.so
+lib/libpoppler.so.72
+lib/libpoppler.so.72.0.0
lib/pkgconfig/poppler-splash.pc
lib/pkgconfig/poppler.pc
share/doc/poppler/README
Index: pkgsrc/print/poppler/buildlink3.mk
diff -u pkgsrc/print/poppler/buildlink3.mk:1.56 pkgsrc/print/poppler/buildlink3.mk:1.57
--- pkgsrc/print/poppler/buildlink3.mk:1.56 Mon Sep 4 19:57:18 2017
+++ pkgsrc/print/poppler/buildlink3.mk Fri Dec 8 07:48:11 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.56 2017/09/04 19:57:18 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.57 2017/12/08 07:48:11 spz 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.59.0
+BUILDLINK_ABI_DEPENDS.poppler+= poppler>=0.61.0
BUILDLINK_PKGSRCDIR.poppler?= ../../print/poppler
.include "../../graphics/lcms2/buildlink3.mk"
Index: pkgsrc/print/poppler/distinfo
diff -u pkgsrc/print/poppler/distinfo:1.122 pkgsrc/print/poppler/distinfo:1.123
--- pkgsrc/print/poppler/distinfo:1.122 Wed Sep 20 15:21:10 2017
+++ pkgsrc/print/poppler/distinfo Fri Dec 8 07:48:11 2017
@@ -1,15 +1,8 @@
-$NetBSD: distinfo,v 1.122 2017/09/20 15:21:10 jperkin Exp $
+$NetBSD: distinfo,v 1.123 2017/12/08 07:48:11 spz Exp $
-SHA1 (poppler-0.59.0.tar.xz) = 1b7d0a22aaf9a472181823ee9b38439471a4b045
-RMD160 (poppler-0.59.0.tar.xz) = 8e0c2861dba339f911713d86ebbf97207c2de5dc
-SHA512 (poppler-0.59.0.tar.xz) = 23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e
-Size (poppler-0.59.0.tar.xz) = 1712004 bytes
-SHA1 (patch-aa) = f97ea3f4d381c189fc81552d91a50cd62bd0c1a1
-SHA1 (patch-ab) = 5424a59d53c64ef3a40c569aac3111ce7c32dfbc
-SHA1 (patch-ag) = d4df4fdf141186e1cc653bb467b31b3335d733ff
+SHA1 (poppler-0.61.1.tar.xz) = 70a3440e0ac9957cee94ff6a56a173f3377b02ba
+RMD160 (poppler-0.61.1.tar.xz) = 62fa0f917e31e0c733228ea9289b4493a0fc29a8
+SHA512 (poppler-0.61.1.tar.xz) = 780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d
+Size (poppler-0.61.1.tar.xz) = 1433696 bytes
SHA1 (patch-aq) = da845661ef7f7aca3072dbeebde0444b4d8f01aa
-SHA1 (patch-ar) = b064ff2dc9080ff5f1a1361e7798480ace11f3a3
-SHA1 (patch-as) = 1238357e57fa310ba9c9f00768c46074b8325739
-SHA1 (patch-poppler_Form.cc) = 6a5c85b80b8bbcd9d9d3bafcfa07857c8a2cd06b
-SHA1 (patch-poppler_StructElement.cc) = 59c3c1c5e91d315cc443a4c455de3d1cd63c24c4
-SHA1 (patch-qt5_src_Makefile.in) = c3a47fde201d61a7b7674020f5c998173a61b216
+SHA1 (patch-gtkdoc.py) = 22f12d2eabfa0bff78dc88f87cd6d7bf536c8056
Index: pkgsrc/print/poppler-cpp/Makefile
diff -u pkgsrc/print/poppler-cpp/Makefile:1.13 pkgsrc/print/poppler-cpp/Makefile:1.14
--- pkgsrc/print/poppler-cpp/Makefile:1.13 Mon Aug 14 19:26:04 2017
+++ pkgsrc/print/poppler-cpp/Makefile Fri Dec 8 07:48:12 2017
@@ -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 @@ MAINTAINER= reed%reedmedia.net@localhost
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.
-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+= -DCMAKE_DISABLE_FIND_PACKAGE_CAIRO=TRUE
+# Don't build the cairo graphics backend, required by glib.
+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:= yes
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:
Index: pkgsrc/print/poppler-cpp/PLIST
diff -u pkgsrc/print/poppler-cpp/PLIST:1.1 pkgsrc/print/poppler-cpp/PLIST:1.2
--- pkgsrc/print/poppler-cpp/PLIST:1.1 Thu Oct 20 16:32:57 2011
+++ pkgsrc/print/poppler-cpp/PLIST Fri Dec 8 07:48:12 2017
@@ -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-page.h
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
Index: pkgsrc/print/poppler-glib/Makefile
diff -u pkgsrc/print/poppler-glib/Makefile:1.65 pkgsrc/print/poppler-glib/Makefile:1.66
--- pkgsrc/print/poppler-glib/Makefile:1.65 Sun Oct 15 23:19:12 2017
+++ pkgsrc/print/poppler-glib/Makefile Fri Dec 8 07:48:12 2017
@@ -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 @@ MAINTAINER= reed%reedmedia.net@localhost
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
+
+USE_TOOLS+= python
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
# 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 @@ post-install:
${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"
Index: pkgsrc/print/poppler-glib/PLIST
diff -u pkgsrc/print/poppler-glib/PLIST:1.21 pkgsrc/print/poppler-glib/PLIST:1.22
--- pkgsrc/print/poppler-glib/PLIST:1.21 Mon Aug 1 14:11:12 2016
+++ pkgsrc/print/poppler-glib/PLIST Fri Dec 8 07:48:12 2017
@@ -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-movie.h
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-insensit
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
Index: pkgsrc/print/poppler-includes/Makefile
diff -u pkgsrc/print/poppler-includes/Makefile:1.18 pkgsrc/print/poppler-includes/Makefile:1.19
--- pkgsrc/print/poppler-includes/Makefile:1.18 Mon May 22 08:40:10 2017
+++ pkgsrc/print/poppler-includes/Makefile Fri Dec 8 07:48:12 2017
@@ -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 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
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"
Index: pkgsrc/print/poppler-includes/PLIST
diff -u pkgsrc/print/poppler-includes/PLIST:1.13 pkgsrc/print/poppler-includes/PLIST:1.14
--- pkgsrc/print/poppler-includes/PLIST:1.13 Fri Apr 15 14:36:21 2016
+++ pkgsrc/print/poppler-includes/PLIST Fri Dec 8 07:48:12 2017
@@ -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/Catalog.h
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/GlobalParams.h
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/SplashPath.h
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
Index: pkgsrc/print/poppler-includes/files/extract.sed
diff -u pkgsrc/print/poppler-includes/files/extract.sed:1.1.1.1 pkgsrc/print/poppler-includes/files/extract.sed:1.2
--- pkgsrc/print/poppler-includes/files/extract.sed:1.1.1.1 Thu Nov 20 14:32:19 2008
+++ pkgsrc/print/poppler-includes/files/extract.sed Fri Dec 8 07:48:12 2017
@@ -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
Index: pkgsrc/print/poppler-qt4/Makefile
diff -u pkgsrc/print/poppler-qt4/Makefile:1.48 pkgsrc/print/poppler-qt4/Makefile:1.49
--- pkgsrc/print/poppler-qt4/Makefile:1.48 Fri Apr 15 14:36:21 2016
+++ pkgsrc/print/poppler-qt4/Makefile Fri Dec 8 07:48:12 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2016/04/15 14:36:21 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2017/12/08 07:48:12 spz Exp $
.include "../../print/poppler/Makefile.common"
@@ -6,12 +6,18 @@ PKGNAME= poppler-qt4-${POPPLER_VERS}
COMMENT= PDF rendering library (QT4 wrapper)
MAINTAINER= reed%reedmedia.net@localhost
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --disable-cairo-output
-CONFIGURE_ARGS+= --enable-poppler-qt4
-CONFIGURE_ARGS+= --disable-gtk-test
-CONFIGURE_ARGS+= --disable-utils
-CONFIGURE_ENV+= MOCQT4=${QTDIR}/bin/moc
+CMAKE_ARGS+= -DENABLE_SPLASH=ON
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CAIRO=TRUE
+CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
+CMAKE_ARGS+= -DENABLE_GLIB=OFF
+CMAKE_ARGS+= -DENABLE_UTILS=OFF
+CMAKE_ARGS+= -DENABLE_CPP=OFF
+CMAKE_ARGS+= -DENABLE_QT4=ON
+CMAKE_ARGS+= -DENABLE_QT5=OFF
+# Don't build libcurl based HTTP support. ## might want to include
+CMAKE_ARGS+= -DENABLE_LIBCURL=OFF
+
+CMAKE_ARGS+= -DMOCQT4=${QTDIR}/bin/moc
BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}
.include "../../print/poppler/buildlink3.mk"
Index: pkgsrc/print/poppler-qt4/PLIST
diff -u pkgsrc/print/poppler-qt4/PLIST:1.8 pkgsrc/print/poppler-qt4/PLIST:1.9
--- pkgsrc/print/poppler-qt4/PLIST:1.8 Wed Jan 25 14:34:56 2017
+++ pkgsrc/print/poppler-qt4/PLIST Fri Dec 8 07:48:12 2017
@@ -1,12 +1,13 @@
-@comment $NetBSD: PLIST,v 1.8 2017/01/25 14:34:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2017/12/08 07:48:12 spz Exp $
include/poppler/qt4/poppler-annotation.h
include/poppler/qt4/poppler-export.h
include/poppler/qt4/poppler-form.h
-include/poppler/qt4/poppler-link-private.h
include/poppler/qt4/poppler-link.h
include/poppler/qt4/poppler-media.h
include/poppler/qt4/poppler-optcontent.h
include/poppler/qt4/poppler-page-transition.h
include/poppler/qt4/poppler-qt4.h
-lib/libpoppler-qt4.la
+lib/libpoppler-qt4.so
+lib/libpoppler-qt4.so.4
+lib/libpoppler-qt4.so.4.11.0
lib/pkgconfig/poppler-qt4.pc
Index: pkgsrc/print/poppler-qt5/Makefile
diff -u pkgsrc/print/poppler-qt5/Makefile:1.18 pkgsrc/print/poppler-qt5/Makefile:1.19
--- pkgsrc/print/poppler-qt5/Makefile:1.18 Thu Nov 30 16:45:36 2017
+++ pkgsrc/print/poppler-qt5/Makefile Fri Dec 8 07:48:12 2017
@@ -1,21 +1,23 @@
-# $NetBSD: Makefile,v 1.18 2017/11/30 16:45:36 adam Exp $
+# $NetBSD: Makefile,v 1.19 2017/12/08 07:48:12 spz Exp $
-PKGREVISION= 2
.include "../../print/poppler/Makefile.common"
PKGNAME= poppler-qt5-${POPPLER_VERS}
COMMENT= PDF rendering library (QT5 wrapper)
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --disable-cairo-output
-CONFIGURE_ARGS+= --enable-poppler-qt5
-CONFIGURE_ARGS+= --disable-poppler-qt4
-CONFIGURE_ARGS+= --disable-gtk-test
-CONFIGURE_ARGS+= --disable-utils
-CONFIGURE_ENV+= MOCQT5=${QTDIR}/bin/moc
+CMAKE_ARGS+= -DENABLE_SPLASH=ON
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CAIRO=TRUE
+CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
+CMAKE_ARGS+= -DENABLE_GLIB=OFF
+CMAKE_ARGS+= -DENABLE_UTILS=OFF
+CMAKE_ARGS+= -DENABLE_CPP=OFF
+CMAKE_ARGS+= -DENABLE_QT4=OFF
+CMAKE_ARGS+= -DENABLE_QT5=ON
+# Don't build libcurl based HTTP support. ## might want to include
+CMAKE_ARGS+= -DENABLE_LIBCURL=OFF
-USE_TOOLS+= gmake
+CMAKE_ARGS+= -DMOCQT5=${QTDIR}/bin/moc
BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}
.include "../../print/poppler/buildlink3.mk"
Index: pkgsrc/print/poppler-qt5/PLIST
diff -u pkgsrc/print/poppler-qt5/PLIST:1.2 pkgsrc/print/poppler-qt5/PLIST:1.3
--- pkgsrc/print/poppler-qt5/PLIST:1.2 Wed Jan 25 14:34:56 2017
+++ pkgsrc/print/poppler-qt5/PLIST Fri Dec 8 07:48:12 2017
@@ -1,12 +1,13 @@
-@comment $NetBSD: PLIST,v 1.2 2017/01/25 14:34:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/12/08 07:48:12 spz Exp $
include/poppler/qt5/poppler-annotation.h
include/poppler/qt5/poppler-export.h
include/poppler/qt5/poppler-form.h
-include/poppler/qt5/poppler-link-private.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.la
+lib/libpoppler-qt5.so
+lib/libpoppler-qt5.so.1
+lib/libpoppler-qt5.so.1.11.0
lib/pkgconfig/poppler-qt5.pc
Index: pkgsrc/print/poppler-utils/Makefile
diff -u pkgsrc/print/poppler-utils/Makefile:1.34 pkgsrc/print/poppler-utils/Makefile:1.35
--- pkgsrc/print/poppler-utils/Makefile:1.34 Tue Jul 11 16:35:03 2017
+++ pkgsrc/print/poppler-utils/Makefile Fri Dec 8 07:48:12 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2017/07/11 16:35:03 adam Exp $
+# $NetBSD: Makefile,v 1.35 2017/12/08 07:48:12 spz Exp $
.include "../../print/poppler/Makefile.common"
@@ -9,26 +9,27 @@ MAINTAINER= reed%reedmedia.net@localhost
CONFLICTS+= poppler-0.5.1 poppler-0.5.1nb1 poppler-0.5.1nb2
CONFLICTS+= xpdf<3.02pl4nb1
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
-
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-# Don't build the splash graphics backend.
-CONFIGURE_ARGS+= --disable-splash-output
-# Don't compile poppler qt wrapper.
-CONFIGURE_ARGS+= --disable-poppler-qt
+# Build the splash graphics backend. ## for pdftoppm
+CMAKE_ARGS+= -DENABLE_SPLASH=ON
# Don't compile GTK+ test program.
-CONFIGURE_ARGS+= --disable-gtk-test
+CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
# Don't compile GLib wrapper which also needs gtk2
-CONFIGURE_ARGS+= --disable-poppler-glib
-# Enable build and install of the tools
-CONFIGURE_ARGS+= --enable-utils # the default
+CMAKE_ARGS+= -DENABLE_GLIB=OFF
+# Build and install the tools
+CMAKE_ARGS+= -DENABLE_UTILS=ON
+# 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
+
BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}
.include "../../print/poppler/buildlink3.mk"
-# needed to build libpoppler-cairo
-BUILD_DIRS= fofi goo poppler utils
INSTALL_DIRS= utils
.include "../../mk/bsd.prefs.mk"
Added files:
Index: pkgsrc/print/poppler/patches/patch-gtkdoc.py
diff -u /dev/null pkgsrc/print/poppler/patches/patch-gtkdoc.py:1.1
--- /dev/null Fri Dec 8 07:48:12 2017
+++ pkgsrc/print/poppler/patches/patch-gtkdoc.py Fri Dec 8 07:48:11 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-gtkdoc.py,v 1.1 2017/12/08 07:48:11 spz Exp $
+
+--- gtkdoc.py.orig 2017-11-12 18:14:32.000000000 +0000
++++ gtkdoc.py
+@@ -223,6 +223,9 @@ class GTKDoc(object):
+ return
+
+ def copy_file_replacing_existing(src, dest):
++ if src == dest:
++ self.logger.debug('copy_file_replacing_existing not copying to itself: %s', src)
++ return
+ if os.path.isdir(src):
+ self.logger.debug('skipped directory %s', src)
+ return
Home |
Main Index |
Thread Index |
Old Index