head 1.7; access; symbols pkgsrc-2022Q2:1.6.0.4 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.2 pkgsrc-2022Q1-base:1.6 pkgsrc-2020Q1:1.4.0.2 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q1:1.2.0.2 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.1.0.14 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.12 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.10 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.8 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.6 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.4 pkgsrc-2017Q3-base:1.1; locks; strict; comment @// @; 1.7 date 2022.07.25.19.42.33; author wiz; state dead; branches; next 1.6; commitid DHsElsnzFJhUrjND; 1.6 date 2022.03.09.09.10.17; author wiz; state Exp; branches; next 1.5; commitid DvqmN2LL2Rd4owvD; 1.5 date 2020.05.06.01.42.28; author ryoon; state dead; branches; next 1.4; commitid lHDT3lJqQW8Gv77C; 1.4 date 2020.01.11.09.59.05; author martin; state Exp; branches; next 1.3; commitid lygwVa9nlHNbZfSB; 1.3 date 2019.05.13.16.17.51; author adam; state dead; branches; next 1.2; commitid Dulxr6nnyWckT3nB; 1.2 date 2019.01.06.08.41.01; author markd; state Exp; branches; next 1.1; commitid DBw7oQYE6Tt4qH6B; 1.1 date 2017.09.09.21.48.56; author prlw1; state Exp; branches; next ; commitid Q34tj0I9aDGxmz6A; desc @@ 1.7 log @inkscape: update to 1.2.1. Release highlights Inkscape documents can now hold multiple pages, which are managed by the new Page tool Editable markers and dash patterns Layers and objects dialog merged On-canvas alignment snapping and Snap settings redesign New 'Tiling' Live Path Effect Redesigned Export dialog with preview and ability to select objects/layers/pages and even multiple file formats to export to Import SVG images from Open Clipart, Wikimedia Commons and other online sources Selectable object origin for numerical scaling and moving All alignment options in a single dialog Gradient editing in the Fill and Stroke dialog Gradient dithering SVG Font Editor updated Flowing text around shapes and text padding Convenience Boolean operation for splitting paths Configurable Tool bar, continuous icon scaling and many more new customization options Performance gains for many parts of the interface and many different functions Lots of improvements to the user interface Numerous crash & bug fixes in the main Inkscape program and in in the stock extensions and so much more! @ text @$NetBSD: patch-src_extension_internal_pdfinput_pdf-input.cpp,v 1.6 2022/03/09 09:10:17 wiz Exp $ Fix build with poppler 22.03. https://gitlab.com/inkscape/inkscape/-/merge_requests/4116/diffs?commit_id=15ab83e02b07018c3ffd4952a2623393187659e0 --- src/extension/internal/pdfinput/pdf-input.cpp.orig 2022-02-05 01:21:47.000000000 +0000 +++ src/extension/internal/pdfinput/pdf-input.cpp @@@@ -666,10 +666,13 @@@@ PdfInput::open(::Inkscape::Extension::In // PDFDoc is from poppler. PDFDoc is used for preview and for native import. std::shared_ptr pdf_doc; - // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from - // glib gstdio.c + +#if POPPLER_CHECK_VERSION(22, 3, 0) + pdf_doc = std::make_shared(std::make_unique(uri)); // TODO: Could ask for password +#else GooString *filename_goo = new GooString(uri); - pdf_doc = std::make_shared(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password + pdf_doc = std::make_shared(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password +#endif if (!pdf_doc->isOk()) { int error = pdf_doc->getErrorCode(); @ 1.6 log @inkscape: fix build with poppler 22.03.0 @ text @d1 1 a1 1 $NetBSD$ @ 1.5 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-input.cpp,v 1.4 2020/01/11 09:59:05 martin Exp $ d3 2 a4 2 Properly use uniqe_ptr method reset() to set the pointer (this is not compiled as C++14 yet, so no make_unique). d6 5 a10 14 --- src/extension/internal/pdfinput/pdf-input.cpp.orig 2019-01-15 05:29:27.000000000 +0100 +++ src/extension/internal/pdfinput/pdf-input.cpp 2020-01-11 10:36:40.264346717 +0100 @@@@ -691,10 +691,10 @@@@ if (poppler_datadir != NULL) { globalParams = new GlobalParams(poppler_datadir); } else { - globalParams = new GlobalParams(); + globalParams.reset(new GlobalParams()); } #else - globalParams = new GlobalParams(); + globalParams.reset(new GlobalParams()); #endif // ENABLE_OSX_APP_LOCATIONS } d12 13 @ 1.4 log @Make the pdf-input extension buildable with gcc 8.3. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 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-input.cpp,v 1.2 2019/01/06 08:41:01 markd Exp $ d3 2 a4 1 support for poppler 0.72 from upstream by way of linuxfromscratch d6 14 a19 10 --- src/extension/internal/pdfinput/pdf-input.cpp.orig 2018-03-11 20:38:09.000000000 +0000 +++ src/extension/internal/pdfinput/pdf-input.cpp @@@@ -793,7 +793,7 @@@@ PdfInput::open(::Inkscape::Extension::In dlg->getImportSettings(prefs); // Apply crop settings - PDFRectangle *clipToBox = NULL; + _POPPLER_CONST PDFRectangle *clipToBox = NULL; double crop_setting; sp_repr_get_double(prefs, "cropTo", &crop_setting); @ 1.2 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$ @ 1.1 log @Support poppler 0.58 https://gitlab.com/inkscape/inkscape/commit/9418824967eb4c53371ef8588243fed4cab496e0 @ text @d3 1 a3 2 Support poppler 0.58 https://gitlab.com/inkscape/inkscape/commit/9418824967eb4c53371ef8588243fed4cab496e0 d5 1 a5 1 --- src/extension/internal/pdfinput/pdf-input.cpp.orig 2017-02-13 23:46:57.000000000 +0000 d7 2 a8 2 @@@@ -840,14 +840,20 @@@@ PdfInput::open(::Inkscape::Extension::In } d10 5 a14 10 // Parse the document structure +#if defined(POPPLER_NEW_OBJECT_API) + Object obj = page->getContents(); +#else Object obj; page->getContents(&obj); +#endif if (!obj.isNull()) { pdf_parser->parse(&obj); } a15 7 // Cleanup +#if !defined(POPPLER_NEW_OBJECT_API) obj.free(); +#endif delete pdf_parser; delete builder; g_free(docname); @