From nobody Tue Sep 6 15:53:03 2022 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 4MMVKC6rf0z4c5Gl; Tue, 6 Sep 2022 15:53:03 +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 4MMVKC6Kxyz3DX1; Tue, 6 Sep 2022 15:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662479583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/vMHs+uIAjQEiZoUbHqG+jWljNIlld05AleG8Tbqzv4=; b=ec6OLxgr61I1ycAKnmgENYVgzF6FOYsvn98HMUdoTDkilPkDdBBVIOkUXcFDzHPXFAa/kz 2TkewAuHqT7SYI9ml++tyP6fV4y+VdA9u9CBUz8e+3eKT3N5cnl3rV/676Yul4czSb+Ezr kf11qfSv7E/oqaZ/VblY9Gs1kSYa2ianuep8A3+wLVDcthuhKAxBjBBhoXFtK5oG/0rFme 5pH2505mVTpohUOeK/A6IaXDn0LSaFq1QT7VoJd8qLQsbUzXJFbTabwzih6i8hqwWKNnmN H9sReOgFhqUPFYwDLO7SE3NQWkpH7mRTde7JGKjY6uhOssnhZvDW+7cMwNS4RA== 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 4MMVKC5NMJz1Cg2; Tue, 6 Sep 2022 15:53:03 +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 286Fr3CC070577; Tue, 6 Sep 2022 15:53:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 286Fr3nK070576; Tue, 6 Sep 2022 15:53:03 GMT (envelope-from git) Date: Tue, 6 Sep 2022 15:53:03 GMT Message-Id: <202209061553.286Fr3nK070576@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: 608468d5a6c2 - main - print/scribus-devel: prepare for poppler 22.08 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 608468d5a6c22569ae59a2d6de3dd9a49383846f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662479583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/vMHs+uIAjQEiZoUbHqG+jWljNIlld05AleG8Tbqzv4=; b=HriwpLnoh5CecMu0OC38bHveWYTtBJ8MzNrxC2KJotIMFFPCk2HskCp+1a18prMioLY5pK BlgWS/7hQ7G4W/ttFImCmD2Ny4oiSbSjBMerNHbp3ktZR6N5WYxP7Gg5p/s86Hr5EKQjcc UzeXqDU7KP/l5b0PAAGz9YYR44o34gQusS+/F91+g2/0G6eMo5bcRlmUS8PLNyHQURwHnc ZGNn+C0pcKpS9ZDMh3eMooc8REwOPvl7Oo/4rfPpyXvsukOlgVHYU9mmhHuTV5CZwPx24l axPdZEoG2ldFbuGuJVYUKTe56aYchxGD08t2qIk142lx7J+aPDghMq7j+ROrqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662479583; a=rsa-sha256; cv=none; b=uyEV+a981qhXVQK+BD6SThie+R8IH2//zAa0fdDM1luLoVSP5zdiZSiZvDLLwQGJo2bgYZ 1431335FuE5XgEZhfCb4Uin7uIOGuCWnc36oE01Oqe5ZUUAQf15too7AT3JSFeAsYndVMx Qi5vJnhdxqEgmBQRMbhz+oqJUUwamH9lnKbI1Ovn3Bz2KhUwCpImtkR4Yp0mpu1I+3peUG e9mtg6AMD1sddBrbkaRXyMqS+GhZKef5NW5OSAev8/X6w0k42ZoPnkd27Kww7fdZjrILCZ xGfBJlsH/PK/IiJ6x80sAh938FEwJn1T3mWXni0Dyi03G/hGAZ+ISWbJ5jloZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=608468d5a6c22569ae59a2d6de3dd9a49383846f commit 608468d5a6c22569ae59a2d6de3dd9a49383846f Author: Tobias C. Berner AuthorDate: 2022-09-06 14:36:01 +0000 Commit: Tobias C. Berner CommitDate: 2022-09-06 15:49:49 +0000 print/scribus-devel: prepare for poppler 22.08 PR: 266151 Obtained from: https://github.com/archlinux/svntogit-community/blob/packages/scribus/trunk/scribus-1.5.8-poppler-22.09.0.patch --- .../patch-scribus_plugins_import_pdf_slaoutput.cpp | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp new file mode 100644 index 000000000000..0921eddd3997 --- /dev/null +++ b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp @@ -0,0 +1,23 @@ +Obtained from: + https://github.com/archlinux/svntogit-community/blob/packages/scribus/trunk/scribus-1.5.8-poppler-22.09.0.patch + +--- scribus/plugins/import/pdf/slaoutput.cpp.orig 2022-09-06 14:31:26 UTC ++++ scribus/plugins/import/pdf/slaoutput.cpp +@@ -3681,9 +3681,16 @@ void SlaOutputDev::getPenState(GfxState *state) + break; + } + double lw = state->getLineWidth(); +- double *dashPattern; + int dashLength; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 9, 0) ++ const double *dashPattern; ++ const std::vector &dash = state->getLineDash(&DashOffset); ++ dashPattern = dash.data(); ++ dashLength = dash.size(); ++#else ++ double *dashPattern; + state->getLineDash(&dashPattern, &dashLength, &DashOffset); ++#endif + QVector pattern(dashLength); + for (int i = 0; i < dashLength; ++i) + {