From nobody Mon Nov 08 07:50:47 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BFB3018488BF; Mon, 8 Nov 2021 07:50:47 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hnjw75162z3rrX; Mon, 8 Nov 2021 07:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 831B55BCC; Mon, 8 Nov 2021 07:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1A87old1061089; Mon, 8 Nov 2021 07:50:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A87olS1061088; Mon, 8 Nov 2021 07:50:47 GMT (envelope-from git) Date: Mon, 8 Nov 2021 07:50:47 GMT Message-Id: <202111080750.1A87olS1061088@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 09b7766d410e - main - graphics/inkscape: Fix build with upcoming Poppler 21.11.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09b7766d410e3ba775c46c894022335a20b4f46a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=09b7766d410e3ba775c46c894022335a20b4f46a commit 09b7766d410e3ba775c46c894022335a20b4f46a Author: Gleb Popov AuthorDate: 2021-11-08 07:48:52 +0000 Commit: Gleb Popov CommitDate: 2021-11-08 07:50:06 +0000 graphics/inkscape: Fix build with upcoming Poppler 21.11.0 Reported by: tcberner Obtained from: Arch Linux PR: 259656 --- graphics/inkscape/files/patch-poppler-compat.diff | 26 +++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/graphics/inkscape/files/patch-poppler-compat.diff b/graphics/inkscape/files/patch-poppler-compat.diff new file mode 100644 index 000000000000..c12ac5eccdd4 --- /dev/null +++ b/graphics/inkscape/files/patch-poppler-compat.diff @@ -0,0 +1,26 @@ +From ff61b5e3df3351d4ab5437181fe6d34729f4cbbb Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras +Date: Mon, 1 Nov 2021 21:45:38 +0200 +Subject: [PATCH] Fix build with poppler 21.11.0 + +GfxFont::tag is now of type std::string instead of GooString *. +--- + src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index e3d04d544b..feecefa043 100644 +--- src/extension/internal/pdfinput/pdf-parser.cpp ++++ src/extension/internal/pdfinput/pdf-parser.cpp +@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/) + } + if (printCommands) { + printf(" font: tag=%s name='%s' %g\n", ++#if POPPLER_CHECK_VERSION(21,11,0) ++ font->getTag().c_str(), ++#else + font->getTag()->getCString(), ++#endif + font->getName() ? font->getName()->getCString() : "???", + args[1].getNum()); + fflush(stdout);