kpriv
/
pkgsrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

poppler: update to 23.12.0 

Merge poppler-glib into poppler - it was only split off because
of the glib2 dependency, and cairo now pulls that in.

Release 23.12.0:
        core:
         * Rewrite FoFiType1::parse to be more flexible. Issue #1422
         * Small internal code refactoring
This commit is contained in:
wiz 2023-12-30 12:56:24 +00:00
parent 0d268fb53b
commit bf92763e89
13 changed files with 56 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
print/poppler-cpp/Makefile
View File

@ -1,6 +1,5 @@
# $NetBSD: Makefile,v 1.41 2023/11/15 09:25:53 wiz Exp $
# $NetBSD: Makefile,v 1.42 2023/12/30 12:56:24 wiz Exp $
PKGREVISION= 1
.include "../../print/poppler/Makefile.common"
PKGNAME= poppler-cpp-${POPPLER_VERS}

4
print/poppler-cpp/buildlink3.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.66 2023/11/15 09:25:53 wiz Exp $
# $NetBSD: buildlink3.mk,v 1.67 2023/12/30 12:56:24 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>=23.11.0nb1
BUILDLINK_ABI_DEPENDS.poppler-cpp+= poppler-cpp>=23.12.0
BUILDLINK_PKGSRCDIR.poppler-cpp?= ../../print/poppler-cpp
.include "../../print/poppler/buildlink3.mk"

3
print/poppler-qt5/Makefile
View File

@ -1,6 +1,5 @@
# $NetBSD: Makefile,v 1.72 2023/11/15 09:25:53 wiz Exp $
# $NetBSD: Makefile,v 1.73 2023/12/30 12:56:24 wiz Exp $
PKGREVISION= 1
.include "../../print/poppler/Makefile.common"
PKGNAME= poppler-qt5-${POPPLER_VERS}

4
print/poppler-qt5/buildlink3.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.51 2023/11/15 09:25:53 wiz Exp $
# $NetBSD: buildlink3.mk,v 1.52 2023/12/30 12:56:24 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>=23.11.0nb1
BUILDLINK_ABI_DEPENDS.poppler-qt5+= poppler-qt5>=23.12.0
BUILDLINK_PKGSRCDIR.poppler-qt5?= ../../print/poppler-qt5
.include "../../print/poppler/buildlink3.mk"

3
print/poppler-qt6/Makefile
View File

@ -1,10 +1,9 @@
# $NetBSD: Makefile,v 1.18 2023/11/15 09:25:53 wiz Exp $
# $NetBSD: Makefile,v 1.19 2023/12/30 12:56:25 wiz Exp $
# this must be set before compiler.mk
# is included in Makefile.common
GCC_REQD+= 9 # required by Qt6 headers
PKGREVISION= 1
.include "../../print/poppler/Makefile.common"
PKGNAME= poppler-qt6-${POPPLER_VERS}

4
print/poppler-qt6/buildlink3.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.12 2023/11/15 09:25:53 wiz Exp $
# $NetBSD: buildlink3.mk,v 1.13 2023/12/30 12:56:25 wiz Exp $
BUILDLINK_TREE+= poppler-qt6
@ -6,7 +6,7 @@ BUILDLINK_TREE+= poppler-qt6
POPPLER_QT6_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.poppler-qt6+= poppler-qt6>=22.01.0
BUILDLINK_ABI_DEPENDS.poppler-qt6?= poppler-qt6>=23.11.0nb1
BUILDLINK_ABI_DEPENDS.poppler-qt6?= poppler-qt6>=23.12.0
BUILDLINK_PKGSRCDIR.poppler-qt6?= ../../print/poppler-qt6
.include "../../print/poppler/buildlink3.mk"

3
print/poppler-utils/Makefile
View File

@ -1,6 +1,5 @@
# $NetBSD: Makefile,v 1.63 2023/11/15 09:25:54 wiz Exp $
# $NetBSD: Makefile,v 1.64 2023/12/30 12:56:25 wiz Exp $
PKGREVISION= 1
.include "../../print/poppler/Makefile.common"
PKGNAME= poppler-utils-${POPPLER_VERS}

1
print/poppler/DESCR
View File

@ -7,6 +7,5 @@ effort. And the poppler developers would like to move libpoppler
forward in a number of areas that doesn't fit within the goals of
xpdf.
The GLib wrapper is available in the print/poppler-glib package.
The QT wrapper is available in the print/poppler-qt package.
The PDF utilities are available in the print/poppler-utils package.

19
print/poppler/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.101 2023/11/15 09:23:19 wiz Exp $
# $NetBSD: Makefile,v 1.102 2023/12/30 12:56:24 wiz Exp $
.include "../../print/poppler/Makefile.common"
@ -8,10 +8,15 @@ PKGCONFIG_OVERRIDE+= poppler.pc.cmake
INSTALLATION_DIRS+= include/poppler share/doc/poppler
.if ${OPSYS} == "Darwin"
# MacOS Xcode does not provide /usr/include, so be explicit
CMAKE_ARGS+= -DGLIB2_INCLUDE_DIRS=${PREFIX}/include
.endif
# Don't compile GTK+ test program.
CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
# Don't compile GLib wrapper which also needs gtk2
CMAKE_ARGS+= -DENABLE_GLIB=OFF
# Compile GLib wrapper which also needs gtk2
CMAKE_ARGS+= -DENABLE_GLIB=ON
# Don't build and install the tools
CMAKE_ARGS+= -DENABLE_UTILS=OFF
# Don't compile poppler cpp wrapper.
@ -24,6 +29,8 @@ CMAKE_ARGS+= -DENABLE_LIBCURL=OFF
# Don't run gperf if it's present
CMAKE_ARGS+= -DRUN_GPERF_IF_PRESENT=OFF
SUPERSEDES+= poppler-glib-[0-9]*
.include "../../mk/bsd.prefs.mk"
.if ${USE_CROSS_COMPILE:tl} == "yes"
@ -43,10 +50,16 @@ post-install:
.include "../../devel/nss/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.41.0
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPMETHOD.gobject-introspection= build
.include "../../devel/gobject-introspection/buildlink3.mk"
BUILDLINK_API_DEPENDS.cairo+= cairo>=1.18
.include "../../graphics/cairo/buildlink3.mk"
.include "../../graphics/lcms2/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../lang/python/tool.mk"
.include "../../mk/bsd.pkg.mk"

5
print/poppler/Makefile.common
View File

@ -1,14 +1,13 @@
# $NetBSD: Makefile.common,v 1.150 2023/11/15 09:23:19 wiz Exp $
# $NetBSD: Makefile.common,v 1.151 2023/12/30 12:56:24 wiz Exp $
#
# used by print/poppler/Makefile
# used by print/poppler-cpp/Makefile
# used by print/poppler-glib/Makefile
# used by print/poppler-includes/Makefile
# used by print/poppler-qt5/Makefile
# used by print/poppler-qt6/Makefile
# used by print/poppler-utils/Makefile
POPPLER_VERS= 23.11.0
POPPLER_VERS= 23.12.0
DISTNAME= poppler-${POPPLER_VERS}
CATEGORIES= print
MASTER_SITES= https://poppler.freedesktop.org/

23
print/poppler/PLIST
View File

@ -1,7 +1,28 @@
@comment $NetBSD: PLIST,v 1.49 2023/11/15 09:23:19 wiz Exp $
@comment $NetBSD: PLIST,v 1.50 2023/12/30 12:56:24 wiz Exp $
include/poppler/glib/poppler-action.h
include/poppler/glib/poppler-annot.h
include/poppler/glib/poppler-attachment.h
include/poppler/glib/poppler-date.h
include/poppler/glib/poppler-document.h
include/poppler/glib/poppler-enums.h
include/poppler/glib/poppler-features.h
include/poppler/glib/poppler-form-field.h
include/poppler/glib/poppler-layer.h
include/poppler/glib/poppler-macros.h
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.so
lib/libpoppler-glib.so.8
lib/libpoppler-glib.so.8.26.0
lib/libpoppler.so
lib/libpoppler.so.133
lib/libpoppler.so.133.0.0
lib/pkgconfig/poppler-glib.pc
lib/pkgconfig/poppler.pc
share/doc/poppler/README-XPDF
share/doc/poppler/README.md
share/gir-1.0/Poppler-0.18.gir

4
print/poppler/buildlink3.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.97 2023/11/15 09:25:50 wiz Exp $
# $NetBSD: buildlink3.mk,v 1.98 2023/12/30 12:56:24 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>=23.11.0
BUILDLINK_ABI_DEPENDS.poppler+= poppler>=23.12.0
BUILDLINK_PKGSRCDIR.poppler?= ../../print/poppler
GCC_REQD+= 7

8
print/poppler/distinfo
View File

@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.174 2023/11/15 09:23:19 wiz Exp $
$NetBSD: distinfo,v 1.175 2023/12/30 12:56:24 wiz Exp $
BLAKE2s (poppler-23.11.0.tar.xz) = 6e9b7ef78faa238f98b3085820bba956bb7272d0ef04610be1a3d5092f9d0f97
SHA512 (poppler-23.11.0.tar.xz) = 0312472ff80c10aaec0c06e6bfd3f74257672c2001301db4d44e28051387ad5ddd8126d45e82c75ff4585cfde8e34a68bcab2d979aa58c904c60dc3efb1b6f3d
Size (poppler-23.11.0.tar.xz) = 1894712 bytes
BLAKE2s (poppler-23.12.0.tar.xz) = 150985922d8cbcb484bef581462640e8b13b869a53dba30ada286bc3ce29cc51
SHA512 (poppler-23.12.0.tar.xz) = f28962f6842091a68edfb18e5f76e29fdf65d2a7cca6cb4be4202a35bab3e80a2dbe10b86ab8bc4fff7e555a077a41314b9892e19d0d7d89724b9ebb3db93852
Size (poppler-23.12.0.tar.xz) = 1895580 bytes