summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2023-06-13 18:44:15 +0200
committerConrad Kostecki <conikost@gentoo.org>2023-06-23 23:28:27 +0200
commit809bf5e498251a3e2c905870f2f14eb4c33a6ab0 (patch)
tree5862c4ebf74e4592281cb62573a7c3dd786d711d /media-gfx/inkscape
parentdev-util/bpftool: remove unused patch(es) (diff)
downloadgentoo-809bf5e498251a3e2c905870f2f14eb4c33a6ab0.tar.gz
gentoo-809bf5e498251a3e2c905870f2f14eb4c33a6ab0.tar.bz2
gentoo-809bf5e498251a3e2c905870f2f14eb4c33a6ab0.zip
media-gfx/inkscape: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/31422 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'media-gfx/inkscape')
-rw-r--r--media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch73
1 files changed, 0 insertions, 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 <sam@gentoo.org>
-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<double>& GfxState::getLineDash(double*)’
- 1506 | const std::vector<double> &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<double> &getLineDash(double *start)
-```
-
-... and the setLineDash interface:
-````
-- void setLineDash(double *dash, int length, double start);
-+ void setLineDash(std::vector<double> &&dash, double start);
-```
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- 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<double> (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<double> &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++ ) {