diff options
Diffstat (limited to 'graphics/inkscape')
-rw-r--r-- | graphics/inkscape/Makefile | 5 | ||||
-rw-r--r-- | graphics/inkscape/distinfo | 5 | ||||
-rw-r--r-- | graphics/inkscape/patches/patch-ah | 28 | ||||
-rw-r--r-- | graphics/inkscape/patches/patch-ai | 13 | ||||
-rw-r--r-- | graphics/inkscape/patches/patch-aj | 22 |
5 files changed, 70 insertions, 3 deletions
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index e2d721b3f78..592e9697af5 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.39 2008/05/30 12:29:00 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2009/05/20 12:00:17 tnn Exp $ DISTNAME= inkscape-0.46 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/} EXTRACT_SUFX= .tar.bz2 @@ -40,6 +40,7 @@ UNLIMIT_RESOURCES= datasize .include "../../graphics/lcms/buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/gtkspell/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo index 71a6641accd..a4b308d162e 100644 --- a/graphics/inkscape/distinfo +++ b/graphics/inkscape/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2008/10/16 22:12:04 adam Exp $ +$NetBSD: distinfo,v 1.26 2009/05/20 12:00:17 tnn Exp $ SHA1 (inkscape-0.46.tar.bz2) = ca68fc9bf539d7bcfc31f36d24f884255b2154e7 RMD160 (inkscape-0.46.tar.bz2) = c90713493557bdc17515de1287c9af401a4a3e26 @@ -10,3 +10,6 @@ SHA1 (patch-ad) = 3136850b7d34370feb951fc8fdde8cda78d54d60 SHA1 (patch-ae) = 2b3f06a545d3cf27f59d41619528c59ac142c758 SHA1 (patch-af) = 190f59d9b3233154e41dd43964265b0a4709c977 SHA1 (patch-ag) = 6b6000f3940ec6db9404a206f9757928c1d5740b +SHA1 (patch-ah) = 964e51dca7e1212037a9f0122fa0ef812bf8f46c +SHA1 (patch-ai) = 56271685b207f4056952929895f1fdd2ec74e3ef +SHA1 (patch-aj) = ae258d2b4f3d5bdbfbc6d76d13361b6e672de73c diff --git a/graphics/inkscape/patches/patch-ah b/graphics/inkscape/patches/patch-ah new file mode 100644 index 00000000000..386f3f41ecc --- /dev/null +++ b/graphics/inkscape/patches/patch-ah @@ -0,0 +1,28 @@ +$NetBSD: patch-ah,v 1.3 2009/05/20 12:00:17 tnn Exp $ + +--- src/widgets/sp-color-slider.cpp.orig 2009-05-20 13:21:10.000000000 +0200 ++++ src/widgets/sp-color-slider.cpp +@@ -12,6 +12,7 @@ + * This code is in public domain + */ + ++#include <gtk/gtkversion.h> + #include <gtk/gtksignal.h> + #include "sp-color-scales.h" + +@@ -330,8 +331,14 @@ sp_color_slider_set_adjustment (SPColorS + g_return_if_fail (SP_IS_COLOR_SLIDER (slider)); + + if (!adjustment) { +- adjustment = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 1.0, 0.01, 0.1, 0.1); ++ adjustment = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 1.0, 0.01, 0.0, 0.0); + } ++#if GTK_CHECK_VERSION (2,14,0) ++ else { ++ gtk_adjustment_set_page_increment(adjustment, 0.0); ++ gtk_adjustment_set_page_size(adjustment, 0.0); ++ } ++#endif + + if (slider->adjustment != adjustment) { + if (slider->adjustment) { diff --git a/graphics/inkscape/patches/patch-ai b/graphics/inkscape/patches/patch-ai new file mode 100644 index 00000000000..07e5c1a8d6d --- /dev/null +++ b/graphics/inkscape/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.3 2009/05/20 12:00:17 tnn Exp $ + +--- src/widgets/dash-selector.cpp.orig 2008-03-11 05:20:14.000000000 +0100 ++++ src/widgets/dash-selector.cpp +@@ -116,7 +116,7 @@ sp_dash_selector_init (SPDashSelector *d + } + gtk_option_menu_set_menu (GTK_OPTION_MENU (dsel->dash), m); + +- dsel->offset = gtk_adjustment_new (0.0, 0.0, 10.0, 0.1, 1.0, 1.0); ++ dsel->offset = gtk_adjustment_new (0.0, 0.0, 10.0, 0.1, 1.0, 0.0); + GtkWidget *sb = gtk_spin_button_new (GTK_ADJUSTMENT (dsel->offset), 0.1, 2); + gtk_tooltips_set_tip (tt, sb, _("Pattern offset"), NULL); + diff --git a/graphics/inkscape/patches/patch-aj b/graphics/inkscape/patches/patch-aj new file mode 100644 index 00000000000..b5620e7db45 --- /dev/null +++ b/graphics/inkscape/patches/patch-aj @@ -0,0 +1,22 @@ +$NetBSD: patch-aj,v 1.1 2009/05/20 12:00:17 tnn Exp $ + +--- src/dialogs/stroke-style.cpp.orig 2008-03-11 05:19:51.000000000 +0100 ++++ src/dialogs/stroke-style.cpp +@@ -1098,7 +1098,7 @@ sp_stroke_style_line_widget_new(void) + // with it, the two remaining calls of stroke_average_width, allowing us to get rid of that + // function in desktop-style. + +- a = gtk_adjustment_new(1.0, 0.0, 1000.0, 0.1, 10.0, 10.0); ++ a = gtk_adjustment_new(1.0, 0.0, 1000.0, 0.1, 10.0, 0.0); + gtk_object_set_data(GTK_OBJECT(spw), "width", a); + sb = gtk_spin_button_new(GTK_ADJUSTMENT(a), 0.1, 3); + gtk_tooltips_set_tip(tt, sb, _("Stroke width"), NULL); +@@ -1167,7 +1167,7 @@ sp_stroke_style_line_widget_new(void) + + hb = spw_hbox(t, 3, 1, i); + +- a = gtk_adjustment_new(4.0, 0.0, 100.0, 0.1, 10.0, 10.0); ++ a = gtk_adjustment_new(4.0, 0.0, 100.0, 0.1, 10.0, 0.0); + gtk_object_set_data(GTK_OBJECT(spw), "miterlimit", a); + + sb = gtk_spin_button_new(GTK_ADJUSTMENT(a), 0.1, 2); |