diff --git a/srcpkgs/inkscape/patches/poppler-fixes.patch b/srcpkgs/inkscape/patches/poppler-064.patch similarity index 100% rename from srcpkgs/inkscape/patches/poppler-fixes.patch rename to srcpkgs/inkscape/patches/poppler-064.patch diff --git a/srcpkgs/inkscape/patches/poppler-072.patch b/srcpkgs/inkscape/patches/poppler-072.patch new file mode 100644 index 0000000000..439c84ca0b --- /dev/null +++ b/srcpkgs/inkscape/patches/poppler-072.patch @@ -0,0 +1,71 @@ +Poppler-0.72 renamed getCString() to c_str() + +diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp +index 9621e30..57f8ae7 100644 +--- src/extension/internal/pdfinput/pdf-input.cpp ++++ src/extension/internal/pdfinput/pdf-input.cpp +@@ -319,7 +319,7 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/) + _render_thumb = true; + + // Create PopplerDocument +- Glib::ustring filename = _pdf_doc->getFileName()->getCString(); ++ Glib::ustring filename = _pdf_doc->getFileName()->c_str(); + if (!Glib::path_is_absolute(filename)) { + filename = Glib::build_filename(Glib::get_current_dir(),filename); + } +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index d318447..6d64db0 100644 +--- src/extension/internal/pdfinput/pdf-parser.cpp ++++ src/extension/internal/pdfinput/pdf-parser.cpp +@@ -2381,8 +2381,8 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/) + } + if (printCommands) { + printf(" font: tag=%s name='%s' %g\n", +- font->getTag()->getCString(), +- font->getName() ? font->getName()->getCString() : "???", ++ font->getTag()->c_str(), ++ font->getName() ? font->getName()->c_str() : "???", + args[1].getNum()); + fflush(stdout); + } +@@ -2639,7 +2639,7 @@ void PdfParser::doShowText(GooString *s) { + double lineX = state->getLineX(); + double lineY = state->getLineY(); + oldParser = parser; +- p = s->getCString(); ++ p = s->c_str(); + len = s->getLength(); + while (len > 0) { + n = font->getNextChar(p, len, &code, +@@ -2694,7 +2694,7 @@ void PdfParser::doShowText(GooString *s) { + + } else { + state->textTransformDelta(0, state->getRise(), &riseX, &riseY); +- p = s->getCString(); ++ p = s->c_str(); + len = s->getLength(); + while (len > 0) { + n = font->getNextChar(p, len, &code, +diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp +index d449d1a..836ca10 100644 +--- src/extension/internal/pdfinput/svg-builder.cpp ++++ src/extension/internal/pdfinput/svg-builder.cpp +@@ -1020,7 +1020,7 @@ void SvgBuilder::updateFont(GfxState *state) { + GfxFont *font = state->getFont(); + // Store original name + if (font->getName()) { +- _font_specification = font->getName()->getCString(); ++ _font_specification = font->getName()->c_str(); + } else { + _font_specification = "Arial"; + } +@@ -1047,7 +1047,7 @@ void SvgBuilder::updateFont(GfxState *state) { + + // Font family + if (font->getFamily()) { // if font family is explicitly given use it. +- sp_repr_css_set_property(_font_style, "font-family", font->getFamily()->getCString()); ++ sp_repr_css_set_property(_font_style, "font-family", font->getFamily()->c_str()); + } else { + int attr_value = 1; + sp_repr_get_int(_preferences, "localFonts", &attr_value); + diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index b810e1d41f..7d2299b69a 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,7 +1,7 @@ # Template file for 'inkscape' pkgname=inkscape version=0.92.3 -revision=8 +revision=9 build_style=gnu-configure configure_args="--enable-lcms --enable-poppler-cairo --without-gnome-vfs --disable-static"