From owner-svn-ports-head@freebsd.org Tue Mar 9 15:53:12 2021 Return-Path: Delivered-To: svn-ports-head@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 96EBD557394; Tue, 9 Mar 2021 15:53:12 +0000 (UTC) (envelope-from pkubaj@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 4Dw09N3sSJz4cH6; Tue, 9 Mar 2021 15:53:12 +0000 (UTC) (envelope-from pkubaj@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 77BD81EAFA; Tue, 9 Mar 2021 15:53:12 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 129FrCjp082015; Tue, 9 Mar 2021 15:53:12 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 129FrCvp082013; Tue, 9 Mar 2021 15:53:12 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202103091553.129FrCvp082013@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Tue, 9 Mar 2021 15:53:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567940 - head/print/scribus-devel/files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/print/scribus-devel/files X-SVN-Commit-Revision: 567940 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Mar 2021 15:53:12 -0000 Author: pkubaj Date: Tue Mar 9 15:53:11 2021 New Revision: 567940 URL: https://svnweb.freebsd.org/changeset/ports/567940 Log: print/scribus-devel: fix build after poppler 21.03.0 upgrade PR: 254158 Submitted by: tcberner Reported by: vvd@unislabs.com Added: head/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp (contents, props changed) head/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h (contents, props changed) Added: head/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp Tue Mar 9 15:53:11 2021 (r567940) @@ -0,0 +1,35 @@ +--- scribus/plugins/import/pdf/slaoutput.cpp.orig 2021-03-09 15:39:49 UTC ++++ scribus/plugins/import/pdf/slaoutput.cpp +@@ -2291,9 +2291,19 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *stat + return gTrue; + } + +-GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) ++bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) ++#else ++GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int /*paintType*/, int /*tilingType*/, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) ++#endif + { + // qDebug() << "SlaOutputDev::tilingPatternFill"; ++ #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) ++ const double *bbox = tPat->getBBox(); ++ const double *pmat = tPat->getMatrix(); ++ Dict *resDict = tPat->getResDict(); ++#endif ++ + PDFRectangle box; + Gfx *gfx; + QString id; +@@ -2325,7 +2335,11 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state, + // Unset the clip path as it is unrelated to the pattern's coordinate space. + QPainterPath savedClip = m_currentClipPath; + m_currentClipPath = QPainterPath(); ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) ++ gfx->display(tPat->getContentStream()); ++#else + gfx->display(str); ++#endif + m_currentClipPath = savedClip; + inPattern--; + gElements = m_groupStack.pop(); Added: head/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h Tue Mar 9 15:53:11 2021 (r567940) @@ -0,0 +1,14 @@ +--- scribus/plugins/import/pdf/slaoutput.h.orig 2021-03-09 15:40:35 UTC ++++ scribus/plugins/import/pdf/slaoutput.h +@@ -196,7 +196,11 @@ class SlaOutputDev : public OutputDev (public) + void stroke(GfxState *state) override; + void fill(GfxState *state) override; + void eoFill(GfxState *state) override; ++ #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) ++ bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) override; ++#else + GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) override; ++#endif + GBool functionShadedFill(GfxState * /*state*/, GfxFunctionShading * /*shading*/) override { qDebug() << "Function Shaded Fill"; return gFalse; } + GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) override; + GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading) override { return (shading->getExtend0() == shading->getExtend1()); }