Fix building on OS X

4 files changed, 79 insertions, 11 deletions

diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index 0111d85e5c2..1d135f0c421 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.42 2012/11/16 00:54:04 joerg Exp $
+$NetBSD: distinfo,v 1.43 2012/11/18 15:40:55 adam Exp $
 
 SHA1 (inkscape-0.48.3.1.tar.bz2) = 23344555a1b5cc7909ad01d926cfaddb67bfbde9
 RMD160 (inkscape-0.48.3.1.tar.bz2) = 139720f01b987001b558226ec2de60b36fb1123c
 Size (inkscape-0.48.3.1.tar.bz2) = 19688778 bytes
 SHA1 (patch-aa) = d946236902fc6cf0d2ddcbb9dd667b4d9c6f99d4
 SHA1 (patch-ab) = b70ffa613c054c26185d4728da4133aed6d88e63
-SHA1 (patch-ac) = 52a5290810ed43514b540f9a9b324e711f6b4637
+SHA1 (patch-ac) = 01caeac029e0ce7e4c4e2b6a9a80b76d9f9b495e
 SHA1 (patch-ad) = 3136850b7d34370feb951fc8fdde8cda78d54d60
 SHA1 (patch-ae) = 2b3f06a545d3cf27f59d41619528c59ac142c758
 SHA1 (patch-af) = 5f9317fcb7a798afc569aada9683fb1c7f6ba4c7
@@ -18,13 +18,14 @@ SHA1 (patch-al) = 1ab7727a232001e9962dd34f125b220cb0ea889c
 SHA1 (patch-am) = 2307f1ab4bb628d9babaeadb5783073f62eedaca
 SHA1 (patch-ap) = cd29bd178dc2c6c9456bc09d6663d6a25acc7da1
 SHA1 (patch-aq) = dd307f598741cd5f0ff35eb06dff7c685752a979
-SHA1 (patch-ar) = 128749bac44faf4135670068e06c0928eb5c27c8
+SHA1 (patch-ar) = 424a0b143564e693ccafc1d4c29071f1061a29e6
 SHA1 (patch-src_2geom_basic-intersection.cpp) = 743b13293191a74d4c0c22231e5ed7866219dfee
 SHA1 (patch-src_2geom_solve-bezier-parametric.cpp) = 71cca994451b1e7d5aba625600089d1e4a47888e
 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.h) = 9e9e76049b9fdcc5192e225b4b477a104902894b
 SHA1 (patch-src_ui_dialog_inkscape-preferences.cpp) = f95af6d326ddf7512b67f68efe0b23bc3ebe651e
 SHA1 (patch-src_ui_widget_registered-widget.h) = a5c16bcd28a015959121ed8b92423762f182a71b
 SHA1 (patch-src_widgets_desktop-widget.h) = 6528b3105590bfa8b5d33d428aa8c9cbc3561225
diff --git a/graphics/inkscape/patches/patch-ac b/graphics/inkscape/patches/patch-ac
index e2d29620742..af6a8bce7e6 100644
--- a/graphics/inkscape/patches/patch-ac
+++ b/graphics/inkscape/patches/patch-ac
@@ -1,8 +1,16 @@
-$NetBSD: patch-ac,v 1.8 2012/06/01 20:23:11 drochner Exp $
+$NetBSD: patch-ac,v 1.9 2012/11/18 15:40:55 adam Exp $
 
 --- configure.orig	2012-02-19 01:43:51.000000000 +0000
 +++ configure
-@@ -7450,7 +7450,7 @@ fi
+@@ -7349,7 +7349,6 @@ fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler support for -Werror=format-security" >&5
+ $as_echo_n "checking compiler support for -Werror=format-security... " >&6; }
+   ink_svd_CPPFLAGS="$CPPFLAGS"
+-  CPPFLAGS="-Werror=format-security $CPPFLAGS"
+ 
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+@@ -7450,7 +7449,7 @@ fi
  
  ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
  
@@ -11,7 +19,7 @@ $NetBSD: patch-ac,v 1.8 2012/06/01 20:23:11 drochner Exp $
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU compiler version" >&5
  $as_echo_n "checking GNU compiler version... " >&6; }
  
-@@ -7578,7 +7578,7 @@ cat >>confdefs.h <<_ACEOF
+@@ -7578,7 +7577,7 @@ cat >>confdefs.h <<_ACEOF
  #define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
  _ACEOF
  
@@ -20,7 +28,7 @@ $NetBSD: patch-ac,v 1.8 2012/06/01 20:23:11 drochner Exp $
  
     for ac_header in locale.h
  do :
-@@ -8445,11 +8445,11 @@ for ax_openmp_flag in $ax_openmp_flags; 
+@@ -8445,11 +8444,11 @@ for ax_openmp_flag in $ax_openmp_flags; 
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -34,7 +42,7 @@ $NetBSD: patch-ac,v 1.8 2012/06/01 20:23:11 drochner Exp $
    ;
    return 0;
  }
-@@ -9620,11 +9620,11 @@ fi
+@@ -9620,11 +9619,11 @@ fi
  
  
  if test "x$with_python" = "xyes"; then
@@ -48,7 +56,16 @@ $NetBSD: patch-ac,v 1.8 2012/06/01 20:23:11 drochner Exp $
          if test "$?" -gt "0"; then
              with_python="no"
          else
-@@ -11095,7 +11095,7 @@ $as_echo "#define HAVE_CAIRO_PDF 1" >>co
+@@ -9684,7 +9683,7 @@ if test "x$enable_lcms" = "xno"; then
+     have_lcms2=no
+ else
+     # Have to test LittleCms presence
+-    if test "x${platform_osx}" != "xyes"; then
++    if test "x" != "xyes"; then
+        # lcms 2.2 & 2.3 have problems on OSX
+ 
+ pkg_failed=no
+@@ -11095,7 +11094,7 @@ $as_echo "#define HAVE_CAIRO_PDF 1" >>co
  
  fi
  
diff --git a/graphics/inkscape/patches/patch-ar b/graphics/inkscape/patches/patch-ar
index 3b6c1106c11..4c614259c8b 100644
--- a/graphics/inkscape/patches/patch-ar
+++ b/graphics/inkscape/patches/patch-ar
@@ -1,8 +1,8 @@
-$NetBSD: patch-ar,v 1.2 2012/07/05 10:23:31 wiz Exp $
+$NetBSD: patch-ar,v 1.3 2012/11/18 15:40:55 adam Exp $
 
 Fix build with poppler-0.20.
 
---- src/extension/internal/pdfinput/pdf-parser.cpp.orig	2012-06-24 14:38:28.000000000 +0000
+--- src/extension/internal/pdfinput/pdf-parser.cpp.orig	2011-07-08 18:25:09.000000000 +0000
 +++ src/extension/internal/pdfinput/pdf-parser.cpp
 @@ -11,6 +11,7 @@
  #ifdef HAVE_CONFIG_H
@@ -12,6 +12,41 @@ Fix build with poppler-0.20.
  
  #ifdef HAVE_POPPLER
  
+@@ -36,20 +37,20 @@ extern "C" {
+ #include "goo/gmem.h"
+ #include "goo/GooTimer.h"
+ #include "goo/GooHash.h"
+-#include "GlobalParams.h"
+-#include "CharTypes.h"
+-#include "Object.h"
+-#include "Array.h"
+-#include "Dict.h"
+-#include "Stream.h"
+-#include "Lexer.h"
+-#include "Parser.h"
+-#include "GfxFont.h"
+-#include "GfxState.h"
+-#include "OutputDev.h"
+-#include "Page.h"
+-#include "Annot.h"
+-#include "Error.h"
++#include "poppler/GlobalParams.h"
++#include "poppler/CharTypes.h"
++#include "poppler/Object.h"
++#include "poppler/Array.h"
++#include "poppler/Dict.h"
++#include "poppler/Stream.h"
++#include "poppler/Lexer.h"
++#include "poppler/Parser.h"
++#include "poppler/GfxFont.h"
++#include "poppler/GfxState.h"
++#include "poppler/OutputDev.h"
++#include "poppler/Page.h"
++#include "poppler/Annot.h"
++#include "poppler/Error.h"
+ 
+ // the MSVC math.h doesn't define this
+ #ifndef M_PI
 @@ -367,14 +368,14 @@ void PdfParser::parse(Object *obj, GBool
      for (i = 0; i < obj->arrayGetLength(); ++i) {
        obj->arrayGet(i, &obj2);
diff --git a/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.h b/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.h
new file mode 100644
index 00000000000..b8ff8c126ec
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.h,v 1.1 2012/11/18 15:40:55 adam Exp $
+
+Explicitly include poppler/Object.h; otherwise Python's Object.h gets included.
+
+--- src/extension/internal/pdfinput/pdf-parser.h.orig	2012-11-18 14:42:04.000000000 +0000
++++ src/extension/internal/pdfinput/pdf-parser.h
+@@ -27,7 +27,7 @@ namespace Inkscape {
+ using Inkscape::Extension::Internal::SvgBuilder;
+ 
+ #include "goo/gtypes.h"
+-#include "Object.h"
++#include "poppler/Object.h"
+ 
+ class GooString;
+ class XRef;