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 (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 &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++ ) { t>
path: root/gnu/system.scm
AgeCommit message (Expand)Author
2020-01-12system: Drop net-tools from %BASE-PACKAGES (replaced by iproute2)....* gnu/system.scm (%base-packages): Remove net-tools. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Simon Josefsson
2020-01-08system: Use the udev-enabled util-linux variant....Fixes <https://bugs.gnu.org/37931>. Reported by Bengt Richter <bokr@bokr.com>. * gnu/system.scm (%base-packages): Change from UTIL-LINUX to UTIL-LINUX+UDEV. Marius Bakke
2019-12-07services: Add 'provenance-service-type'....* gnu/services.scm (object->pretty-string) (channel->code, channel->sexp, provenance-file) (provenance-entry): New procedures. (provenance-service-type): New variable. * gnu/system.scm (operating-system-with-provenance): New procedure. * doc/guix.texi (Service Reference): Document 'provenance-service-type'. Ludovic Courtès
2019-12-01system: vm: Support cross-compilation....* gnu/system.scm (system-linux-image-file-name): Add support for cross-built systems. Remove system argument that was ignored, (operating-system-kernel-file): adapt by removing ignored os argument. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Add target argument and turn inputs into native-inputs. Pass target to qemu-command and gexp->derivation calls. (iso9660-image): Add target argument and pass it to expression->derivation-in-linux-vm. Remove qemu from inputs as it is not necessary. (qemu-image): Add target argument, also remove qemu from inputs. Pass target argument to expression->derivation-in-linux-vm call. Mathieu Othacehe
2019-10-06Merge branch 'master' into core-updatesRicardo Wurmus
2019-10-06system: Add 'mount' and 'umount' to '%setuid-programs'....Fixes <https://bugs.gnu.org/37569>. Reported by Diego Nicola Barbato <dnbarbato@posteo.de>. * gnu/system.scm (%setuid-programs): Add "mount" and "umount" from util-linux. Ludovic Courtès
2019-09-06Merge branch 'master' into core-updatesMark H Weaver
2019-08-30system: Add 'bootloader-menu-entries' field to <boot-parameters>....This allows us to keep track of the extra menu entries specified in the OS configuration. * gnu/system.scm (<boot-parameters>)[bootloader-menu-entries]: New field. (read-boot-parameters): Initialize it. (operating-system-boot-parameters): Likewise. (operating-system-boot-parameters-file): Serialize it. * gnu/bootloader.scm (menu-entry->sexp, sexp->menu-entry): New procedures. Ludovic Courtès