head 1.8; access; symbols pkgsrc-2024Q3:1.6.0.20 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.18 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.16 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.14 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.12 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.10 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.8 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.6 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.4 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.2 pkgsrc-2022Q2-base:1.6 pkgsrc-2020Q3:1.4.0.4 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.2 pkgsrc-2020Q2-base:1.4 pkgsrc-2015Q3:1.2.0.4 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.2 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.1.0.14 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.12 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.10 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.8 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.6 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.4 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.2 pkgsrc-2013Q3-base:1.1; locks; strict; comment @// @; 1.8 date 2026.06.24.21.57.36; author wiz; state Exp; branches; next 1.7; commitid k6TcQUOC0vZpe6LG; 1.7 date 2024.10.24.13.37.47; author ryoon; state dead; branches; next 1.6; commitid s1afqURSbeyF0VuF; 1.6 date 2022.04.03.10.09.58; author wiz; state Exp; branches; next 1.5; commitid 3PXLVuGMnTLDUJyD; 1.5 date 2020.12.09.15.05.08; author ryoon; state dead; branches; next 1.4; commitid 3txGRaAp0c7BY4zC; 1.4 date 2020.05.22.01.15.34; author joerg; state Exp; branches; next 1.3; commitid RL7RF3cpaXQyQa9C; 1.3 date 2015.09.24.23.13.34; author ryoon; state dead; branches; next 1.2; commitid 6tD6vgM9gOADQyCy; 1.2 date 2015.04.24.20.18.48; author joerg; state Exp; branches; next 1.1; commitid Xs3bqQCJ1BnANSiy; 1.1 date 2013.08.31.14.54.23; author joerg; state Exp; branches 1.1.14.1; next ; commitid vjQ3TusRMaw0kC3x; 1.1.14.1 date 2015.04.27.21.55.05; author tron; state Exp; branches; next ; commitid 3qY8jK5DGIbGehjy; desc @@ 1.8 log @pdf2djvu: fix build with poppler 26.06.0 Bump PKGREVISION. @ text @$NetBSD$ Fix build with poppler 26.06. From Arch. https://aur.archlinux.org/cgit/aur.git/plain/pdf2djvu-poppler-26.01.0.patch?h=pdf2djvu https://aur.archlinux.org/cgit/aur.git/plain/pdf2djvu-poppler-26.x.patch?h=pdf2djvu Second chunk was added locally, also needed. --- pdf-backend.cc.orig 2022-08-09 20:28:01.000000000 +0000 +++ pdf-backend.cc @@@@ -163,7 +163,7 @@@@ static void cmyk_to_rgb(const double cmyk[], double rg pdf::gfx::RgbColor rgb_cc; for (int i = 0; i < 4; i++) cmyk_cc.c[i] = pdf::gfx::double_as_color_component(cmyk[i]); - cmyk_space.getRGB(&cmyk_cc, &rgb_cc); + cmyk_space.getRGB(cmyk_cc, &rgb_cc); rgb[0] = pdf::gfx::color_component_as_double(rgb_cc.r); rgb[1] = pdf::gfx::color_component_as_double(rgb_cc.g); rgb[2] = pdf::gfx::color_component_as_double(rgb_cc.b); @@@@ -175,13 +175,13 @@@@ static bool annotations_callback(pdf::ant::Annotation std::string border_color; if (annotation->getType() != pdf::ant::Annotation::typeLink) return true; - pdf::ant::Color *color = annotation->getColor(); + const AnnotColor* color = annotation->getColor(); if (color == nullptr) { border_colors.push_back(""); return true; } - const double *values = color->getValues(); + const double *values = color->getValues().data(); switch (color->getSpace()) { case pdf::ant::Color::colorTransparent: @@@@ -407,7 +407,11 @@@@ pdf::Metadata::Metadata(pdf::Document &document) char tzs = 0; int tzh = 0, tzm = 0; if (!pdf::dict_lookup(info_dict, field.first, &object)->isString()) continue; +#if POPPLER_VERSION > 260300 + const char *input = object.getString().c_str(); +#else const char *input = pdf::get_c_string(object.getString()); +#endif if (input[0] == 'D' && input[1] == ':') input += 2; int year = scan_date_digits(input, 4); @@@@ -470,7 +474,11 @@@@ pdf::Renderer::Renderer(pdf::splash::Color &paper_colo bool pdf::Environment::antialias = false; pdf::Renderer::Renderer(pdf::splash::Color &paper_color, bool monochrome) +#if POPPLER_VERSION > 260100 +: pdf::splash::OutputDevice(monochrome ? splashModeMono1 : splashModeRGB8, 4, paper_color), +#else : pdf::splash::OutputDevice(monochrome ? splashModeMono1 : splashModeRGB8, 4, false, paper_color), +#endif catalog(NULL) { this->setFontAntialias(pdf::Environment::antialias); @@@@ -499,7 +507,12 @@@@ bool pdf::get_glyph(splash::Splash *splash, splash::Fo if (font == nullptr) return false; splash::ClipResult clip_result; +#if POPPLER_VERSION > 251200 && POPPLER_VERSION < 260100 + const SplashClip* clip_ptr = const_cast(&splash->getClip()); + if (!font->getGlyph(code, 0, 0, bitmap, static_cast(x), static_cast(y), clip_ptr, &clip_result)) +#else if (!font->getGlyph(code, 0, 0, bitmap, static_cast(x), static_cast(y), splash->getClip(), &clip_result)) +#endif return false; return (clip_result != splashClipAllOutside); } @@@@ -525,7 +538,11 @@@@ void pdf::Renderer::convert_path(pdf::gfx::State *stat { double x1, y1, x2, y2, x3, y3; state->transform(subpath->getX(0), subpath->getY(0), &x1, &y1); +#if POPPLER_VERSION > 260400 + splash_path.moveTo(x1, y1); +#else splash_path.moveTo(static_cast(x1), static_cast(y1)); +#endif int j = 1; int n_points = subpath->getNumPoints(); while (j < n_points) @@@@ -535,17 +552,25 @@@@ void pdf::Renderer::convert_path(pdf::gfx::State *stat state->transform(subpath->getX(j), subpath->getY(j), &x1, &y1); state->transform(subpath->getX(j + 1), subpath->getY(j + 1), &x2, &y2); state->transform(subpath->getX(j + 2), subpath->getY(j + 2), &x3, &y3); +#if POPPLER_VERSION > 260400 + splash_path.curveTo(x1, y1, x2, y2, x3, y3); +#else splash_path.curveTo( static_cast(x1), static_cast(y1), static_cast(x2), static_cast(y2), static_cast(x3), static_cast(y3) ); +#endif j += 3; } else { state->transform(subpath->getX(j), subpath->getY(j), &x1, &y1); +#if POPPLER_VERSION > 260400 + splash_path.lineTo(x1, y1); +#else splash_path.lineTo(static_cast(x1), static_cast(y1)); +#endif j++; } } @ 1.7 log @print/pdf2djvu: Update to 0.9.19 * Fix build with poppler-24.10.0 CHangelog: Not available. @ text @d1 1 a1 1 $NetBSD: patch-pdf-backend.cc,v 1.6 2022/04/03 10:09:58 wiz Exp $ d3 4 a6 1 Poppler-22.03 compat from upstream. d8 3 a10 1 --- pdf-backend.cc.orig 2021-11-22 17:38:31.000000000 +0000 d12 39 a50 2 @@@@ -130,7 +130,11 @@@@ void pdf::Environment::set_antialias(boo */ d52 3 a54 4 pdf::Document::Document(const std::string &file_name) -: ::PDFDoc(new pdf::String(file_name.c_str()), nullptr, nullptr) +#if POPPLER_VERSION >= 220300 +: ::PDFDoc(std::make_unique(file_name.c_str())) d56 1 a56 1 +: ::PDFDoc(new pdf::String(file_name.c_str())) d58 1 d60 52 a111 2 if (!this->isOk()) throw LoadError(); @ 1.6 log @pdf2djvu: update to 0.9.18.2. Add poppler-22.03 compatibility patches from upstream. pdf2djvu (0.9.18.2) unstable; urgency=low * Document minimum required Exiv2 version. * Fix build failure with upcoming Exiv2 1.0. * Remove spurious zero-width spaces from the Ukrainian manual page. * Improve the test suite: + Fix test failure with Exiv2 ≥ 0.27.5. Thanks to Kamil Cukrowski for the bug report and the initial patch. https://github.com/jwilk/pdf2djvu/issues/149 -- Jakub Wilk Mon, 22 Nov 2021 18:38:23 +0100 pdf2djvu (0.9.18.1) unstable; urgency=low * Fix build failure with Poppler ≥ 21.10. * Windows: don't hardcode Poppler data path in the library. -- Jakub Wilk Wed, 13 Oct 2021 14:48:56 +0200 pdf2djvu (0.9.18) unstable; urgency=low [ Ilia Gobjila ] * Fix typo in the Russian documentation. [ Atri Bhattacharya ] * Fix configure check for Poppler ≥ 20.12. Thanks to Evangelos Foutras for the bug report. https://github.com/jwilk/pdf2djvu/issues/144 [ Jakub Wilk ] * Fix build failure with GCC 11. https://github.com/jwilk/pdf2djvu/issues/146 * Upgrade libraries bundled with the Windows package: - Poppler to 21.06; - poppler-data to 0.4.10; - DjVuLibre to 3.5.28; - GraphicsMagick to 1.3.36; - Expat to 2.4.1; - Exiv2 to 0.27.3; - FreeType to 2.10.4; - OpenJPEG to 2.4.0. * Drop support for Python 2.6. -- Jakub Wilk Mon, 07 Jun 2021 20:04:15 +0200 @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @pdf2djvu: Update to 0.9.17.1 Changelog: pdf2djvu (0.9.17.1) unstable; urgency=low * Fix build failure with Poppler >= 20.08. -- Jakub Wilk Fri, 07 Aug 2020 19:13:22 +0200 pdf2djvu (0.9.17) unstable; urgency=low * Fix build failure with Poppler >= 0.86. Thanks to David B. Evans for the bug report. https://github.com/jwilk/pdf2djvu/issues/142 * Drop support for Poppler < 0.35. * Upgrade libraries bundled with the Windows package: - Poppler to 0.86.1; - Expat to 2.2.9; - FreeType to 2.10.1. -- Jakub Wilk Mon, 02 Mar 2020 17:46:38 +0100 pdf2djvu (0.9.16) unstable; urgency=low * Fix build failure with Poppler >= 0.85. -- Jakub Wilk Thu, 20 Feb 2020 11:38:58 +0100 pdf2djvu (0.9.15) unstable; urgency=low * Fix build failure with Poppler >= 0.83. -- Jakub Wilk Fri, 20 Dec 2019 15:30:18 +0100 pdf2djvu (0.9.14) unstable; urgency=low * Fix build failure with Poppler >= 0.82. -- Jakub Wilk Mon, 28 Oct 2019 17:07:29 +0100 @ text @d1 1 a1 1 $NetBSD: patch-pdf-backend.cc,v 1.4 2020/05/22 01:15:34 joerg Exp $ d3 3 a5 1 --- pdf-backend.cc.orig 2020-05-16 19:37:30.700296649 +0000 d7 1 a7 2 @@@@ -48,7 +48,7 @@@@ * ====================== d10 7 a16 18 -static void poppler_error_handler(void *data, ErrorCategory category, pdf::Offset pos, const char *message) +static void poppler_error_handler(ErrorCategory category, pdf::Offset pos, const char *message) { std::string format; const char *category_name = _("PDF error"); @@@@ -103,8 +103,8 @@@@ static void poppler_error_handler(void * pdf::Environment::Environment() { - globalParams = new GlobalParams(); - setErrorCallback(poppler_error_handler, nullptr); + globalParams.reset(new GlobalParams()); + setErrorCallback(poppler_error_handler); } void pdf::Environment::set_antialias(bool value) @@@@ -499,8 +499,8 @@@@ bool pdf::get_glyph(splash::Splash *spla void pdf::Renderer::convert_path(pdf::gfx::State *state, splash::Path &splash_path) d18 2 a19 8 /* Source was copied from . */ - pdf::gfx::Subpath *subpath; - pdf::gfx::Path *path = state->getPath(); + const pdf::gfx::Subpath *subpath; + const pdf::gfx::Path *path = state->getPath(); int n_subpaths = path->getNumSubpaths(); for (int i = 0; i < n_subpaths; i++) { @ 1.4 log @Deal with poppler API fallout @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Update to 0.8.2 * Update HOMEPAGE and MASTER_SITES. Changelog: pdf2djvu (0.8.2) unstable; urgency=low [ Jakub Wilk ] * Fix file corruption for some documents with outline. https://bitbucket.org/jwilk/pdf2djvu/issues/110 Regression introduced in 0.7.20. * Improve thread-safety: + Make GraphicsMagick initialization thread-safe. + Rewrite the subprocess handling code to be thread-safe. Remove PStreams support. * Fix silencing djvuextract's stderr. * Use iconv() for converting from locale encoding to UTF-8. * Document that gettext is needed for internationalization. * Improve error handling. * Improve the test suite. * Update the Polish translation. [ Américo Monteiro ] * Update the Portuguese translation. [ Chris Leick ] * Update the German translation. -- Jakub Wilk Tue, 08 Sep 2015 20:43:24 +0200 pdf2djvu (0.8.1) unstable; urgency=low * Fix “--fg-colors=N” when GraphicsMagick was compiled with QuantumDepth > 8. * Report GraphicsMagick's QuantumDepth in “--version”. * Build with “-Werror=narrowing”. * Document what software is required to run the tests. * Windows: fix loading Poppler data files. * Improve the test suite. -- Jakub Wilk Thu, 13 Aug 2015 17:48:55 +0200 pdf2djvu (0.8) unstable; urgency=low [ Juan Francisco Cantero Hurtado ] * Don't hardcode the Python interpreter path in script shebangs; use “#!/usr/bin/env python” instead. [ Jakub Wilk ] * Don't silently ignore --loss-level when used without --monochrome. https://bitbucket.org/jwilk/pdf2djvu/issue/86 * Add sanity check that output file is distinct from all input files. https://bitbucket.org/jwilk/pdf2djvu/issue/98 * Apply NFKC normalization on characters from the Alphabetic Presentation Forms block (U+FB00–U+FB4F), even when --no-nfkc were specified. This is what Poppler (≥ 0.19) does by default. Thanks to Dmitry Shachnev for the bug report. https://bitbucket.org/jwilk/pdf2djvu/issue/90 https://bugs.freedesktop.org/show_bug.cgi?id=7002 * Fail early if duplicate page numbers were specified in -p/--pages. https://bitbucket.org/jwilk/pdf2djvu/issue/73 * Fail early on duplicate page identifiers and duplicate page titles. * Make --help and --version return with exit code 0. * Windows: build against GraphicsMagick. https://bitbucket.org/jwilk/pdf2djvu/issue/75 * Improve the configure script: + Check if Poppler xpdf headers exist. + Add option for disabling PStreams (--without-pstreams). * Change the order libraries on linker command line. Move libraries provided by the LIBS configure variable to the end. * Use the reentrant S-expression output API when it's available (DjVuLibre ≥ 3.5.25). * Improve error handling. * Improve the test suite. * Improve documentation: + Simplify documentation about build dependencies. + Document that pkg-config is required for building. + Update poppler-data download URL. * Update the Polish translation. [ Américo Monteiro ] * Update the Portuguese translation. [ Chris Leick ] * Update the German translation. [ Kyrill Detinov ] * Update the Russian translation. [ Jean-Paul Guillonneau ] * Update the French translation of the manual page. -- Jakub Wilk Fri, 07 Aug 2015 14:42:08 +0200 pdf2djvu (0.7.21) unstable; urgency=low * Fix insecure use of /tmp when executing c44(1). https://bitbucket.org/jwilk/pdf2djvu/issue/103 -- Jakub Wilk Sat, 09 May 2015 23:21:40 +0200 pdf2djvu (0.7.20) unstable; urgency=low [ Jakub Wilk ] * Don't use djvused for setting document outline. It was too slow for very long documents. https://bitbucket.org/jwilk/pdf2djvu/issue/93 * Test suite: automatically skip tests that require features that were not enabled at build time. https://bitbucket.org/jwilk/pdf2djvu/issue/55 * Improve reporting of versions of the libraries in --version and XMP metadata. * Improve Windows support: + Correctly determine path to DjVuLibre binaries. https://bitbucket.org/jwilk/pdf2djvu/issue/85 + Fix path splitting is East-Asian locales. https://bitbucket.org/jwilk/pdf2djvu/issue/100 + Fix stdout redirection. https://bitbucket.org/jwilk/pdf2djvu/issue/101 * Update the homepage URL and the bug tracker URLs, in documentation and code. http://google-opensource.blogspot.com/2015/03/farewell-to-google-code.html [ Américo Monteiro ] * Update the Portuguese translation. [ Kyrill Detinov ] * Update the Russian translation. [ Chris Leick ] * Update the German translation. [ Serhij Dubyk ] * Update the Ukrainian translation. -- Jakub Wilk Fri, 01 May 2015 14:21:16 +0200 pdf2djvu (0.7.19) unstable; urgency=low * Fix build failure with Poppler ≥ 0.31. Thanks to David Evans for the bug report. https://bitbucket.org/jwilk/pdf2djvu/issue/99 -- Jakub Wilk Fri, 06 Feb 2015 20:00:38 +0100 pdf2djvu (0.7.18) unstable; urgency=low [ Jakub Wilk ] * Make the xml2c script more portable. * In C++11 mode, use “decltype” instead of “typeof”. * Fix build failure with libc++ in C++98 mode. Thanks to Angelo Graziosi for the bug report. https://bitbucket.org/jwilk/pdf2djvu/issue/88 * Use the standard AC_OPENMP macro in the configure script (instead of 3rd-party AX_OPENMP). * Use HTTPS URLs when they are available, in documentation and code. * Fix capitalization error in the German manual page. Thanks to Chris Leick for help. * Drop support for Poppler < 0.11.1. * Improve error handling. [ Américo Monteiro ] * Add Portuguese translation. https://bugs.debian.org/758262 [ Majid Redouane, Jean-Paul Guillonneau ] * Add French translation of the manual page. -- Jakub Wilk Thu, 18 Dec 2014 13:25:10 +0100 pdf2djvu (0.7.17) unstable; urgency=low * Fix build failure with Poppler ≥ 0.23. -- Jakub Wilk Thu, 30 May 2013 22:20:31 +0200 pdf2djvu (0.7.16) unstable; urgency=low * Fix build failure with Poppler ≥ 0.21.1. -- Jakub Wilk Wed, 14 Nov 2012 20:44:57 +0100 pdf2djvu (0.7.15) unstable; urgency=low * Fix build failure with Poppler ≥ 0.21. -- Jakub Wilk Sat, 06 Oct 2012 12:32:09 +0200 @ text @d1 1 a1 1 $NetBSD: patch-pdf-backend.cc,v 1.2 2015/04/24 20:18:48 joerg Exp $ d3 1 a3 1 --- pdf-backend.cc.orig 2012-09-18 15:27:41.000000000 +0000 d5 6 a10 6 @@@@ -54,7 +54,7 @@@@ static void poppler_error_handler(int po error_log << std::endl; } #else -static void poppler_error_handler(void *data, ErrorCategory category, int pos, char *message) +static void poppler_error_handler(void *data, ErrorCategory category, Goffset pos, char *message) d14 8 a21 2 @@@@ -119,15 +119,6 @@@@ pdf::Environment::Environment(const char #endif d24 12 a35 12 -void pdf::Environment::set_antialias(bool value) -{ - if (!globalParams->setAntialias(const_cast(value ? "yes" : "no"))) - throw UnableToSetParameter(_("Unable to set antialias parameter")); - if (!globalParams->setVectorAntialias(const_cast(value ? "yes" : "no"))) - throw UnableToSetParameter(_("Unable to set vector antialias parameter")); -} - - /* class pdf::Document * =================== */ @ 1.2 log @Build with Poppler 0.32. @ text @d1 1 a1 1 $NetBSD: patch-pdf-backend.cc,v 1.1 2013/08/31 14:54:23 joerg Exp $ @ 1.1 log @Fix fallout from poppler API changes. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- pdf-backend.cc.orig 2013-08-31 13:41:40.000000000 +0000 d14 16 @ 1.1.14.1 log @Pullup ticket #4688 - requested by joerg print/pdf2djvu: build fix Revisions pulled up: - print/pdf2djvu/distinfo 1.7 - print/pdf2djvu/patches/patch-pdf-backend.cc 1.2 - print/pdf2djvu/patches/patch-pdf-backend.hh 1.1 - print/pdf2djvu/patches/patch-pdf2djvu.cc 1.2 --- Module Name: pkgsrc Committed By: joerg Date: Fri Apr 24 20:18:48 UTC 2015 Modified Files: pkgsrc/print/pdf2djvu: distinfo pkgsrc/print/pdf2djvu/patches: patch-pdf-backend.cc patch-pdf2djvu.cc Added Files: pkgsrc/print/pdf2djvu/patches: patch-pdf-backend.hh Log Message: Build with Poppler 0.32. @ text @d3 1 a3 1 --- pdf-backend.cc.orig 2012-09-18 15:27:41.000000000 +0000 a13 16 @@@@ -119,15 +119,6 @@@@ pdf::Environment::Environment(const char #endif } -void pdf::Environment::set_antialias(bool value) -{ - if (!globalParams->setAntialias(const_cast(value ? "yes" : "no"))) - throw UnableToSetParameter(_("Unable to set antialias parameter")); - if (!globalParams->setVectorAntialias(const_cast(value ? "yes" : "no"))) - throw UnableToSetParameter(_("Unable to set vector antialias parameter")); -} - - /* class pdf::Document * =================== */ @