kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

converters/pdf2djvu: switch to C++17 for upcoming poppler, -XMP option

Browse source 
This is a "fix-it-before-it-breaks" commit.

The issue is the upcoming updating for graphics/poppler. It *requires*
consumers to be C++17 or later. Previously it was ok with C++11 or
later. However, graphics/exiv2 is incompatible with C++17 in many
ways; there's work on a new release that is compatible, but that's
not out yet and not really applicable to the exiv2 version found
in ports. (As an example of things-that-change, "register" is a
keyword in C, which informs the storage class of a variable; in C++
up to C++17 it was possibly-meaningful but deprecated while in C++17
it is a reserved keyword but not allowed for storage class; any
`register int x` is now a syntax error and patching that up outside
of upstream repos is no fun at all).

Mark XMP option broken because it pulls in (for the option)
graphics/exiv2, while graphics/poppler is always needed.

PR:	260956
This commit is contained in:
Adriaan de Groot 2022-01-11 23:43:27 +01:00
parent 1a7cb85fda
commit bb2ef4e129
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
converters/pdf2djvu/Makefile
View file

@ -1,13 +1,9 @@
PORTNAME= pdf2djvu
DISTVERSION= 0.9.17.1
PORTREVISION= 17
DISTVERSION= 0.9.18.2
PORTREVISION= 1
CATEGORIES= converters
MASTER_SITES= https://github.com/jwilk/${PORTNAME}/releases/download/${PORTVERSION}/
# Poppler 21.10 support
PATCH_SITES= https://github.com/jwilk/pdf2djvu/commit/
PATCHFILES= e528d3ab88c582e8481c9014982263d9c9e992fe.patch:-p1
MAINTAINER= samy.mahmoudi@gmail.com
COMMENT= Creates DjVu files from PDF files
@ -18,14 +14,14 @@ BUILD_DEPENDS= ${LOCALBASE}/include/pstreams/pstream.h:devel/pstreams
LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre \
libpoppler.so:graphics/poppler
USES= autoreconf:build compiler:c++11-lang gettext-tools \
USES= autoreconf:build compiler:c++17-lang gettext-tools \
gmake iconv localbase pkgconfig tar:xz
USE_CXXSTD= c++11
USE_CXXSTD= c++17
GNU_CONFIGURE= yes
OPTIONS_DEFINE= COLOR_QUANTIZATION DOCS NLS MULTITHREADING XMP
OPTIONS_DEFAULT=COLOR_QUANTIZATION MULTITHREADING XMP
OPTIONS_DEFAULT=COLOR_QUANTIZATION MULTITHREADING
OPTIONS_SUB= yes
COLOR_QUANTIZATION_DESC=Color quantization via GraphicsMagick++
@ -49,6 +45,7 @@ MULTITHREADING_CONFIGURE_ENABLE=openmp
XMP_CONFIGURE_ENABLE= xmp
XMP_LIB_DEPENDS= libexiv2.so:graphics/exiv2
XMP_BROKEN= graphics/exiv2 and graphics/poppler disagree about usable C++ standard
pre-configure:
@cd ${WRKSRC} && ${SH} ${FILESDIR}/bootstrap

6
converters/pdf2djvu/distinfo
View file

@ -1,5 +1,5 @@
TIMESTAMP = 1633515656
SHA256 (pdf2djvu-0.9.17.1.tar.xz) = 5bbbb7bdc7858a1eeac6ff270e5a323390f2abb6bd3b0b2ae08c1965272226a3
SIZE (pdf2djvu-0.9.17.1.tar.xz) = 295540
TIMESTAMP = 1641936020
SHA256 (pdf2djvu-0.9.18.2.tar.xz) = 9ea03f21d841a336808d89d65015713c0785e7295a6559d77771dc795333a9fa
SIZE (pdf2djvu-0.9.18.2.tar.xz) = 305912
SHA256 (e528d3ab88c582e8481c9014982263d9c9e992fe.patch) = 39cd67224052205bcf65eddf30e71953b329e2775e917ebe0993bee4696590bb
SIZE (e528d3ab88c582e8481c9014982263d9c9e992fe.patch) = 1149