Tue Dec 14 22:19:52 2010 UTC ()
Fix buildling on Mac OS X, without X11, with OpenMP


(adam)
diff -r1.31 -r1.32 pkgsrc/graphics/inkscape/distinfo
diff -r0 -r1.6 pkgsrc/graphics/inkscape/patches/patch-ac
cvs diff -r1.31 -r1.32 pkgsrc/graphics/inkscape/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/inkscape/distinfo 2010/09/22 11:39:13 1.31
+++ pkgsrc/graphics/inkscape/distinfo 2010/12/14 22:19:52 1.32
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.31 2010/09/22 11:39:13 adam Exp $ 1$NetBSD: distinfo,v 1.32 2010/12/14 22:19:52 adam Exp $
2 2
3SHA1 (inkscape-0.48.0.tar.bz2) = a2ab9b34937cc4f2b482c9b3720d8fd4dc7b12e8 3SHA1 (inkscape-0.48.0.tar.bz2) = a2ab9b34937cc4f2b482c9b3720d8fd4dc7b12e8
4RMD160 (inkscape-0.48.0.tar.bz2) = fe10b77f10e922a911e7117922d7553ed11d00dd 4RMD160 (inkscape-0.48.0.tar.bz2) = fe10b77f10e922a911e7117922d7553ed11d00dd
5Size (inkscape-0.48.0.tar.bz2) = 19333922 bytes 5Size (inkscape-0.48.0.tar.bz2) = 19333922 bytes
6SHA1 (patch-aa) = 595eaa0e71483abe731bc3f69090b0ab5d1d5deb 6SHA1 (patch-aa) = 595eaa0e71483abe731bc3f69090b0ab5d1d5deb
7SHA1 (patch-ab) = b70ffa613c054c26185d4728da4133aed6d88e63 7SHA1 (patch-ab) = b70ffa613c054c26185d4728da4133aed6d88e63
 8SHA1 (patch-ac) = 626b733daf01a79c1b443323d0df559eb494020e
8SHA1 (patch-ad) = 3136850b7d34370feb951fc8fdde8cda78d54d60 9SHA1 (patch-ad) = 3136850b7d34370feb951fc8fdde8cda78d54d60
9SHA1 (patch-ae) = 2b3f06a545d3cf27f59d41619528c59ac142c758 10SHA1 (patch-ae) = 2b3f06a545d3cf27f59d41619528c59ac142c758
10SHA1 (patch-af) = 5f9317fcb7a798afc569aada9683fb1c7f6ba4c7 11SHA1 (patch-af) = 5f9317fcb7a798afc569aada9683fb1c7f6ba4c7
11SHA1 (patch-ag) = 6b6000f3940ec6db9404a206f9757928c1d5740b 12SHA1 (patch-ag) = 6b6000f3940ec6db9404a206f9757928c1d5740b
12SHA1 (patch-ah) = 7f5517171073017b3e96367237af2c981cecf628 13SHA1 (patch-ah) = 7f5517171073017b3e96367237af2c981cecf628
13SHA1 (patch-ai) = 1cd8e744848d6b52ffb4f07922e09689b5e43f61 14SHA1 (patch-ai) = 1cd8e744848d6b52ffb4f07922e09689b5e43f61
14SHA1 (patch-aj) = 8564ee2d4e884dc31e4ad4232267f6fad09f71ee 15SHA1 (patch-aj) = 8564ee2d4e884dc31e4ad4232267f6fad09f71ee
15SHA1 (patch-ap) = cd29bd178dc2c6c9456bc09d6663d6a25acc7da1 16SHA1 (patch-ap) = cd29bd178dc2c6c9456bc09d6663d6a25acc7da1
File Added: pkgsrc/graphics/inkscape/patches/Attic/patch-ac
$NetBSD: patch-ac,v 1.6 2010/12/14 22:19:52 adam Exp $

--- configure.orig	2010-08-04 16:46:39.000000000 +0000
+++ configure
@@ -8133,11 +8133,11 @@ for ax_openmp_flag in $ax_openmp_flags; 
 #ifdef __cplusplus
 extern "C"
 #endif
-char omp_set_num_threads ();
+#include <omp.h>
 int
 main ()
 {
-return omp_set_num_threads ();
+return omp_get_num_threads ();
   ;
   return 0;
 }
@@ -10765,7 +10765,7 @@ $as_echo "#define HAVE_CAIRO_PDF 1" >>co
 
 fi
 
-INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lX11 -lxml2"
+INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lxml2"
 if test "x$openmp_ok" = "xyes"; then
 	INKSCAPE_LIBS="$INKSCAPE_LIBS -lgomp"
 fi