Thu Jun 5 10:17:28 2008 UTC ()
make it build on DragonFly, from Hasso Tepper per PR pkg/38843


(drochner)
diff -r1.23 -r1.24 pkgsrc/graphics/inkscape/distinfo
diff -r0 -r1.8 pkgsrc/graphics/inkscape/patches/patch-ab
diff -r1.3 -r1.4 pkgsrc/graphics/inkscape/patches/patch-ad
cvs diff -r1.23 -r1.24 pkgsrc/graphics/inkscape/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/inkscape/distinfo 2008/04/07 17:08:53 1.23
+++ pkgsrc/graphics/inkscape/distinfo 2008/06/05 10:17:28 1.24
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.23 2008/04/07 17:08:53 adam Exp $ 1$NetBSD: distinfo,v 1.24 2008/06/05 10:17:28 drochner Exp $
2 2
3SHA1 (inkscape-0.46.tar.bz2) = ca68fc9bf539d7bcfc31f36d24f884255b2154e7 3SHA1 (inkscape-0.46.tar.bz2) = ca68fc9bf539d7bcfc31f36d24f884255b2154e7
4RMD160 (inkscape-0.46.tar.bz2) = c90713493557bdc17515de1287c9af401a4a3e26 4RMD160 (inkscape-0.46.tar.bz2) = c90713493557bdc17515de1287c9af401a4a3e26
5Size (inkscape-0.46.tar.bz2) = 13368645 bytes 5Size (inkscape-0.46.tar.bz2) = 13368645 bytes
6SHA1 (patch-aa) = 595eaa0e71483abe731bc3f69090b0ab5d1d5deb 6SHA1 (patch-aa) = 595eaa0e71483abe731bc3f69090b0ab5d1d5deb
 7SHA1 (patch-ab) = 7eca63e71523f47d968d7b2c513a11010381f1ed
7SHA1 (patch-ac) = 8034de5cf024ef6ec55e378681a1f450da23bbce 8SHA1 (patch-ac) = 8034de5cf024ef6ec55e378681a1f450da23bbce
8SHA1 (patch-ad) = 4700208bb97c3d09733f2777bb32f973779b06a8 9SHA1 (patch-ad) = 3136850b7d34370feb951fc8fdde8cda78d54d60
9SHA1 (patch-ae) = 2b3f06a545d3cf27f59d41619528c59ac142c758 10SHA1 (patch-ae) = 2b3f06a545d3cf27f59d41619528c59ac142c758
10SHA1 (patch-af) = 190f59d9b3233154e41dd43964265b0a4709c977 11SHA1 (patch-af) = 190f59d9b3233154e41dd43964265b0a4709c977
File Added: pkgsrc/graphics/inkscape/patches/Attic/patch-ab
$NetBSD: patch-ab,v 1.8 2008/06/05 10:17:28 drochner Exp $

--- ./src/ui/dialog/print.cpp.orig	2008-06-02 23:26:59 +0300
+++ ./src/ui/dialog/print.cpp	2008-06-02 23:28:48 +0300
@@ -16,6 +16,8 @@
 #include <io.h>
 #endif
 
+#include <unistd.h> // close() and unlink()
+
 #include <gtkmm/stock.h>
 #include "print.h"
cvs diff -r1.3 -r1.4 pkgsrc/graphics/inkscape/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/graphics/inkscape/patches/Attic/patch-ad 2007/02/05 20:20:03 1.3
+++ pkgsrc/graphics/inkscape/patches/Attic/patch-ad 2008/06/05 10:17:28 1.4
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-ad,v 1.3 2007/02/05 20:20:03 adam Exp $ 1$NetBSD: patch-ad,v 1.4 2008/06/05 10:17:28 drochner Exp $
2 2
3--- src/trace/potrace/inkscape-potrace.cpp.orig 2007-01-16 03:05:41.000000000 +0100 3--- ./src/trace/potrace/inkscape-potrace.cpp.orig 2008-03-11 06:20:37 +0200
4+++ src/trace/potrace/inkscape-potrace.cpp 4+++ ./src/trace/potrace/inkscape-potrace.cpp 2008-06-03 00:11:41 +0300
5@@ -31,7 +31,16 @@ 5@@ -31,7 +31,16 @@
6 #include "curve.h" 6 #include "curve.h"
7 #include "bitmap.h" 7 #include "bitmap.h"
8  8
9+#if defined(__NetBSD__) 9+#if defined(__NetBSD__) || defined(__DragonFly__)
10+#include <sys/param.h> 10+#include <sys/param.h>
11+#endif 11+#endif
12  12
13+#if defined(__DragonFly__) || (defined(__NetBSD__) && __NetBSD_Version__ < 399000800) 13+#if (defined(__DragonFly__) && __DragonFly_version < 190000) || (defined(__NetBSD__) && __NetBSD_Version__ < 399000800)
14+static double log2(double val) 14+static double log2(double val)
15+{ 15+{
16+ return log(val) / M_LN2; 16+ return log(val) / M_LN2;
17+} 17+}
18+#endif 18+#endif
19  19
20 static void updateGui() 20 static void updateGui()
21 { 21 {