From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E3CB8158009 for ; Fri, 23 Jun 2023 21:29:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92EB8E08AB; Fri, 23 Jun 2023 21:29:45 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7AD7FE08AB for ; Fri, 23 Jun 2023 21:29:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BECC6340B29 for ; Fri, 23 Jun 2023 21:29:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 13FB9AA4 for ; Fri, 23 Jun 2023 21:29:42 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1687555707.809bf5e498251a3e2c905870f2f14eb4c33a6ab0.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch X-VCS-Directories: media-gfx/inkscape/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 809bf5e498251a3e2c905870f2f14eb4c33a6ab0 X-VCS-Branch: master Date: Fri, 23 Jun 2023 21:29:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4a94c243-767d-477b-9159-d21ce2463ad0 X-Archives-Hash: 72e417d76390213bd45f4c8e4de60c3d commit: 809bf5e498251a3e2c905870f2f14eb4c33a6ab0 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue Jun 13 16:44:15 2023 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Fri Jun 23 21:28:27 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=809bf5e4 media-gfx/inkscape: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/31422 Signed-off-by: Conrad Kostecki gentoo.org> .../files/inkscape-1.2.1-poppler-22.09.0.patch | 73 ---------------------- 1 file changed, 73 deletions(-) diff --git a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch deleted file mode 100644 index 80d071d51b0b..000000000000 --- a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch +++ /dev/null @@ -1,73 +0,0 @@ -https://gitlab.com/inkscape/inkscape/-/merge_requests/4719 - -From dce083204c62f1185ad079fc124f7fb40a1d0bb6 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Fri, 2 Sep 2022 06:21:28 +0100 -Subject: [PATCH] Fix build with Poppler 22.09.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With Poppler 22.09.0, inkscape fails to build with: -``` -/var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/svg-builder.cpp:394:23: error: no matching function for call to ‘GfxState::getLineDash(double**, int*, double*)’ - 394 | state->getLineDash(&dash_pattern, &dash_length, &dash_start); - | ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -In file included from /var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/svg-builder.cpp:44: -/usr/include/poppler/GfxState.h:1506:32: note: candidate: ‘const std::vector& GfxState::getLineDash(double*)’ - 1506 | const std::vector &getLineDash(double *start) - | ^~~~~~~~~~~ -[...] -/var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/pdf-parser.cpp:700:21: error: no matching function for call to ‘GfxState::setLineDash(double*&, int&, double)’ - 700 | state->setLineDash(dash, length, args[1].getNum()); - | ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -``` - -Poppler changed the getLineDash interface: -``` -- void getLineDash(double **dash, int *length, double *start) -+ const std::vector &getLineDash(double *start) -``` - -... and the setLineDash interface: -```` -- void setLineDash(double *dash, int length, double start); -+ void setLineDash(std::vector &&dash, double start); -``` - -Signed-off-by: Sam James ---- a/src/extension/internal/pdfinput/pdf-parser.cpp -+++ b/src/extension/internal/pdfinput/pdf-parser.cpp -@@ -697,7 +697,11 @@ void PdfParser::opSetDash(Object args[], int /*numArgs*/) - _POPPLER_FREE(obj); - } - } -+#if POPPLER_CHECK_VERSION(22, 9, 0) -+ state->setLineDash(std::vector (dash, dash + length), args[1].getNum()); -+#else - state->setLineDash(dash, length, args[1].getNum()); -+#endif - builder->updateStyle(state); - } - ---- a/src/extension/internal/pdfinput/svg-builder.cpp -+++ b/src/extension/internal/pdfinput/svg-builder.cpp -@@ -388,10 +388,17 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) { - sp_repr_css_set_property(css, "stroke-miterlimit", os_ml.str().c_str()); - - // Line dash -- double *dash_pattern; - int dash_length; - double dash_start; -+#if POPPLER_CHECK_VERSION(22, 9, 0) -+ const double *dash_pattern; -+ const std::vector &dash = state->getLineDash(&dash_start); -+ dash_pattern = dash.data(); -+ dash_length = dash.size(); -+#else -+ double *dash_pattern; - state->getLineDash(&dash_pattern, &dash_length, &dash_start); -+#endif - if ( dash_length > 0 ) { - Inkscape::CSSOStringStream os_array; - for ( int i = 0 ; i < dash_length ; i++ ) {