head 1.3; access; symbols pkgsrc-2020Q3:1.1.0.4 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.2 pkgsrc-2020Q2-base:1.1; locks; strict; comment @// @; 1.3 date 2026.06.24.21.57.36; author wiz; state Exp; branches; next 1.2; commitid k6TcQUOC0vZpe6LG; 1.2 date 2020.12.09.15.05.08; author ryoon; state dead; branches; next 1.1; commitid 3txGRaAp0c7BY4zC; 1.1 date 2020.05.22.01.15.34; author joerg; state Exp; branches; next ; commitid RL7RF3cpaXQyQa9C; desc @@ 1.3 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 --- pdf-unicode.cc.orig 2022-08-09 20:28:01.000000000 +0000 +++ pdf-unicode.cc @@@@ -49,7 +49,7 @@@@ std::string pdf::string_as_utf8(const pdf::String *str */ const static uint32_t replacement_character = 0xFFFD; const char *cstring = pdf::get_c_string(string); - size_t clength = string->getLength(); + size_t clength = string->size(); std::ostringstream stream; if (clength >= 2 && (cstring[0] & 0xFF) == 0xFE && (cstring[1] & 0xFF) == 0xFF) { /* UTF-16-BE Byte Order Mark */ @@@@ -105,7 +105,12 @@@@ std::string pdf::string_as_utf8(pdf::Object &object) std::string pdf::string_as_utf8(pdf::Object &object) { +#if POPPLER_VERSION > 260300 + pdf::String str = pdf::String(object.getString()); + return pdf::string_as_utf8(&str); +#else return pdf::string_as_utf8(object.getString()); +#endif } /* class pdf::FullNFKC @ 1.2 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-unicode.cc,v 1.1 2020/05/22 01:15:34 joerg Exp $ d3 6 a8 1 --- pdf-unicode.cc.orig 2020-05-16 19:53:42.159712563 +0000 d10 10 a19 3 @@@@ -124,7 +124,7 @@@@ std::string pdf::string_as_utf8(pdf::Obj * =================== */ d21 1 a21 3 -pdf::FullNFKC::FullNFKC(Unicode *unistr, int length) +pdf::FullNFKC::FullNFKC(const Unicode *unistr, int length) : data(nullptr), length_(0) d23 7 a29 4 assert(length >= 0); @@@@ -140,7 +140,7 @@@@ pdf::FullNFKC::~FullNFKC() * ====================== */ d31 1 a31 5 -pdf::MinimalNFKC::MinimalNFKC(Unicode *unistr, int length) +pdf::MinimalNFKC::MinimalNFKC(const Unicode *unistr, int length) { this->string.append(unistr, length); } @ 1.1 log @Deal with poppler API fallout @ text @d1 1 a1 1 $NetBSD$ @