diff options
| author | adam <adam@pkgsrc.org> | 2012-12-30 10:31:14 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2012-12-30 10:31:14 +0000 |
| commit | 2a8f0871a8f9af6868b980e777797ac4b6ff30cd (patch) | |
| tree | 62cb8c305636c30b0576aa9b1db9b780f2076239 /graphics | |
| parent | e0f2f291051169e551b1102b166517e41ad08f4d (diff) | |
| download | pkgsrc-2a8f0871a8f9af6868b980e777797ac4b6ff30cd.tar.gz | |
Fix Object.h conflict
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/inkscape/distinfo | 3 | ||||
| -rw-r--r-- | graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo index 5738e1a1844..5f050974ed0 100644 --- a/graphics/inkscape/distinfo +++ b/graphics/inkscape/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.44 2012/12/18 14:01:06 drochner Exp $ +$NetBSD: distinfo,v 1.45 2012/12/30 10:31:14 adam Exp $ SHA1 (inkscape-0.48.4.tar.bz2) = 5f26f6ad191d1e7c2a9fb69a438722beb172224c RMD160 (inkscape-0.48.4.tar.bz2) = b089ced7694a9803fac8588d93e7e6239c71d3e8 @@ -21,6 +21,7 @@ SHA1 (patch-src_color-profile.cpp) = 14932b25ed333925518d5140b3691a29e155cd9a SHA1 (patch-src_display_nr-filter-gaussian.cpp) = 344109eb4360560bfe8481b25588ef37e5140135 SHA1 (patch-src_dom_io_domstream.cpp) = 6b525b8e730e4497afdf1da0ae27f0dc69bfad40 SHA1 (patch-src_dom_io_domstream.h) = 9325fc9d211eb3349628a736283ed0c475399a8b +SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 02742a022a8a55852d7f0a39969153bf7f24f17e SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = 9e9e76049b9fdcc5192e225b4b477a104902894b SHA1 (patch-src_ui_dialog_inkscape-preferences.cpp) = f95af6d326ddf7512b67f68efe0b23bc3ebe651e SHA1 (patch-src_ui_widget_registered-widget.h) = a5c16bcd28a015959121ed8b92423762f182a71b diff --git a/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp b/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp new file mode 100644 index 00000000000..6805d2cdb3c --- /dev/null +++ b/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp @@ -0,0 +1,14 @@ +$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.cpp,v 1.1 2012/12/30 10:31:14 adam Exp $ + +Object.h is included in pdf-parser.h -- see patch for pdf-parser.h. + +--- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2012-12-30 09:44:48.000000000 +0000 ++++ src/extension/internal/pdfinput/pdf-parser.cpp +@@ -38,7 +38,6 @@ extern "C" { + #include "goo/GooHash.h" + #include "GlobalParams.h" + #include "CharTypes.h" +-#include "Object.h" + #include "Array.h" + #include "Dict.h" + #include "Stream.h" |