Update to 0.36

8 files changed, 32 insertions, 75 deletions

diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 4ca2afc2a50e..97d740385e06 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	inkscape
-PORTVERSION=	0.35
+PORTVERSION=	0.36
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index 6845a3b0958b..b2de612f2acb 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1 +1 @@
-MD5 (inkscape-0.35.tar.gz) = 5c91e4bf26f7894c794b430fcce1a70f
+MD5 (inkscape-0.36.tar.gz) = 3bd8581afee27b00dd7fdce0e7d8f6fa
diff --git a/graphics/inkscape/files/patch-src::dialogs::dialog-events.c b/graphics/inkscape/files/patch-src::dialogs::dialog-events.c
new file mode 100644
index 000000000000..786fc32dd499
--- /dev/null
+++ b/graphics/inkscape/files/patch-src::dialogs::dialog-events.c
@@ -0,0 +1,17 @@
+--- src/dialogs/dialog-events.c.orig	Thu Dec 11 08:08:58 2003
++++ src/dialogs/dialog-events.c	Thu Dec 11 08:09:47 2003
+@@ -122,12 +122,13 @@
+ sp_transientize_callback (Inkscape *inkscape, SPDesktop *desktop, win_data *wd)
+ {
+ #ifndef WIN32
++	GtkWindow *w;
++
+ 	if (wd->stop) { // if retransientizing of this dialog is still forbidden after previous call
+ 		// warning turned off because it was confusingly fired when loading many files from command line
+ 		//		g_warning("Retranzientize aborted! You're switching windows too fast!"); 
+ 		return;
+ 	}
+-	GtkWindow *w;
+ 
+ 	w = (GtkWindow *) g_object_get_data (G_OBJECT (desktop), "window"); 
+ 	if (w && wd->win) {
diff --git a/graphics/inkscape/files/patch-src::dialogs::stroke-style.c b/graphics/inkscape/files/patch-src::dialogs::stroke-style.c
index 1e81fa7945c5..a888a5e73e3c 100644
--- a/graphics/inkscape/files/patch-src::dialogs::stroke-style.c
+++ b/graphics/inkscape/files/patch-src::dialogs::stroke-style.c
@@ -1,14 +1,14 @@
---- src/dialogs/stroke-style.c.orig	Sun Nov 16 22:49:08 2003
-+++ src/dialogs/stroke-style.c	Sun Nov 16 22:50:27 2003
-@@ -537,6 +537,7 @@
- {
- 	GtkWidget *spw, *f, *t, *l, *hb, *sb, *us, *tb, *px, *ds;
+--- src/dialogs/stroke-style.c.orig	Thu Dec 11 08:05:58 2003
++++ src/dialogs/stroke-style.c	Thu Dec 11 08:08:22 2003
+@@ -581,6 +581,7 @@
+ 	GtkWidget *spw, *f, *t, *l, *hb, *sb, *us, *tb, *ds;
  	GtkObject *a;
+ 	gint i;
 +	SPDesktop *desktop;
  
  	spw = sp_widget_new_global (INKSCAPE);
  
-@@ -678,7 +679,7 @@
+@@ -725,7 +726,7 @@
  	gtk_signal_connect (GTK_OBJECT (spw), "change_selection", GTK_SIGNAL_FUNC (sp_stroke_style_line_change_selection), NULL);
  	gtk_signal_connect (GTK_OBJECT (spw), "attr_changed", GTK_SIGNAL_FUNC (sp_stroke_style_line_attr_changed), NULL);
  
diff --git a/graphics/inkscape/files/patch-src::interface.c b/graphics/inkscape/files/patch-src::interface.c
deleted file mode 100644
index 59537af08739..000000000000
--- a/graphics/inkscape/files/patch-src::interface.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/interface.c.orig	Sun Nov 16 22:55:27 2003
-+++ src/interface.c	Sun Nov 16 22:57:29 2003
-@@ -299,10 +299,12 @@
- 		SP_VERB_LAST
- 	};
- 
-+	GtkWidget *item_recent, *menu_recent;
-+
- 	sp_ui_menu_append (fm, file_verbs_one);
- 
-- 	GtkWidget *item_recent = sp_ui_menu_append_item (fm, NULL, _("Open Recent"), NULL, NULL);
-- 	GtkWidget *menu_recent = gtk_menu_new ();
-+ 	item_recent = sp_ui_menu_append_item (fm, NULL, _("Open Recent"), NULL, NULL);
-+ 	menu_recent = gtk_menu_new ();
-  	sp_menu_append_recent_documents (GTK_WIDGET (menu_recent));
- 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item_recent), menu_recent);
- 
-@@ -472,11 +474,13 @@
- static void
- sp_ui_populate_main_menu(GtkWidget *m)
- {
-+	GtkWidget *item_recent, *menu_recent;
-+
- 	sp_ui_menu_append_item (GTK_MENU (m), GTK_STOCK_NEW, _("New"), G_CALLBACK(sp_file_new), NULL);
- 	sp_ui_menu_append_item (GTK_MENU (m), GTK_STOCK_OPEN, _("Open"), G_CALLBACK(sp_file_open_dialog), NULL);
-         
--	GtkWidget *item_recent = sp_ui_menu_append_item (GTK_MENU (m), NULL, _("Open Recent"), NULL, NULL);
--	GtkWidget *menu_recent = gtk_menu_new ();
-+	item_recent = sp_ui_menu_append_item (GTK_MENU (m), NULL, _("Open Recent"), NULL, NULL);
-+	menu_recent = gtk_menu_new ();
- 
- 	sp_menu_append_recent_documents (GTK_WIDGET (menu_recent));
- 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item_recent), menu_recent); 
diff --git a/graphics/inkscape/files/patch-src::main.c b/graphics/inkscape/files/patch-src::main.c
deleted file mode 100644
index 7e0e3b8d5982..000000000000
--- a/graphics/inkscape/files/patch-src::main.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/main.c.orig	Sun Apr 15 16:27:51 2001
-+++ src/main.c	Thu May 30 23:14:44 2002
-@@ -17,7 +17,7 @@
- #include <tree.h> /* libxml */
- 
- #ifdef __FreeBSD__
--#include <floatingpoint.h>
-+#include <ieeefp.h>
- #endif
- 
- #include "sodipodi-private.h"
-@@ -357,7 +357,7 @@
- 
- 	}
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) && defined(__i386__)
- 	fpresetsticky(FP_X_DZ|FP_X_INV);
- 	fpsetmask(FP_X_DZ|FP_X_INV);
- #endif
diff --git a/graphics/inkscape/files/patch-src::xml::repr-io.c b/graphics/inkscape/files/patch-src::xml::repr-io.c
deleted file mode 100644
index 78e3fdb9dd4d..000000000000
--- a/graphics/inkscape/files/patch-src::xml::repr-io.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/graphics/inkscape/files/Attic/patch-src::xml::repr-io.c,v 1.1 2003-11-17 04:03:39 bland Exp $
-
---- src/xml/repr-io.c	2001/11/22 15:20:50	1.1
-+++ src/xml/repr-io.c	2001/11/22 15:21:18
-@@ -1,6 +1,8 @@
- #define SP_REPR_IO_C
- 
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <string.h>
- #include <stdio.h>
- #include "repr.h"
diff --git a/graphics/inkscape/pkg-plist b/graphics/inkscape/pkg-plist
index 8b3c03f6418c..8b24480b005e 100644
--- a/graphics/inkscape/pkg-plist
+++ b/graphics/inkscape/pkg-plist
@@ -1,5 +1,6 @@
 bin/inkscape
 lib/inkscape/extensions/SpSVG.pm
+lib/inkscape/extensions/dia2svg.sh
 lib/inkscape/extensions/ill2svg.pl
 lib/inkscape/extensions/roundhole
 lib/inkscape/extensions/svg_dropshadow
@@ -104,6 +105,12 @@ share/gnome/inkscape/line_doubled.xpm
 share/gnome/inkscape/line_full.xpm
 share/gnome/inkscape/lock_aspect_no.xpm
 share/gnome/inkscape/lock_aspect_yes.xpm
+share/gnome/inkscape/modules/ai_input.inkmod
+share/gnome/inkscape/modules/dia.inkmod
+share/gnome/inkscape/modules/dropshadow.inkmod
+share/gnome/inkscape/modules/roundhole.inkmod
+share/gnome/inkscape/modules/svgz_input.inkmod
+share/gnome/inkscape/modules/svgz_output.inkmod
 share/gnome/inkscape/move.xpm
 share/gnome/inkscape/node.xpm
 share/gnome/inkscape/node_break.xpm