head 1.10; access; symbols pkgsrc-2025Q1:1.8.0.4 pkgsrc-2025Q1-base:1.8 pkgsrc-2024Q4:1.8.0.2 pkgsrc-2024Q4-base:1.8 pkgsrc-2020Q1:1.6.0.6 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.8 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.4 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.2 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.5.0.2 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.3.0.2 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.2.0.32 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.30 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.28 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.26 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.24 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.20 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.18 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.16 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.14 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.12 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.10 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.8 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.6 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.4 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.2 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.1.0.18 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.16 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.14 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.12 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.10 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.8 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.6 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.4 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.2 pkgsrc-2012Q4-base:1.1; locks; strict; comment @ * @; 1.10 date 2026.06.24.21.57.17; author wiz; state Exp; branches; next 1.9; commitid gV3hBtpAz4Nhe6LG; 1.9 date 2025.05.16.23.05.04; author ryoon; state dead; branches; next 1.8; commitid LXahCmDpQYFIAbVF; 1.8 date 2024.10.22.09.00.11; author wiz; state Exp; branches; next 1.7; commitid wokVmup8zQ5hxDuF; 1.7 date 2020.05.06.01.42.28; author ryoon; state dead; branches; next 1.6; commitid lHDT3lJqQW8Gv77C; 1.6 date 2019.05.13.16.17.51; author adam; state Exp; branches; next 1.5; commitid Dulxr6nnyWckT3nB; 1.5 date 2019.02.25.18.57.03; author maya; state Exp; branches; next 1.4; commitid DnFDcAgUYAQufbdB; 1.4 date 2019.01.06.08.41.01; author markd; state Exp; branches; next 1.3; commitid DBw7oQYE6Tt4qH6B; 1.3 date 2018.12.21.08.46.16; author wiz; state Exp; branches; next 1.2; commitid mMjhVy3HWmnsZD4B; 1.2 date 2015.02.03.13.55.12; author adam; state Exp; branches; next 1.1; commitid M8b2igoS0yKjfz8y; 1.1 date 2012.11.18.15.40.55; author adam; state Exp; branches; next ; desc @@ 1.10 log @inkscape: fix build with poppler 26.06.0 Bump PKGREVISION. @ text @$NetBSD$ poppler 26.6 support. https://gitlab.com/inkscape/inkscape/-/merge_requests/7919 https://gitlab.com/inkscape/inkscape/-/work_items/6210 --- src/extension/internal/pdfinput/pdf-parser.h.orig 2026-04-23 22:59:59.000000000 +0000 +++ src/extension/internal/pdfinput/pdf-parser.h @@@@ -112,8 +112,8 @@@@ class PdfParser { (public) class PdfParser { public: - // Constructor for regular output. - PdfParser(std::shared_ptr pdf_doc, SvgBuilder *builderA, Page *page, _POPPLER_CONST PDFRectangle *cropBox); + // Constructor for regular output. + PdfParser(std::shared_ptr pdf_doc, SvgBuilder *builderA, Page *page, const std::optional &cropBox); // Constructor for a sub-page object. PdfParser(XRef *xrefA, SvgBuilder *builderA, Dict *resDict, _POPPLER_CONST PDFRectangle *box); @ 1.9 log @graphics/inkscape: Update to 1.4.2 Changelog: 1.4.2: The first minor release since Inkscape 1.4 is here! No worries, you didn't miss 1.4.1! Due to a signficant bug that was only discovered shortly before its planned release, 1.4.1 has been merged with 1.4.2. With lots of fixes, some smaller improvements and even a few new features around file format support, we believe it was well worth the wait. Here's a summary of what to expect from the new release: A new splash screen, providing a visual cue while Inkscape loads in the background Initial support for importing Vectornator / Linearity Curve files A new extension to Clean up Paths Substantially improved Affinity Designer files (.afdesign) import 20 crash/freeze fixes, many of which affected PDF import more than 50 other bug fixes and small improvements, including improvements to Boolean operations, layer selection, minimal window width and restoration of Spray tool buttons' functionality and 15 updated translations! @ text @d1 1 a1 1 $NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.h,v 1.8 2024/10/22 09:00:11 wiz Exp $ d3 3 a5 2 Fix build with poppler 24.10.0. https://github.com/OpenMandrivaAssociation/inkscape/blob/master/inkscape-1.4-poppler-24.10.patch d7 1 a7 1 --- src/extension/internal/pdfinput/pdf-parser.h.orig 2024-04-22 21:00:30.000000000 +0000 d9 10 a18 6 @@@@ -138,7 +138,7 @@@@ public: void loadPatternColorProfiles(Dict *resources); void loadColorProfile(); void loadColorSpaceProfile(GfxColorSpace *space, Object *obj); - GfxPattern *lookupPattern(Object *obj, GfxState *state); + std::unique_ptr lookupPattern(Object *obj, GfxState *state); a19 32 std::shared_ptr getFontEngine(); @@@@ -174,10 +174,7 @@@@ private: OpHistoryEntry *operatorHistory; // list containing the last N operators - //! Caches color spaces by name - std::map> colorSpacesCache; - - GfxColorSpace *lookupColorSpaceCopy(Object &); + std::unique_ptr lookupColorSpaceCopy(Object &); void setDefaultApproximationPrecision(); // init color deltas void pushOperator(const char *name); @@@@ -203,7 +200,7 @@@@ private: void opSetMiterLimit(Object args[], int numArgs); void opSetLineWidth(Object args[], int numArgs); void opSetExtGState(Object args[], int numArgs); - void doSoftMask(Object *str, GBool alpha, GfxColorSpace *blendingColorSpace, GBool isolated, GBool knockout, + void doSoftMask(Object *str, GBool alpha, std::unique_ptr const &blendingColorSpace, GBool isolated, GBool knockout, Function *transferFunc, GfxColor *backdropColor); void opSetRenderingIntent(Object args[], int numArgs); @@@@ -297,7 +294,7 @@@@ private: void doForm(Object *str, double *offset = nullptr); void doForm1(Object *str, Dict *resDict, double *matrix, double *bbox, GBool transpGroup = gFalse, GBool softMask = gFalse, - GfxColorSpace *blendingColorSpace = nullptr, + std::unique_ptr const &blendingColorSpace = nullptr, GBool isolated = gFalse, GBool knockout = gFalse, GBool alpha = gFalse, Function *transferFunc = nullptr, GfxColor *backdropColor = nullptr); @ 1.8 log @inkscape: update to 1.4. Fix build with poppler 24.10.0 using a patch from OpenMandriva. Release highlights Filter Gallery: it has never been so easy to find the best filter for your needs! This new dialog features previews, categories and search. Modular grids & improved axonometric grids: set the grid angle by ratio for isometric designs and use modular grids to plan layouts and make icons! Swatches dialog and palette file handling improved: quick access to dialog layout controls, search for colors, and open different palette file formats! Unified font browser preview: when activated in the preferences, use it to quickly browse through your font collection. Try it out and give your feedback! Customizable handles: Power users with CSS knowledge can now customize the styling and basic shape of all the handles! Fast image clipping with the Shape Builder: raster graphics can now be clipped into multiple sections using the Shape Builder. Affinity Designer File Import Support for internal links in exported PDF files A whole new icon set There's even more: faster extensions, new templates for folding booklets, additional options in Ruler and Taper Stroke LPE, new keyboard shortcuts, changed node deletion behavior, preview in Spray tool, many new command line options, more supported color palette formats (e.g. CIELAB, Adobe Color Book and Adobe Swatch Exchange), updated translations and many bug fixes. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @inkscape: Update to 1.0 Changelog: Inkscape 1.0 Release highlights Theming support and more new customization options Better HiDPI (high resolution) screen support Native support for macOS with a signed and notarized .dmg file Coordinate origin in top left corner by default Canvas rotation and mirroring On-Canvas alignment of objects Split view and X-Ray modes PowerPencil for drawing editable, variable width strokes with a pressure sensitive graphics tablet New PNG export options Integrated centerline tracing for vectorization of line drawings Searchable Symbols dialog New Live Path Effect (LPE) selection dialog New Corners (Fillet/chamfer) LPE, (lossless) Boolean Operation LPE (experimental), Offset LPE and Measure Segments LPE (and more!) Path operations, deselection of a large number of paths as well as grouping/ungrouping are much faster now Much improved text line-height settings Variable fonts support (only if compiled with pango library version >= 1.41.1) Browser-compatible flowed text Extensions programming interface updated, with many new options Python 3 support for extensions @ text @d1 1 a1 1 $NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.h,v 1.6 2019/05/13 16:17:51 adam Exp $ d3 2 a4 1 Explicitly include poppler/Object.h; otherwise Python's Object.h gets included. d6 1 a6 1 --- src/extension/internal/pdfinput/pdf-parser.h.orig 2019-05-13 08:02:45.000000000 +0000 d8 6 a13 2 @@@@ -27,7 +27,7 @@@@ namespace Inkscape { using Inkscape::Extension::Internal::SvgBuilder; d15 1 a15 3 #include "glib/poppler-features.h" -#include "Object.h" +#include "poppler/Object.h" d17 30 a46 2 class GooString; class XRef; @ 1.6 log @inkscape: updated to 0.92.4 Inkscape 0.92.4 is a stability and bugfix release. It also brings some notable performance improvements for filter rendering, measure tool, extensions, document saving and moving paths (with a live path effect) and includes a couple of small, but impactful usage improvements. @ text @d1 1 a1 1 $NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.h,v 1.5 2019/02/25 18:57:03 maya Exp $ @ 1.5 log @inkscape: fix build. also mentioned by someone on some mailing list. @ text @d1 1 a1 1 $NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.h,v 1.4 2019/01/06 08:41:01 markd Exp $ a3 1 Support for poppler 0.72 from upstream by way of linuxfromscratch d5 1 a5 1 --- src/extension/internal/pdfinput/pdf-parser.h.orig 2018-03-11 20:38:09.000000000 +0000 d7 1 a7 10 @@@@ -9,6 +9,7 @@@@ #define PDF_PARSER_H #ifdef HAVE_POPPLER +#include "poppler-transition-api.h" #ifdef USE_GCC_PRAGMAS #pragma interface @@@@ -25,8 +26,8 @@@@ namespace Inkscape { // TODO clean up and remove using: d10 1 a10 2 +#include "glib/poppler-features.h" -#include "goo/gtypes.h" a15 48 @@@@ -127,11 +129,14 @@@@ public: // Constructor for regular output. PdfParser(XRef *xrefA, SvgBuilder *builderA, int pageNum, int rotate, - Dict *resDict, PDFRectangle *box, PDFRectangle *cropBox); + Dict *resDict, + _POPPLER_CONST PDFRectangle *box, + _POPPLER_CONST PDFRectangle *cropBox); // Constructor for a sub-page object. PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *builderA, - Dict *resDict, PDFRectangle *box); + Dict *resDict, + _POPPLER_CONST PDFRectangle *box); virtual ~PdfParser(); @@@@ -185,7 +190,7 @@@@ private: void go(GBool topLevel); void execOp(Object *cmd, Object args[], int numArgs); - PdfOperator *findOp(char *name); + PdfOperator *findOp(const char *name); GBool checkArg(Object *arg, TchkType type); int getPos(); @@@@ -256,7 +261,7 @@@@ private: double x2, double y2, GfxColor *color2, int nComps, int depth); void doPatchMeshShFill(GfxPatchMeshShading *shading); - void fillPatch(GfxPatch *patch, int nComps, int depth); + void fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth); void doEndPath(); // path clipping operators @@@@ -287,7 +292,12 @@@@ private: void opMoveShowText(Object args[], int numArgs); void opMoveSetShowText(Object args[], int numArgs); void opShowSpaceText(Object args[], int numArgs); +#if POPPLER_CHECK_VERSION(0,64,0) + void doShowText(const GooString *s); +#else void doShowText(GooString *s); +#endif + // XObject operators void opXObject(Object args[], int numArgs); @ 1.4 log @inkscape: update to 0.92.3 Also post 0.92.3 updates from upstream for poppler-0.72 by way of linuxfromscratch. http://www.linuxfromscratch.org/patches/blfs/svn/inkscape-0.92.3-consolidated_fixes-1.patch Inkscape 0.92.3 is a maintenance release resolving numerous bugs and making this the most stable release of the series. Among the most reported bugs addressed were: * Blank pages being output when attempting to print multiple copies of a document * The inability to cancel during the export of large files * Application crashes caused by attempting to drag a path at a cap or line join * Some issues with keyboard shortcut functionality on non-Latin keyboard layouts A few performance improvements and usability enhancements that made it into the release, include: * New SVG export options from the command line * Support for right-to-left text * Improved ellipse controls * Multi-line text support for the PDF+LaTeX export * New render tile preferences for performance tuning * Better startup performance for many Windows users @ text @d1 1 a1 1 $NetBSD$ d16 1 a16 1 @@@@ -25,8 +26,9 @@@@ namespace Inkscape { d21 1 a21 1 #include "goo/gtypes.h" @ 1.3 log @inkscape: get this closer to building with poppler-0.72 More work to do. @ text @d1 1 a1 1 $NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.h,v 1.2 2015/02/03 13:55:12 adam Exp $ d4 1 d6 1 a6 1 --- src/extension/internal/pdfinput/pdf-parser.h.orig 2017-08-06 20:44:00.000000000 +0000 d8 9 a16 1 @@@@ -25,8 +25,18 @@@@ namespace Inkscape { d20 2 a21 1 -#include "goo/gtypes.h" a23 11 + +// poppler 0.72 +#define getCString c_str + +// poppler 0.71 +typedef bool GBool; +#define gTrue true +#define gFalse false + +// poppler 0.70 +#define _POPPLER_CONST const d27 48 @ 1.2 log @Changes 0.91: Cairo rendering for display and PNG export OpenMP multithreading for all filters C++ code conversion Major improvements in the Text tool Measure tool Type design features Symbol library and support for Visio stencils Cross platform WMF and EMF import and export Improved support for Corel DRAW documents, Visio importer Support for real world document and page size units, e.g. millimeters Numerous usability improvements Native Windows 64-bit build @ text @d1 1 a1 1 $NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.h,v 1.1 2012/11/18 15:40:55 adam Exp $ d5 1 a5 1 --- src/extension/internal/pdfinput/pdf-parser.h.orig 2012-11-18 14:42:04.000000000 +0000 d7 2 a8 1 @@@@ -26,7 +26,7 @@@@ namespace Inkscape { d11 1 a11 1 #include "goo/gtypes.h" d14 11 @ 1.1 log @Fix building on OS X @ text @d1 1 a1 1 $NetBSD$ d7 1 a7 1 @@@@ -27,7 +27,7 @@@@ namespace Inkscape { @