Mon Feb 25 18:57:04 2019 UTC ()
inkscape: fix build. also mentioned by someone on some mailing list.


(maya)
diff -r1.67 -r1.68 pkgsrc/graphics/inkscape/distinfo
diff -r1.4 -r1.5 pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.h
cvs diff -r1.67 -r1.68 pkgsrc/graphics/inkscape/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/inkscape/distinfo 2019/01/06 08:41:40 1.67
+++ pkgsrc/graphics/inkscape/distinfo 2019/02/25 18:57:03 1.68
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: distinfo,v 1.67 2019/01/06 08:41:40 markd Exp $ 1$NetBSD: distinfo,v 1.68 2019/02/25 18:57:03 maya Exp $
2 2
3SHA1 (inkscape-0.92.3.tar.bz2) = e1886317f8e6d4fb340f6a783fe410aaff9f28a7 3SHA1 (inkscape-0.92.3.tar.bz2) = e1886317f8e6d4fb340f6a783fe410aaff9f28a7
4RMD160 (inkscape-0.92.3.tar.bz2) = 95648c6b491e09920662e03a51f2278a0ff10392 4RMD160 (inkscape-0.92.3.tar.bz2) = 95648c6b491e09920662e03a51f2278a0ff10392
5SHA512 (inkscape-0.92.3.tar.bz2) = af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687 5SHA512 (inkscape-0.92.3.tar.bz2) = af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687
6Size (inkscape-0.92.3.tar.bz2) = 31606442 bytes 6Size (inkscape-0.92.3.tar.bz2) = 31606442 bytes
7SHA1 (patch-CMakeScripts_DefineDependsandFlags.cmake) = e8182366802adb05073efdc03a73202fd9b8d18b 7SHA1 (patch-CMakeScripts_DefineDependsandFlags.cmake) = e8182366802adb05073efdc03a73202fd9b8d18b
8SHA1 (patch-CMakeScripts_Pod2man.cmake) = 6176956791ae3e8eb007345e5ec19100812bdeb8 8SHA1 (patch-CMakeScripts_Pod2man.cmake) = 6176956791ae3e8eb007345e5ec19100812bdeb8
9SHA1 (patch-ag) = 6b6000f3940ec6db9404a206f9757928c1d5740b 9SHA1 (patch-ag) = 6b6000f3940ec6db9404a206f9757928c1d5740b
10SHA1 (patch-aj) = 31d6cc8bb179629023bd04bcac0fd935b2c9636d 10SHA1 (patch-aj) = 31d6cc8bb179629023bd04bcac0fd935b2c9636d
11SHA1 (patch-ap) = 412509a03d26e925548e3371529a1273db958611 11SHA1 (patch-ap) = 412509a03d26e925548e3371529a1273db958611
12SHA1 (patch-aq) = fb7de44d33fdc5895ce84ca8d44ff6a6c328c402 12SHA1 (patch-aq) = fb7de44d33fdc5895ce84ca8d44ff6a6c328c402
13SHA1 (patch-po_CMakeLists.txt) = aa03a91f656c239b8bfaeae8acd753b16be58aca 13SHA1 (patch-po_CMakeLists.txt) = aa03a91f656c239b8bfaeae8acd753b16be58aca
14SHA1 (patch-src_CMakeLists.txt) = ccd5eeca81891f83c5eaf8cb80d33f001beaf55c 14SHA1 (patch-src_CMakeLists.txt) = ccd5eeca81891f83c5eaf8cb80d33f001beaf55c
15SHA1 (patch-src_extension_internal_emf-inout.cpp) = 4fe6c24007b54d55d11502876e759f62a290922e 15SHA1 (patch-src_extension_internal_emf-inout.cpp) = 4fe6c24007b54d55d11502876e759f62a290922e
16SHA1 (patch-src_extension_internal_emf-print.cpp) = 5da493a452afa4b11bbb204c430fc3e63332c927 16SHA1 (patch-src_extension_internal_emf-print.cpp) = 5da493a452afa4b11bbb204c430fc3e63332c927
17SHA1 (patch-src_extension_internal_metafile-print.cpp) = 798a2f15986cd81d13bf576b1641a810d4d40573 17SHA1 (patch-src_extension_internal_metafile-print.cpp) = 798a2f15986cd81d13bf576b1641a810d4d40573
18SHA1 (patch-src_extension_internal_pdfinput_pdf-input.cpp) = 8bee946274725c12a3c743e8dec3e235c1402fcc 18SHA1 (patch-src_extension_internal_pdfinput_pdf-input.cpp) = 8bee946274725c12a3c743e8dec3e235c1402fcc
19SHA1 (patch-src_extension_internal_pdfinput_pdf-input.h) = d437b4994d66099ac2c1eaf6bac5d29bd83f9a76 19SHA1 (patch-src_extension_internal_pdfinput_pdf-input.h) = d437b4994d66099ac2c1eaf6bac5d29bd83f9a76
20SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 6ce050246963f762dd97992bfb96f3af5989ccae 20SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 6ce050246963f762dd97992bfb96f3af5989ccae
21SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = c8cd6386635f602ba4f4047b2986043f88519801 21SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = 93d0758b279b179c574a1a42483b02e80f680198
22SHA1 (patch-src_extension_internal_pdfinput_poppler-transition-api.h) = 2a1fc9ceee5d9bcb6138950661c61d6bd70fdd3d 22SHA1 (patch-src_extension_internal_pdfinput_poppler-transition-api.h) = 2a1fc9ceee5d9bcb6138950661c61d6bd70fdd3d
23SHA1 (patch-src_extension_internal_pdfinput_svg-builder.cpp) = dd3f5b8678fbfaf9829fa5d33c8ff8882d337196 23SHA1 (patch-src_extension_internal_pdfinput_svg-builder.cpp) = dd3f5b8678fbfaf9829fa5d33c8ff8882d337196
24SHA1 (patch-src_extension_internal_pdfinput_svg-builder.h) = ac05f9bed662705dcdfca8b791a348fb5350873c 24SHA1 (patch-src_extension_internal_pdfinput_svg-builder.h) = ac05f9bed662705dcdfca8b791a348fb5350873c
25SHA1 (patch-src_extension_internal_wmf-inout.cpp) = b49b504d1cf9388d2ad7e1c91c339e7c3d5ffdf5 25SHA1 (patch-src_extension_internal_wmf-inout.cpp) = b49b504d1cf9388d2ad7e1c91c339e7c3d5ffdf5
26SHA1 (patch-src_extension_internal_wmf-print.cpp) = b658d7a0697aaed55671507fe88ce93619ef1070 26SHA1 (patch-src_extension_internal_wmf-print.cpp) = b658d7a0697aaed55671507fe88ce93619ef1070
27SHA1 (patch-src_gradient-drag.cpp) = d6fc1f587a9ad404715fa6e70fe07823a3c68b0c 27SHA1 (patch-src_gradient-drag.cpp) = d6fc1f587a9ad404715fa6e70fe07823a3c68b0c
28SHA1 (patch-src_io_inkjar.cpp) = 060d59225cfe7b66db5e9f41e76860df9ce12d01 28SHA1 (patch-src_io_inkjar.cpp) = 060d59225cfe7b66db5e9f41e76860df9ce12d01
29SHA1 (patch-src_live__effects_lpe-ellipse__5pts.cpp) = e909a5b2e65f931246e5b3de7145739d1b6f6209 29SHA1 (patch-src_live__effects_lpe-ellipse__5pts.cpp) = e909a5b2e65f931246e5b3de7145739d1b6f6209
30SHA1 (patch-src_live__effects_lpe-lattice.cpp) = 17040a794a312ebecb63dd7b19be8f3337b18c47 30SHA1 (patch-src_live__effects_lpe-lattice.cpp) = 17040a794a312ebecb63dd7b19be8f3337b18c47
31SHA1 (patch-src_live__effects_lpe-lattice2.cpp) = bcff9e9177895168a4ef888376f1c3942e7786fb 31SHA1 (patch-src_live__effects_lpe-lattice2.cpp) = bcff9e9177895168a4ef888376f1c3942e7786fb
32SHA1 (patch-src_sp-ellipse.cpp) = e0b273e14c8174712b40f2c83c2e5408644bb9c9 32SHA1 (patch-src_sp-ellipse.cpp) = e0b273e14c8174712b40f2c83c2e5408644bb9c9
33SHA1 (patch-src_svg_svg-length.cpp) = 41679ab161275577ccd3f525653e7766ca4f92c6 33SHA1 (patch-src_svg_svg-length.cpp) = 41679ab161275577ccd3f525653e7766ca4f92c6
34SHA1 (patch-src_trace_siox.cpp) = daeff4626dace6997f64ab9c96b0bfb304e724c8 34SHA1 (patch-src_trace_siox.cpp) = daeff4626dace6997f64ab9c96b0bfb304e724c8
cvs diff -r1.4 -r1.5 pkgsrc/graphics/inkscape/patches/Attic/patch-src_extension_internal_pdfinput_pdf-parser.h (expand / switch to unified diff)

--- pkgsrc/graphics/inkscape/patches/Attic/patch-src_extension_internal_pdfinput_pdf-parser.h 2019/01/06 08:41:01 1.4
+++ pkgsrc/graphics/inkscape/patches/Attic/patch-src_extension_internal_pdfinput_pdf-parser.h 2019/02/25 18:57:03 1.5
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.h,v 1.4 2019/01/06 08:41:01 markd Exp $ 1$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.h,v 1.5 2019/02/25 18:57:03 maya Exp $
2 2
3Explicitly include poppler/Object.h; otherwise Python's Object.h gets included. 3Explicitly include poppler/Object.h; otherwise Python's Object.h gets included.
4Support for poppler 0.72 from upstream by way of linuxfromscratch  4Support for poppler 0.72 from upstream by way of linuxfromscratch
5 5
6--- src/extension/internal/pdfinput/pdf-parser.h.orig 2018-03-11 20:38:09.000000000 +0000 6--- src/extension/internal/pdfinput/pdf-parser.h.orig 2018-03-11 20:38:09.000000000 +0000
7+++ src/extension/internal/pdfinput/pdf-parser.h 7+++ src/extension/internal/pdfinput/pdf-parser.h
8@@ -9,6 +9,7 @@ 8@@ -9,6 +9,7 @@
9 #define PDF_PARSER_H 9 #define PDF_PARSER_H
10  10
11 #ifdef HAVE_POPPLER 11 #ifdef HAVE_POPPLER
12+#include "poppler-transition-api.h" 12+#include "poppler-transition-api.h"
13  13
14 #ifdef USE_GCC_PRAGMAS 14 #ifdef USE_GCC_PRAGMAS
15 #pragma interface 15 #pragma interface
16@@ -25,8 +26,9 @@ namespace Inkscape { 16@@ -25,8 +26,8 @@ namespace Inkscape {
17 // TODO clean up and remove using: 17 // TODO clean up and remove using:
18 using Inkscape::Extension::Internal::SvgBuilder; 18 using Inkscape::Extension::Internal::SvgBuilder;
19  19
20+#include "glib/poppler-features.h" 20+#include "glib/poppler-features.h"
21 #include "goo/gtypes.h" 21-#include "goo/gtypes.h"
22-#include "Object.h" 22-#include "Object.h"
23+#include "poppler/Object.h" 23+#include "poppler/Object.h"
24  24
25 class GooString; 25 class GooString;
26 class XRef; 26 class XRef;
27@@ -127,11 +129,14 @@ public: 27@@ -127,11 +129,14 @@ public:
28  28
29 // Constructor for regular output. 29 // Constructor for regular output.
30 PdfParser(XRef *xrefA, SvgBuilder *builderA, int pageNum, int rotate, 30 PdfParser(XRef *xrefA, SvgBuilder *builderA, int pageNum, int rotate,
31- Dict *resDict, PDFRectangle *box, PDFRectangle *cropBox); 31- Dict *resDict, PDFRectangle *box, PDFRectangle *cropBox);
32+ Dict *resDict, 32+ Dict *resDict,
33+ _POPPLER_CONST PDFRectangle *box, 33+ _POPPLER_CONST PDFRectangle *box,
34+ _POPPLER_CONST PDFRectangle *cropBox); 34+ _POPPLER_CONST PDFRectangle *cropBox);