mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-27 14:52:05 -05:00
135ad8988a
This fixes a regression introduced in c37a31e9ab.
* gnu/packages/patches/inkscape-poppler-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/inkscape.scm (inkscape/stable)[source](patches): New field.
45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
Fix build with Poppler 22.9.0.
|
|
|
|
Taken from upstream:
|
|
|
|
https://gitlab.com/inkscape/inkscape/-/commit/fb00794923d19cfbb2ca4adca3ae8971553a06be
|
|
|
|
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
|
|
index cca1e840966c7940a1af472025535042b07e3e0f..80d64c9b866d5d3dd095636a9a02571b89061af1 100644
|
|
--- 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);
|
|
}
|
|
|
|
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
|
|
index 12f71dd9214b95dbad6fdf7642a96cdd57f2c64a..9fc56fe63c2feee986ad1ff5018e679a0bacb665 100644
|
|
--- a/src/extension/internal/pdfinput/svg-builder.cpp
|
|
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
|
|
@@ -389,10 +389,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++ ) {
|