From owner-svn-ports-all@freebsd.org Fri Jan 31 08:55:13 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E4525238D83; Fri, 31 Jan 2020 08:55:13 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4889z55hRrz4Jvj; Fri, 31 Jan 2020 08:55:13 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A5D26B676; Fri, 31 Jan 2020 08:55:13 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00V8tD8Z069195; Fri, 31 Jan 2020 08:55:13 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00V8tD4b069194; Fri, 31 Jan 2020 08:55:13 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202001310855.00V8tD4b069194@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Fri, 31 Jan 2020 08:55:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524680 - head/converters/pdf2djvu/files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/converters/pdf2djvu/files X-SVN-Commit-Revision: 524680 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Jan 2020 08:55:14 -0000 Author: tcberner Date: Fri Jan 31 08:55:13 2020 New Revision: 524680 URL: https://svnweb.freebsd.org/changeset/ports/524680 Log: converters/pdf2djvu: prepare for poppler 0.85 Modified: head/converters/pdf2djvu/files/patch-pdf-backend.cc Modified: head/converters/pdf2djvu/files/patch-pdf-backend.cc ============================================================================== --- head/converters/pdf2djvu/files/patch-pdf-backend.cc Fri Jan 31 08:45:21 2020 (r524679) +++ head/converters/pdf2djvu/files/patch-pdf-backend.cc Fri Jan 31 08:55:13 2020 (r524680) @@ -1,15 +1,55 @@ --- pdf-backend.cc.orig 2019-06-10 17:06:44 UTC +++ pdf-backend.cc -@@ -103,7 +103,7 @@ static void poppler_error_handler(void *data, ErrorCat +@@ -48,7 +48,7 @@ + * ====================== + */ +-static void poppler_error_handler(void *data, ErrorCategory category, pdf::Offset pos, const char *message) ++static void poppler_error_handler_new(ErrorCategory category, pdf::Offset pos, const char *message) + { + std::string format; + const char *category_name = _("PDF error"); +@@ -94,6 +94,11 @@ static void poppler_error_handler(void *data, ErrorCat + error_log << std::endl; + } + ++static void poppler_error_handler(void *data, ErrorCategory category, pdf::Offset pos, const char *message) ++{ ++ poppler_error_handler_new(category, pos, message); ++} ++ + #if POPPLER_VERSION < 7000 + static void poppler_error_handler(void *data, ErrorCategory category, pdf::Offset pos, char *message) + { +@@ -101,10 +106,26 @@ static void poppler_error_handler(void *data, ErrorCat + } + #endif + ++// for POPPLER_VERSION >= 8500: ++template static auto set_error_callback(T1 callback1, T2 callback2) -> decltype(setErrorCallback(callback2)) ++{ ++ setErrorCallback(callback2); ++} ++ ++// for POPPLER_VERSION < 8500: ++template static auto set_error_callback(T1 callback1, T2 callback2) -> decltype(setErrorCallback(callback1, nullptr)) ++{ ++ setErrorCallback(callback1, nullptr); ++} ++ pdf::Environment::Environment() { - globalParams = new GlobalParams(); + globalParams = std::unique_ptr(new GlobalParams); ++#if POPPLER_VERSION >= 7000 ++ set_error_callback(poppler_error_handler, poppler_error_handler_new); ++#else setErrorCallback(poppler_error_handler, nullptr); ++#endif } -@@ -499,12 +499,11 @@ bool pdf::get_glyph(splash::Splash *splash, splash::Fo + void pdf::Environment::set_antialias(bool value) +@@ -499,12 +520,11 @@ bool pdf::get_glyph(splash::Splash *splash, splash::Fo void pdf::Renderer::convert_path(pdf::gfx::State *state, splash::Path &splash_path) { /* Source was copied from . */