From owner-dev-commits-ports-all@freebsd.org Wed Apr 14 14:49:29 2021 Return-Path: Delivered-To: dev-commits-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 0DDD25DC3E1; Wed, 14 Apr 2021 14:49:29 +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 4FL53D72lGz3MH0; Wed, 14 Apr 2021 14:49:28 +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 E42A61FAB4; Wed, 14 Apr 2021 14:49:28 +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 13EEnSAm053143; Wed, 14 Apr 2021 14:49:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13EEnSL9053142; Wed, 14 Apr 2021 14:49:28 GMT (envelope-from git) Date: Wed, 14 Apr 2021 14:49:28 GMT Message-Id: <202104141449.13EEnSL9053142@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 9c20cc4799c3 - main - print/scribus-devel: prepare for graphics/poppler 21.04 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c20cc4799c31f1a9804d15bc9af0bd205837bba Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Apr 2021 14:49:29 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=9c20cc4799c31f1a9804d15bc9af0bd205837bba commit 9c20cc4799c31f1a9804d15bc9af0bd205837bba Author: Tobias C. Berner AuthorDate: 2021-04-14 14:48:25 +0000 Commit: Tobias C. Berner CommitDate: 2021-04-14 14:48:25 +0000 print/scribus-devel: prepare for graphics/poppler 21.04 Add upstream patch to fix build with the newly released poppler 21.04 PR: 254808 Obtained from: Arch Linux --- print/scribus-devel/files/patch-poppler-21.04 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/print/scribus-devel/files/patch-poppler-21.04 b/print/scribus-devel/files/patch-poppler-21.04 new file mode 100644 index 000000000000..e6dcc2222ae2 --- /dev/null +++ b/print/scribus-devel/files/patch-poppler-21.04 @@ -0,0 +1,16 @@ +Index: scribus/plugins/import/pdf/slaoutput.h +=================================================================== +--- scribus/plugins/import/pdf/slaoutput.h (revision 24598) ++++ scribus/plugins/import/pdf/slaoutput.h (revision 24599) +@@ -379,7 +379,11 @@ + Catalog *catalog {nullptr}; + SplashFontEngine *m_fontEngine {nullptr}; + SplashFont *m_font {nullptr}; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 4, 0) ++ std::unique_ptr m_formWidgets; ++#else + FormPageWidgets *m_formWidgets {nullptr}; ++#endif + QHash > m_radioMap; + QHash m_radioButtons; + int m_actPage;