summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2017-05-24 23:59:42 (GMT)
committerespie <espie@openbsd.org>2017-05-24 23:59:42 (GMT)
commit1f2c543a0f2f9ea897fd72c7fd625cbf20ccd893 (patch)
tree53030785589f8b91df0a34cfcccf058d4093263b
parentb180bf1b00dca30391562ed623fff01953823766 (diff)
downloadopenbsd-ports-1f2c543a0f2f9ea897fd72c7fd625cbf20ccd893.tar.gz
openbsd-ports-1f2c543a0f2f9ea897fd72c7fd625cbf20ccd893.tar.xz
simple fixes for C++11 (user-defined literals require a space for splicing
string literals together)
-rw-r--r--multimedia/synfigstudio/Makefile8
-rw-r--r--multimedia/synfigstudio/patches/patch-src_gui_dialogs_about_cpp14
-rw-r--r--multimedia/synfigstudio/patches/patch-src_gui_iconcontroller_cpp392
-rw-r--r--multimedia/synfigstudio/patches/patch-src_gui_splash_cpp23
4 files changed, 432 insertions, 5 deletions
diff --git a/multimedia/synfigstudio/Makefile b/multimedia/synfigstudio/Makefile
index 5768f9c..eaae28e 100644
--- a/multimedia/synfigstudio/Makefile
+++ b/multimedia/synfigstudio/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2016/03/07 17:34:44 landry Exp $
+# $OpenBSD: Makefile,v 1.12 2017/05/24 23:59:42 espie Exp $
COMMENT = 2D animation software studio
BROKEN-alpha = [keyframe_lock_past_on_icon.png] Bus error (core dumped)
@@ -30,7 +30,7 @@ WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3 gtkmm-3.0 harfbuzz
WANTLIB += jack jbig jpeg lcms2 ltdl lzma m mlt mlt++ openjp2
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4 pcre
WANTLIB += pixman-1 png pthread pthread-stubs sigc-2.0 synfig
-WANTLIB += tiff webp xcb xcb-render xcb-shm xml++-2.6 xml2 z
+WANTLIB += tiff webp xcb xcb-render xcb-shm xml++-2.6 xml2 z ${LIBECXX}
MASTER_SITES= http://download.tuxfamily.org/synfig/releases/${V}/
@@ -38,9 +38,7 @@ MODULES = devel/gettext \
textproc/intltool
# c++11
-MODULES += gcc4
-MODGCC4_ARCHS= *
-MODGCC4_LANGS= c++
+WANT_CXX = base gcc
BUILD_DEPENDS = devel/etl>=0.04.19
RUN_DEPENDS = devel/desktop-file-utils \
diff --git a/multimedia/synfigstudio/patches/patch-src_gui_dialogs_about_cpp b/multimedia/synfigstudio/patches/patch-src_gui_dialogs_about_cpp
new file mode 100644
index 0000000..11b2712
--- /dev/null
+++ b/multimedia/synfigstudio/patches/patch-src_gui_dialogs_about_cpp
@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_gui_dialogs_about_cpp,v 1.1 2017/05/24 23:59:42 espie Exp $
+
+Index: src/gui/dialogs/about.cpp
+--- src/gui/dialogs/about.cpp.orig
++++ src/gui/dialogs/about.cpp
+@@ -203,7 +203,7 @@ About::About()
+ imagepath+=ETL_DIRECTORY_SEPARATOR;
+
+ Gtk::Image *Logo = manage(new class Gtk::Image());
+- Logo->set(imagepath+"synfig_icon."IMAGE_EXT);
++ Logo->set(imagepath+"synfig_icon." IMAGE_EXT);
+ set_logo(Logo->get_pixbuf());
+
+ #ifdef SHOW_EXTRA_INFO
diff --git a/multimedia/synfigstudio/patches/patch-src_gui_iconcontroller_cpp b/multimedia/synfigstudio/patches/patch-src_gui_iconcontroller_cpp
new file mode 100644
index 0000000..3d5fad9
--- /dev/null
+++ b/multimedia/synfigstudio/patches/patch-src_gui_iconcontroller_cpp
@@ -0,0 +1,392 @@
+$OpenBSD: patch-src_gui_iconcontroller_cpp,v 1.1 2017/05/24 23:59:42 espie Exp $
+
+Index: src/gui/iconcontroller.cpp
+--- src/gui/iconcontroller.cpp.orig
++++ src/gui/iconcontroller.cpp
+@@ -134,213 +134,213 @@ IconController::init_icons(const synfig::String& path_
+ Gtk::Stock::add(stock_##name);
+
+ // Types
+- INIT_STOCK_ICON(type_bool,"type_bool_icon."IMAGE_EXT,_("Bool"));
+- INIT_STOCK_ICON(type_integer,"type_integer_icon."IMAGE_EXT,_("Integer"));
+- INIT_STOCK_ICON(type_angle,"type_angle_icon."IMAGE_EXT,_("Angle"));
+- INIT_STOCK_ICON(type_time,"type_time_icon."IMAGE_EXT,_("Time"));
+- INIT_STOCK_ICON(type_real,"type_real_icon."IMAGE_EXT,_("Real"));
+- INIT_STOCK_ICON(type_vector,"type_vector_icon."IMAGE_EXT,_("Vector"));
+- INIT_STOCK_ICON(type_color,"type_color_icon."IMAGE_EXT,_("Color"));
+- INIT_STOCK_ICON(type_segment,"type_segment_icon."IMAGE_EXT,_("Segment"));
+- INIT_STOCK_ICON(type_blinepoint,"type_splinepoint_icon."IMAGE_EXT,_("Spline Point"));
+- INIT_STOCK_ICON(type_list,"type_list_icon."IMAGE_EXT,_("List"));
+- INIT_STOCK_ICON(type_string,"type_string_icon."IMAGE_EXT,_("String"));
+- INIT_STOCK_ICON(type_canvas,"type_canvas_icon."IMAGE_EXT,_("Canvas"));
+- INIT_STOCK_ICON(type_gradient,"type_gradient_icon."IMAGE_EXT,_("Gradient"))
++ INIT_STOCK_ICON(type_bool,"type_bool_icon." IMAGE_EXT,_("Bool"));
++ INIT_STOCK_ICON(type_integer,"type_integer_icon." IMAGE_EXT,_("Integer"));
++ INIT_STOCK_ICON(type_angle,"type_angle_icon." IMAGE_EXT,_("Angle"));
++ INIT_STOCK_ICON(type_time,"type_time_icon." IMAGE_EXT,_("Time"));
++ INIT_STOCK_ICON(type_real,"type_real_icon." IMAGE_EXT,_("Real"));
++ INIT_STOCK_ICON(type_vector,"type_vector_icon." IMAGE_EXT,_("Vector"));
++ INIT_STOCK_ICON(type_color,"type_color_icon." IMAGE_EXT,_("Color"));
++ INIT_STOCK_ICON(type_segment,"type_segment_icon." IMAGE_EXT,_("Segment"));
++ INIT_STOCK_ICON(type_blinepoint,"type_splinepoint_icon." IMAGE_EXT,_("Spline Point"));
++ INIT_STOCK_ICON(type_list,"type_list_icon." IMAGE_EXT,_("List"));
++ INIT_STOCK_ICON(type_string,"type_string_icon." IMAGE_EXT,_("String"));
++ INIT_STOCK_ICON(type_canvas,"type_canvas_icon." IMAGE_EXT,_("Canvas"));
++ INIT_STOCK_ICON(type_gradient,"type_gradient_icon." IMAGE_EXT,_("Gradient"))
+
+ // ToolBox Tools
+- INIT_STOCK_ICON(normal,"tool_normal_icon."IMAGE_EXT,_("Transform Tool"));
+- INIT_STOCK_ICON(polygon,"tool_polyline_icon."IMAGE_EXT,_("Polygon Tool"));
+- INIT_STOCK_ICON(bline,"tool_spline_icon."IMAGE_EXT,_("Spline Tool"));
+- INIT_STOCK_ICON(eyedrop,"tool_eyedrop_icon."IMAGE_EXT,_("Eyedrop Tool"));
+- INIT_STOCK_ICON(fill,"tool_fill_icon."IMAGE_EXT,_("Fill Tool"));
+- INIT_STOCK_ICON(draw,"tool_draw_icon."IMAGE_EXT,_("Draw Tool"));
+- INIT_STOCK_ICON(lasso,"tool_cutout_icon."IMAGE_EXT,_("Cutout Tool"));
+- INIT_STOCK_ICON(brush,"tool_brush_icon."IMAGE_EXT,_("Brush Tool"));
+- INIT_STOCK_ICON(sketch,"tool_sketch_icon."IMAGE_EXT,_("Sketch Tool"));
+- INIT_STOCK_ICON(circle,"tool_circle_icon."IMAGE_EXT,_("Circle Tool"));
+- INIT_STOCK_ICON(rectangle,"tool_rectangle_icon."IMAGE_EXT,_("Rectangle Tool"));
+- INIT_STOCK_ICON(smooth_move,"tool_smooth_move_icon."IMAGE_EXT,_("SmoothMove Tool"));
+- INIT_STOCK_ICON(rotate,"tool_rotate_icon."IMAGE_EXT,"Rotate Tool");
+- INIT_STOCK_ICON(width,"tool_width_icon."IMAGE_EXT,_("Width Tool"));
+- INIT_STOCK_ICON(scale,"tool_scale_icon."IMAGE_EXT,"Scale Tool");
+- INIT_STOCK_ICON(zoom,"tool_zoom_icon."IMAGE_EXT,_("Zoom Tool"));
+- INIT_STOCK_ICON(mirror,"tool_mirror_icon."IMAGE_EXT,_("Mirror Tool"));
+- INIT_STOCK_ICON(text,"tool_text_icon."IMAGE_EXT,"Text Tool");
+- INIT_STOCK_ICON(gradient,"tool_gradient_icon."IMAGE_EXT,_("Gradient Tool"));
+- INIT_STOCK_ICON(star,"tool_star_icon."IMAGE_EXT,_("Star Tool"));
++ INIT_STOCK_ICON(normal,"tool_normal_icon." IMAGE_EXT,_("Transform Tool"));
++ INIT_STOCK_ICON(polygon,"tool_polyline_icon." IMAGE_EXT,_("Polygon Tool"));
++ INIT_STOCK_ICON(bline,"tool_spline_icon." IMAGE_EXT,_("Spline Tool"));
++ INIT_STOCK_ICON(eyedrop,"tool_eyedrop_icon." IMAGE_EXT,_("Eyedrop Tool"));
++ INIT_STOCK_ICON(fill,"tool_fill_icon." IMAGE_EXT,_("Fill Tool"));
++ INIT_STOCK_ICON(draw,"tool_draw_icon." IMAGE_EXT,_("Draw Tool"));
++ INIT_STOCK_ICON(lasso,"tool_cutout_icon." IMAGE_EXT,_("Cutout Tool"));
++ INIT_STOCK_ICON(brush,"tool_brush_icon." IMAGE_EXT,_("Brush Tool"));
++ INIT_STOCK_ICON(sketch,"tool_sketch_icon." IMAGE_EXT,_("Sketch Tool"));
++ INIT_STOCK_ICON(circle,"tool_circle_icon." IMAGE_EXT,_("Circle Tool"));
++ INIT_STOCK_ICON(rectangle,"tool_rectangle_icon." IMAGE_EXT,_("Rectangle Tool"));
++ INIT_STOCK_ICON(smooth_move,"tool_smooth_move_icon." IMAGE_EXT,_("SmoothMove Tool"));
++ INIT_STOCK_ICON(rotate,"tool_rotate_icon." IMAGE_EXT,"Rotate Tool");
++ INIT_STOCK_ICON(width,"tool_width_icon." IMAGE_EXT,_("Width Tool"));
++ INIT_STOCK_ICON(scale,"tool_scale_icon." IMAGE_EXT,"Scale Tool");
++ INIT_STOCK_ICON(zoom,"tool_zoom_icon." IMAGE_EXT,_("Zoom Tool"));
++ INIT_STOCK_ICON(mirror,"tool_mirror_icon." IMAGE_EXT,_("Mirror Tool"));
++ INIT_STOCK_ICON(text,"tool_text_icon." IMAGE_EXT,"Text Tool");
++ INIT_STOCK_ICON(gradient,"tool_gradient_icon." IMAGE_EXT,_("Gradient Tool"));
++ INIT_STOCK_ICON(star,"tool_star_icon." IMAGE_EXT,_("Star Tool"));
+ // ToolBox Others
+- INIT_STOCK_ICON(reset_colors,"reset_colors_icon."IMAGE_EXT,_("Reset Colors"));
+- INIT_STOCK_ICON(swap_colors,"swap_colors_icon."IMAGE_EXT,_("Swap Colors"));
+- INIT_STOCK_ICON(value_node,"valuenode_icon."IMAGE_EXT,_("ValueNode"));
+- INIT_STOCK_ICON(valuenode_forbidanimation,"valuenode_forbidanimation_icon."IMAGE_EXT,_("ValueNode Forbid Animation"));
+- INIT_STOCK_ICON(rename,"rename_icon."IMAGE_EXT,_("Rename"));
+- INIT_STOCK_ICON(canvas,"canvas_icon."IMAGE_EXT,_("Canvas"));
+- INIT_STOCK_ICON(canvas_new,"canvas_icon."IMAGE_EXT,_("New Canvas"));
++ INIT_STOCK_ICON(reset_colors,"reset_colors_icon." IMAGE_EXT,_("Reset Colors"));
++ INIT_STOCK_ICON(swap_colors,"swap_colors_icon." IMAGE_EXT,_("Swap Colors"));
++ INIT_STOCK_ICON(value_node,"valuenode_icon." IMAGE_EXT,_("ValueNode"));
++ INIT_STOCK_ICON(valuenode_forbidanimation,"valuenode_forbidanimation_icon." IMAGE_EXT,_("ValueNode Forbid Animation"));
++ INIT_STOCK_ICON(rename,"rename_icon." IMAGE_EXT,_("Rename"));
++ INIT_STOCK_ICON(canvas,"canvas_icon." IMAGE_EXT,_("Canvas"));
++ INIT_STOCK_ICON(canvas_new,"canvas_icon." IMAGE_EXT,_("New Canvas"));
+
+ // Document Related Actions
+- INIT_STOCK_ICON(about,"about_icon."IMAGE_EXT,_("About"));
+- INIT_STOCK_ICON(new_doc,"action_doc_new_icon."IMAGE_EXT,_("New"));
+- INIT_STOCK_ICON(open,"action_doc_open_icon."IMAGE_EXT,_("Open"));
+- INIT_STOCK_ICON(save,"action_doc_save_icon."IMAGE_EXT,_("Save"));
+- INIT_STOCK_ICON(save_as,"action_doc_saveas_icon."IMAGE_EXT,_("Save As"));
+- INIT_STOCK_ICON(save_all,"action_doc_saveall_icon."IMAGE_EXT,_("Save All"));
+- INIT_STOCK_ICON(redo,"action_doc_redo_icon."IMAGE_EXT,_("Redo"));
+- INIT_STOCK_ICON(undo,"action_doc_undo_icon."IMAGE_EXT,_("Undo"));
++ INIT_STOCK_ICON(about,"about_icon." IMAGE_EXT,_("About"));
++ INIT_STOCK_ICON(new_doc,"action_doc_new_icon." IMAGE_EXT,_("New"));
++ INIT_STOCK_ICON(open,"action_doc_open_icon." IMAGE_EXT,_("Open"));
++ INIT_STOCK_ICON(save,"action_doc_save_icon." IMAGE_EXT,_("Save"));
++ INIT_STOCK_ICON(save_as,"action_doc_saveas_icon." IMAGE_EXT,_("Save As"));
++ INIT_STOCK_ICON(save_all,"action_doc_saveall_icon." IMAGE_EXT,_("Save All"));
++ INIT_STOCK_ICON(redo,"action_doc_redo_icon." IMAGE_EXT,_("Redo"));
++ INIT_STOCK_ICON(undo,"action_doc_undo_icon." IMAGE_EXT,_("Undo"));
+
+ // Layers
+- INIT_STOCK_ICON(layer,"layer_icon."IMAGE_EXT,_("Layer"));
++ INIT_STOCK_ICON(layer,"layer_icon." IMAGE_EXT,_("Layer"));
+ // Blur Layers
+- INIT_STOCK_ICON(layer_blur_blur,"layer_blur_blur_icon."IMAGE_EXT,_("Blur Layer"));
+- INIT_STOCK_ICON(layer_blur_motion,"layer_blur_motion_icon."IMAGE_EXT,_("Motion Blur Layer"));
+- INIT_STOCK_ICON(layer_blur_radial,"layer_blur_radial_icon."IMAGE_EXT,_("Radial Blur Layer"));
++ INIT_STOCK_ICON(layer_blur_blur,"layer_blur_blur_icon." IMAGE_EXT,_("Blur Layer"));
++ INIT_STOCK_ICON(layer_blur_motion,"layer_blur_motion_icon." IMAGE_EXT,_("Motion Blur Layer"));
++ INIT_STOCK_ICON(layer_blur_radial,"layer_blur_radial_icon." IMAGE_EXT,_("Radial Blur Layer"));
+ // Distortion Layers
+- INIT_STOCK_ICON(layer_distortion_curvewarp,"layer_distortion_curvewarp_icon."IMAGE_EXT,_("Curve Warp Layer"));
+- INIT_STOCK_ICON(layer_distortion_insideout,"layer_distortion_insideout_icon."IMAGE_EXT,_("Inside Out Layer"));
+- INIT_STOCK_ICON(layer_distortion_noise,"layer_distortion_noise_icon."IMAGE_EXT,_("Noise Distort Layer"));
+- INIT_STOCK_ICON(layer_distortion_spherize,"layer_distortion_spherize_icon."IMAGE_EXT,_("Spherize Layer"));
+- INIT_STOCK_ICON(layer_distortion_stretch,"layer_distortion_stretch_icon."IMAGE_EXT,_("Stretch Layer"));
+- INIT_STOCK_ICON(layer_distortion_twirl,"layer_distortion_twirl_icon."IMAGE_EXT,_("Twirl Layer"));
+- INIT_STOCK_ICON(layer_distortion_warp,"layer_distortion_warp_icon."IMAGE_EXT,_("Warp Layer"));
++ INIT_STOCK_ICON(layer_distortion_curvewarp,"layer_distortion_curvewarp_icon." IMAGE_EXT,_("Curve Warp Layer"));
++ INIT_STOCK_ICON(layer_distortion_insideout,"layer_distortion_insideout_icon." IMAGE_EXT,_("Inside Out Layer"));
++ INIT_STOCK_ICON(layer_distortion_noise,"layer_distortion_noise_icon." IMAGE_EXT,_("Noise Distort Layer"));
++ INIT_STOCK_ICON(layer_distortion_spherize,"layer_distortion_spherize_icon." IMAGE_EXT,_("Spherize Layer"));
++ INIT_STOCK_ICON(layer_distortion_stretch,"layer_distortion_stretch_icon." IMAGE_EXT,_("Stretch Layer"));
++ INIT_STOCK_ICON(layer_distortion_twirl,"layer_distortion_twirl_icon." IMAGE_EXT,_("Twirl Layer"));
++ INIT_STOCK_ICON(layer_distortion_warp,"layer_distortion_warp_icon." IMAGE_EXT,_("Warp Layer"));
+ // Example Layers
+- INIT_STOCK_ICON(layer_example_filledrectangle,"layer_example_filledrectangle_icon."IMAGE_EXT,_("Filled Rectangle Layer"));
+- INIT_STOCK_ICON(layer_example_metaballs,"layer_example_metaballs_icon."IMAGE_EXT,_("Metallballs Layer"));
+- INIT_STOCK_ICON(layer_example_simplecircle,"layer_example_simplecircle_icon."IMAGE_EXT,_("Simple Circle Layer"));
++ INIT_STOCK_ICON(layer_example_filledrectangle,"layer_example_filledrectangle_icon." IMAGE_EXT,_("Filled Rectangle Layer"));
++ INIT_STOCK_ICON(layer_example_metaballs,"layer_example_metaballs_icon." IMAGE_EXT,_("Metallballs Layer"));
++ INIT_STOCK_ICON(layer_example_simplecircle,"layer_example_simplecircle_icon." IMAGE_EXT,_("Simple Circle Layer"));
+ // Filter Layers
+- INIT_STOCK_ICON(layer_filter_clamp,"layer_filter_clamp_icon."IMAGE_EXT,_("Clamp Layer"));
+- INIT_STOCK_ICON(layer_filter_colorcorrect,"layer_filter_colorcorrect_icon."IMAGE_EXT,_("Color Correct Layer"));
+- INIT_STOCK_ICON(layer_filter_halftone2,"layer_filter_halftone2_icon."IMAGE_EXT,_("Halftone 2 Layer"));
+- INIT_STOCK_ICON(layer_filter_halftone3,"layer_filter_halftone3_icon."IMAGE_EXT,_("Halftone 3 Layer"));
+- INIT_STOCK_ICON(layer_filter_lumakey,"layer_filter_lumakey_icon."IMAGE_EXT,_("Luma Key Layer"));
++ INIT_STOCK_ICON(layer_filter_clamp,"layer_filter_clamp_icon." IMAGE_EXT,_("Clamp Layer"));
++ INIT_STOCK_ICON(layer_filter_colorcorrect,"layer_filter_colorcorrect_icon." IMAGE_EXT,_("Color Correct Layer"));
++ INIT_STOCK_ICON(layer_filter_halftone2,"layer_filter_halftone2_icon." IMAGE_EXT,_("Halftone 2 Layer"));
++ INIT_STOCK_ICON(layer_filter_halftone3,"layer_filter_halftone3_icon." IMAGE_EXT,_("Halftone 3 Layer"));
++ INIT_STOCK_ICON(layer_filter_lumakey,"layer_filter_lumakey_icon." IMAGE_EXT,_("Luma Key Layer"));
+ // Fractal Layers
+- INIT_STOCK_ICON(layer_fractal_julia,"layer_fractal_julia_icon."IMAGE_EXT,_("Julia Set Layer"));
+- INIT_STOCK_ICON(layer_fractal_mandelbrot,"layer_fractal_mandelbrot_icon."IMAGE_EXT,_("Mandelbrot Set Layer"));
++ INIT_STOCK_ICON(layer_fractal_julia,"layer_fractal_julia_icon." IMAGE_EXT,_("Julia Set Layer"));
++ INIT_STOCK_ICON(layer_fractal_mandelbrot,"layer_fractal_mandelbrot_icon." IMAGE_EXT,_("Mandelbrot Set Layer"));
+ // Geometry Layers
+- INIT_STOCK_ICON(layer_geometry_checkerboard,"layer_geometry_checkerboard_icon."IMAGE_EXT,_("Checker Board Layer"));
+- INIT_STOCK_ICON(layer_geometry_circle,"layer_geometry_circle_icon."IMAGE_EXT,_("Circle Layer"));
+- INIT_STOCK_ICON(layer_geometry_outline,"layer_geometry_outline_icon."IMAGE_EXT,_("Outline Layer"));
+- INIT_STOCK_ICON(layer_geometry_advanced_outline,"layer_geometry_advanced_outline_icon."IMAGE_EXT,_("Advanced Outline Layer"));
+- INIT_STOCK_ICON(layer_geometry_polygon,"layer_geometry_polygon_icon."IMAGE_EXT,_("Polygon Layer"));
+- INIT_STOCK_ICON(layer_geometry_rectangle,"layer_geometry_rectangle_icon."IMAGE_EXT,_("Rectangle Layer"));
+- INIT_STOCK_ICON(layer_geometry_region,"layer_geometry_region_icon."IMAGE_EXT,_("Region Layer"));
+- INIT_STOCK_ICON(layer_geometry_solidcolor,"layer_geometry_solidcolor_icon."IMAGE_EXT,_("Solid Color Layer"));
+- INIT_STOCK_ICON(layer_geometry_star,"layer_geometry_star_icon."IMAGE_EXT,_("Star Layer"));
++ INIT_STOCK_ICON(layer_geometry_checkerboard,"layer_geometry_checkerboard_icon." IMAGE_EXT,_("Checker Board Layer"));
++ INIT_STOCK_ICON(layer_geometry_circle,"layer_geometry_circle_icon." IMAGE_EXT,_("Circle Layer"));
++ INIT_STOCK_ICON(layer_geometry_outline,"layer_geometry_outline_icon." IMAGE_EXT,_("Outline Layer"));
++ INIT_STOCK_ICON(layer_geometry_advanced_outline,"layer_geometry_advanced_outline_icon." IMAGE_EXT,_("Advanced Outline Layer"));
++ INIT_STOCK_ICON(layer_geometry_polygon,"layer_geometry_polygon_icon." IMAGE_EXT,_("Polygon Layer"));
++ INIT_STOCK_ICON(layer_geometry_rectangle,"layer_geometry_rectangle_icon." IMAGE_EXT,_("Rectangle Layer"));
++ INIT_STOCK_ICON(layer_geometry_region,"layer_geometry_region_icon." IMAGE_EXT,_("Region Layer"));
++ INIT_STOCK_ICON(layer_geometry_solidcolor,"layer_geometry_solidcolor_icon." IMAGE_EXT,_("Solid Color Layer"));
++ INIT_STOCK_ICON(layer_geometry_star,"layer_geometry_star_icon." IMAGE_EXT,_("Star Layer"));
+ // Gradient Layers
+- INIT_STOCK_ICON(layer_gradient_conical,"layer_gradient_conical_icon."IMAGE_EXT,_("Conical Gradient Layer"));
+- INIT_STOCK_ICON(layer_gradient_curve,"layer_gradient_curve_icon."IMAGE_EXT,_("Curve Gradient Layer"));
+- INIT_STOCK_ICON(layer_gradient_noise,"layer_gradient_noise_icon."IMAGE_EXT,_("Noise Gradient Layer"));
+- INIT_STOCK_ICON(layer_gradient_linear,"layer_gradient_linear_icon."IMAGE_EXT,_("Linear Gradient Layer"));
+- INIT_STOCK_ICON(layer_gradient_radial,"layer_gradient_radial_icon."IMAGE_EXT,_("Radial Gradient Layer"));
+- INIT_STOCK_ICON(layer_gradient_spiral,"layer_gradient_spiral_icon."IMAGE_EXT,_("Spiral Gradient Layer"));
++ INIT_STOCK_ICON(layer_gradient_conical,"layer_gradient_conical_icon." IMAGE_EXT,_("Conical Gradient Layer"));
++ INIT_STOCK_ICON(layer_gradient_curve,"layer_gradient_curve_icon." IMAGE_EXT,_("Curve Gradient Layer"));
++ INIT_STOCK_ICON(layer_gradient_noise,"layer_gradient_noise_icon." IMAGE_EXT,_("Noise Gradient Layer"));
++ INIT_STOCK_ICON(layer_gradient_linear,"layer_gradient_linear_icon." IMAGE_EXT,_("Linear Gradient Layer"));
++ INIT_STOCK_ICON(layer_gradient_radial,"layer_gradient_radial_icon." IMAGE_EXT,_("Radial Gradient Layer"));
++ INIT_STOCK_ICON(layer_gradient_spiral,"layer_gradient_spiral_icon." IMAGE_EXT,_("Spiral Gradient Layer"));
+ // Other Layers
+- INIT_STOCK_ICON(layer_other_duplicate,"layer_other_duplicate_icon."IMAGE_EXT,_("Duplicate Layer"));
+- INIT_STOCK_ICON(layer_other_importimage,"layer_other_importimage_icon."IMAGE_EXT,_("Import Image Layer"));
+- INIT_STOCK_ICON(layer_other_pastecanvas,"layer_other_group_icon."IMAGE_EXT,_("Group Layer"));
+- INIT_STOCK_ICON(layer_other_plant,"layer_other_plant_icon."IMAGE_EXT,_("Plant Layer"));
+- INIT_STOCK_ICON(layer_other_stroboscope,"layer_other_stroboscope_icon."IMAGE_EXT,_("Stroboscope Layer"));
+- INIT_STOCK_ICON(layer_other_supersample,"layer_other_supersample_icon."IMAGE_EXT,_("Super Sample Layer"));
+- INIT_STOCK_ICON(layer_other_sound,"layer_other_sound_icon."IMAGE_EXT,_("Sound Layer"));
+- INIT_STOCK_ICON(layer_other_switch,"layer_other_switch_icon."IMAGE_EXT,_("Switch Layer"));
+- INIT_STOCK_ICON(layer_other_skeleton,"layer_other_skeleton_icon."IMAGE_EXT,_("Skeleton Layer"));
+- INIT_STOCK_ICON(layer_other_text,"layer_other_text_icon."IMAGE_EXT,_("Text Layer"));
+- INIT_STOCK_ICON(layer_other_timeloop,"layer_other_timeloop_icon."IMAGE_EXT,_("Time Loop Layer"));
+- INIT_STOCK_ICON(layer_other_xorpattern,"layer_other_xorpattern_icon."IMAGE_EXT,_("XOR Pattern Layer"));
++ INIT_STOCK_ICON(layer_other_duplicate,"layer_other_duplicate_icon." IMAGE_EXT,_("Duplicate Layer"));
++ INIT_STOCK_ICON(layer_other_importimage,"layer_other_importimage_icon." IMAGE_EXT,_("Import Image Layer"));
++ INIT_STOCK_ICON(layer_other_pastecanvas,"layer_other_group_icon." IMAGE_EXT,_("Group Layer"));
++ INIT_STOCK_ICON(layer_other_plant,"layer_other_plant_icon." IMAGE_EXT,_("Plant Layer"));
++ INIT_STOCK_ICON(layer_other_stroboscope,"layer_other_stroboscope_icon." IMAGE_EXT,_("Stroboscope Layer"));
++ INIT_STOCK_ICON(layer_other_supersample,"layer_other_supersample_icon." IMAGE_EXT,_("Super Sample Layer"));
++ INIT_STOCK_ICON(layer_other_sound,"layer_other_sound_icon." IMAGE_EXT,_("Sound Layer"));
++ INIT_STOCK_ICON(layer_other_switch,"layer_other_switch_icon." IMAGE_EXT,_("Switch Layer"));
++ INIT_STOCK_ICON(layer_other_skeleton,"layer_other_skeleton_icon." IMAGE_EXT,_("Skeleton Layer"));
++ INIT_STOCK_ICON(layer_other_text,"layer_other_text_icon." IMAGE_EXT,_("Text Layer"));
++ INIT_STOCK_ICON(layer_other_timeloop,"layer_other_timeloop_icon." IMAGE_EXT,_("Time Loop Layer"));
++ INIT_STOCK_ICON(layer_other_xorpattern,"layer_other_xorpattern_icon." IMAGE_EXT,_("XOR Pattern Layer"));
+ // Stylize Layers
+- INIT_STOCK_ICON(layer_stylize_bevel,"layer_stylize_bevel_icon."IMAGE_EXT,_("Bevel Layer"));
+- INIT_STOCK_ICON(layer_stylize_shade,"layer_stylize_shade_icon."IMAGE_EXT,_("Shade Layer"));
++ INIT_STOCK_ICON(layer_stylize_bevel,"layer_stylize_bevel_icon." IMAGE_EXT,_("Bevel Layer"));
++ INIT_STOCK_ICON(layer_stylize_shade,"layer_stylize_shade_icon." IMAGE_EXT,_("Shade Layer"));
+ // Transform Layers
+- INIT_STOCK_ICON(layer_transform_rotate,"layer_transform_rotate_icon."IMAGE_EXT,_("Rotate Layer"));
+- INIT_STOCK_ICON(layer_transform_translate,"layer_transform_translate_icon."IMAGE_EXT,_("Translate Layer"));
+- INIT_STOCK_ICON(layer_transform_scale,"layer_transform_scale_icon."IMAGE_EXT,_("Scale Layer"));
++ INIT_STOCK_ICON(layer_transform_rotate,"layer_transform_rotate_icon." IMAGE_EXT,_("Rotate Layer"));
++ INIT_STOCK_ICON(layer_transform_translate,"layer_transform_translate_icon." IMAGE_EXT,_("Translate Layer"));
++ INIT_STOCK_ICON(layer_transform_scale,"layer_transform_scale_icon." IMAGE_EXT,_("Scale Layer"));
+
+- INIT_STOCK_ICON(info,"info_icon."IMAGE_EXT,_("Info Tool"));
+- INIT_STOCK_ICON(group,"set_icon."IMAGE_EXT,_("Set"));
++ INIT_STOCK_ICON(info,"info_icon." IMAGE_EXT,_("Info Tool"));
++ INIT_STOCK_ICON(group,"set_icon." IMAGE_EXT,_("Set"));
+
+- INIT_STOCK_ICON(grid_enable,"grid_enable_icon."IMAGE_EXT,_("Show Grid"));
+- INIT_STOCK_ICON(grid_disable,"grid_disable_icon."IMAGE_EXT,_("Hide Grid"));
+- INIT_STOCK_ICON(grid_snap_enable,"grid_snap_enable_icon."IMAGE_EXT,_("Enable Grid Snap"));
+- INIT_STOCK_ICON(grid_snap_disable,"grid_snap_disable_icon."IMAGE_EXT,_("Disable Grid Snap"));
+- INIT_STOCK_ICON(duplicate,"duplicate_icon."IMAGE_EXT,_("Duplicate"));
+- INIT_STOCK_ICON(encapsulate,"group_icon."IMAGE_EXT,_("Group"));
+- INIT_STOCK_ICON(select_all_child_layers,"select_all_child_layers_icon."IMAGE_EXT,_("Select All Child Layers"));
++ INIT_STOCK_ICON(grid_enable,"grid_enable_icon." IMAGE_EXT,_("Show Grid"));
++ INIT_STOCK_ICON(grid_disable,"grid_disable_icon." IMAGE_EXT,_("Hide Grid"));
++ INIT_STOCK_ICON(grid_snap_enable,"grid_snap_enable_icon." IMAGE_EXT,_("Enable Grid Snap"));
++ INIT_STOCK_ICON(grid_snap_disable,"grid_snap_disable_icon." IMAGE_EXT,_("Disable Grid Snap"));
++ INIT_STOCK_ICON(duplicate,"duplicate_icon." IMAGE_EXT,_("Duplicate"));
++ INIT_STOCK_ICON(encapsulate,"group_icon." IMAGE_EXT,_("Group"));
++ INIT_STOCK_ICON(select_all_child_layers,"select_all_child_layers_icon." IMAGE_EXT,_("Select All Child Layers"));
+
+- INIT_STOCK_ICON(clear_undo,"clear_undo_icon."IMAGE_EXT,_("Clear Undo Stack"));
+- INIT_STOCK_ICON(clear_redo,"clear_redo_icon."IMAGE_EXT,_("Clear Redo Stack"));
++ INIT_STOCK_ICON(clear_undo,"clear_undo_icon." IMAGE_EXT,_("Clear Undo Stack"));
++ INIT_STOCK_ICON(clear_redo,"clear_redo_icon." IMAGE_EXT,_("Clear Redo Stack"));
+
+- INIT_STOCK_ICON(children,"library_icon."IMAGE_EXT,_("Library"));
+- INIT_STOCK_ICON(curves,"graphs_icon."IMAGE_EXT,_("Graphs"));
+- INIT_STOCK_ICON(keyframes,"keyframe_icon."IMAGE_EXT,_("Keyframes"));
+- INIT_STOCK_ICON(meta_data,"meta_data_icon."IMAGE_EXT,_("MetaData"));
+- INIT_STOCK_ICON(navigator,"navigator_icon."IMAGE_EXT,_("Navigator"));
+- INIT_STOCK_ICON(timetrack,"time_track_icon."IMAGE_EXT,_("Time Track"));
+- INIT_STOCK_ICON(history,"history_icon."IMAGE_EXT,_("History"));
+- INIT_STOCK_ICON(palette,"palette_icon."IMAGE_EXT,_("Palette"));
+- INIT_STOCK_ICON(params,"parameters_icon."IMAGE_EXT,_("Parameters"));
++ INIT_STOCK_ICON(children,"library_icon." IMAGE_EXT,_("Library"));
++ INIT_STOCK_ICON(curves,"graphs_icon." IMAGE_EXT,_("Graphs"));
++ INIT_STOCK_ICON(keyframes,"keyframe_icon." IMAGE_EXT,_("Keyframes"));
++ INIT_STOCK_ICON(meta_data,"meta_data_icon." IMAGE_EXT,_("MetaData"));
++ INIT_STOCK_ICON(navigator,"navigator_icon." IMAGE_EXT,_("Navigator"));
++ INIT_STOCK_ICON(timetrack,"time_track_icon." IMAGE_EXT,_("Time Track"));
++ INIT_STOCK_ICON(history,"history_icon." IMAGE_EXT,_("History"));
++ INIT_STOCK_ICON(palette,"palette_icon." IMAGE_EXT,_("Palette"));
++ INIT_STOCK_ICON(params,"parameters_icon." IMAGE_EXT,_("Parameters"));
+
+- INIT_STOCK_ICON(keyframe_lock_past_off,"keyframe_lock_past_off_icon."IMAGE_EXT,_("Past keyframes unlocked"));
+- INIT_STOCK_ICON(keyframe_lock_past_on,"keyframe_lock_past_on_icon."IMAGE_EXT,_("Past keyframes locked"));
+- INIT_STOCK_ICON(keyframe_lock_future_off,"keyframe_lock_future_off_icon."IMAGE_EXT,_("Future keyframes unlocked"));
+- INIT_STOCK_ICON(keyframe_lock_future_on,"keyframe_lock_future_on_icon."IMAGE_EXT,_("Future keyframes locked"));
++ INIT_STOCK_ICON(keyframe_lock_past_off,"keyframe_lock_past_off_icon." IMAGE_EXT,_("Past keyframes unlocked"));
++ INIT_STOCK_ICON(keyframe_lock_past_on,"keyframe_lock_past_on_icon." IMAGE_EXT,_("Past keyframes locked"));
++ INIT_STOCK_ICON(keyframe_lock_future_off,"keyframe_lock_future_off_icon." IMAGE_EXT,_("Future keyframes unlocked"));
++ INIT_STOCK_ICON(keyframe_lock_future_on,"keyframe_lock_future_on_icon." IMAGE_EXT,_("Future keyframes locked"));
+
+- INIT_STOCK_ICON(animate_mode_off,"animate_mode_off_icon."IMAGE_EXT,_("Animate Mode Off"));
+- INIT_STOCK_ICON(animate_mode_on,"animate_mode_on_icon."IMAGE_EXT,_("Animate Mode On"));
++ INIT_STOCK_ICON(animate_mode_off,"animate_mode_off_icon." IMAGE_EXT,_("Animate Mode Off"));
++ INIT_STOCK_ICON(animate_mode_on,"animate_mode_on_icon." IMAGE_EXT,_("Animate Mode On"));
+
+- INIT_STOCK_ICON(jack, "jack_icon."IMAGE_EXT, _("JACK"));
++ INIT_STOCK_ICON(jack, "jack_icon." IMAGE_EXT, _("JACK"));
+
+- INIT_STOCK_ICON(set_outline_color,"set_outline_color."IMAGE_EXT,_("Set as Outline"));
+- INIT_STOCK_ICON(set_fill_color,"set_fill_color."IMAGE_EXT,_("Set as Fill"));
++ INIT_STOCK_ICON(set_outline_color,"set_outline_color." IMAGE_EXT,_("Set as Outline"));
++ INIT_STOCK_ICON(set_fill_color,"set_fill_color." IMAGE_EXT,_("Set as Fill"));
+
+- INIT_STOCK_ICON(animate_seek_begin,"animate_seek_begin_icon."IMAGE_EXT,_("Seek to Begin"));
+- INIT_STOCK_ICON(animate_seek_prev_keyframe,"animate_seek_prev_keyframe_icon."IMAGE_EXT,_("Seek to Previous Keyframe"));
+- INIT_STOCK_ICON(animate_seek_prev_frame,"animate_seek_prev_frame_icon."IMAGE_EXT,_("Seek to Previous Frame"));
+- INIT_STOCK_ICON(animate_play,"animate_play_icon."IMAGE_EXT,_("Play"));
+- INIT_STOCK_ICON(animate_stop,"animate_stop_icon."IMAGE_EXT,_("Stop"));
+- INIT_STOCK_ICON(animate_pause,"animate_pause_icon."IMAGE_EXT,_("Pause"));
+- INIT_STOCK_ICON(animate_seek_next_frame,"animate_seek_next_frame_icon."IMAGE_EXT,_("Seek to Next frame"));
+- INIT_STOCK_ICON(animate_seek_next_keyframe,"animate_seek_next_keyframe_icon."IMAGE_EXT,_("Seek to Next Keyframe"));
+- INIT_STOCK_ICON(animate_seek_end,"animate_seek_end_icon."IMAGE_EXT,_("Seek to End"));
+- INIT_STOCK_ICON(animate_loop,"animate_loop_icon."IMAGE_EXT,_("Animate Loop"));
++ INIT_STOCK_ICON(animate_seek_begin,"animate_seek_begin_icon." IMAGE_EXT,_("Seek to Begin"));
++ INIT_STOCK_ICON(animate_seek_prev_keyframe,"animate_seek_prev_keyframe_icon." IMAGE_EXT,_("Seek to Previous Keyframe"));
++ INIT_STOCK_ICON(animate_seek_prev_frame,"animate_seek_prev_frame_icon." IMAGE_EXT,_("Seek to Previous Frame"));
++ INIT_STOCK_ICON(animate_play,"animate_play_icon." IMAGE_EXT,_("Play"));
++ INIT_STOCK_ICON(animate_stop,"animate_stop_icon." IMAGE_EXT,_("Stop"));
++ INIT_STOCK_ICON(animate_pause,"animate_pause_icon." IMAGE_EXT,_("Pause"));
++ INIT_STOCK_ICON(animate_seek_next_frame,"animate_seek_next_frame_icon." IMAGE_EXT,_("Seek to Next frame"));
++ INIT_STOCK_ICON(animate_seek_next_keyframe,"animate_seek_next_keyframe_icon." IMAGE_EXT,_("Seek to Next Keyframe"));
++ INIT_STOCK_ICON(animate_seek_end,"animate_seek_end_icon." IMAGE_EXT,_("Seek to End"));
++ INIT_STOCK_ICON(animate_loop,"animate_loop_icon." IMAGE_EXT,_("Animate Loop"));
+
+- INIT_STOCK_ICON(add_to_group,"action_add_to_set_icon."IMAGE_EXT,_("Add Layer to Set"));
+- INIT_STOCK_ICON(remove_from_group,"action_remove_from_set_icon."IMAGE_EXT,_("Remove Layer from Set"));
+- INIT_STOCK_ICON(set_desc,"action_set_layer_description_icon."IMAGE_EXT,_("Set Layer Description"));
+- INIT_STOCK_ICON(export,"action_export_icon."IMAGE_EXT,_("Export Value Node"));
+- INIT_STOCK_ICON(unexport,"action_unexport_icon."IMAGE_EXT,_("Unexport Value Node"));
+- INIT_STOCK_ICON(flat_interpolation,"action_flat_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Flat"));
+- INIT_STOCK_ICON(interpolate_interpolation,"action_interpolate_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Interpolate"));
+- INIT_STOCK_ICON(peak_interpolation,"action_peak_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Peak"));
+- INIT_STOCK_ICON(rounded_interpolation,"action_rounded_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Rounded"));
+- INIT_STOCK_ICON(squared_interpolation,"action_squared_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Squared"));
++ INIT_STOCK_ICON(add_to_group,"action_add_to_set_icon." IMAGE_EXT,_("Add Layer to Set"));
++ INIT_STOCK_ICON(remove_from_group,"action_remove_from_set_icon." IMAGE_EXT,_("Remove Layer from Set"));
++ INIT_STOCK_ICON(set_desc,"action_set_layer_description_icon." IMAGE_EXT,_("Set Layer Description"));
++ INIT_STOCK_ICON(export,"action_export_icon." IMAGE_EXT,_("Export Value Node"));
++ INIT_STOCK_ICON(unexport,"action_unexport_icon." IMAGE_EXT,_("Unexport Value Node"));
++ INIT_STOCK_ICON(flat_interpolation,"action_flat_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Flat"));
++ INIT_STOCK_ICON(interpolate_interpolation,"action_interpolate_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Interpolate"));
++ INIT_STOCK_ICON(peak_interpolation,"action_peak_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Peak"));
++ INIT_STOCK_ICON(rounded_interpolation,"action_rounded_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Rounded"));
++ INIT_STOCK_ICON(squared_interpolation,"action_squared_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Squared"));
+
+- INIT_STOCK_ICON(toggle_duck_position,"duck_position_icon."IMAGE_EXT,_("Toggle position handles"));
+- INIT_STOCK_ICON(toggle_duck_vertex,"duck_vertex_icon."IMAGE_EXT,_("Toggle vertex handles"));
+- INIT_STOCK_ICON(toggle_duck_tangent,"duck_tangent_icon."IMAGE_EXT,_("Toggle tangent handles"));
+- INIT_STOCK_ICON(toggle_duck_radius,"duck_radius_icon."IMAGE_EXT,_("Toggle radius handles"));
+- INIT_STOCK_ICON(toggle_duck_width,"duck_width_icon."IMAGE_EXT,_("Toggle width handles"));
+- INIT_STOCK_ICON(toggle_duck_angle,"duck_angle_icon."IMAGE_EXT,_("Toggle angle handles"));
++ INIT_STOCK_ICON(toggle_duck_position,"duck_position_icon." IMAGE_EXT,_("Toggle position handles"));
++ INIT_STOCK_ICON(toggle_duck_vertex,"duck_vertex_icon." IMAGE_EXT,_("Toggle vertex handles"));
++ INIT_STOCK_ICON(toggle_duck_tangent,"duck_tangent_icon." IMAGE_EXT,_("Toggle tangent handles"));
++ INIT_STOCK_ICON(toggle_duck_radius,"duck_radius_icon." IMAGE_EXT,_("Toggle radius handles"));
++ INIT_STOCK_ICON(toggle_duck_width,"duck_width_icon." IMAGE_EXT,_("Toggle width handles"));
++ INIT_STOCK_ICON(toggle_duck_angle,"duck_angle_icon." IMAGE_EXT,_("Toggle angle handles"));
+
+- INIT_STOCK_ICON(toggle_show_grid,"show_grid_icon."IMAGE_EXT,_("Toggle show grid"));
+- INIT_STOCK_ICON(toggle_snap_grid,"snap_grid_icon."IMAGE_EXT,_("Toggle snap grid"));
+- INIT_STOCK_ICON(toggle_show_guide,"show_guide_icon."IMAGE_EXT,_("Toggle show guide"));
+- INIT_STOCK_ICON(toggle_snap_guide,"snap_guide_icon."IMAGE_EXT,_("Toggle snap guide"));
++ INIT_STOCK_ICON(toggle_show_grid,"show_grid_icon." IMAGE_EXT,_("Toggle show grid"));
++ INIT_STOCK_ICON(toggle_snap_grid,"snap_grid_icon." IMAGE_EXT,_("Toggle snap grid"));
++ INIT_STOCK_ICON(toggle_show_guide,"show_guide_icon." IMAGE_EXT,_("Toggle show guide"));
++ INIT_STOCK_ICON(toggle_snap_guide,"snap_guide_icon." IMAGE_EXT,_("Toggle snap guide"));
+
+- INIT_STOCK_ICON(toggle_onion_skin,"onion_skin_icon."IMAGE_EXT,_("Toggle onion skin"));
++ INIT_STOCK_ICON(toggle_onion_skin,"onion_skin_icon." IMAGE_EXT,_("Toggle onion skin"));
+
+- INIT_STOCK_ICON(increase_resolution,"incr_resolution_icon."IMAGE_EXT,_("Increase resolution"));
+- INIT_STOCK_ICON(decrease_resolution,"decr_resolution_icon."IMAGE_EXT,_("Decrease resolution"));
++ INIT_STOCK_ICON(increase_resolution,"incr_resolution_icon." IMAGE_EXT,_("Increase resolution"));
++ INIT_STOCK_ICON(decrease_resolution,"decr_resolution_icon." IMAGE_EXT,_("Decrease resolution"));
+
+- INIT_STOCK_ICON(preview_options,"preview_options_icon."IMAGE_EXT,_("Preview Options Dialog"));
+- INIT_STOCK_ICON(render_options,"render_options_icon."IMAGE_EXT,_("Render Options Dialog"));
++ INIT_STOCK_ICON(preview_options,"preview_options_icon." IMAGE_EXT,_("Preview Options Dialog"));
++ INIT_STOCK_ICON(render_options,"render_options_icon." IMAGE_EXT,_("Render Options Dialog"));
+
+- INIT_STOCK_ICON(interpolation_type_tcb,"interpolation_type_tcb_icon."IMAGE_EXT,_("TCB interpolation"));
+- INIT_STOCK_ICON(interpolation_type_ease,"interpolation_type_ease_icon."IMAGE_EXT,_("Ease In/Out interpolation"));
+- INIT_STOCK_ICON(interpolation_type_const,"interpolation_type_const_icon."IMAGE_EXT,_("Const interpolation"));
+- INIT_STOCK_ICON(interpolation_type_linear,"interpolation_type_linear_icon."IMAGE_EXT,_("Linear interpolation"));
+- INIT_STOCK_ICON(interpolation_type_clamped,"interpolation_type_clamped_icon."IMAGE_EXT,_("Clamped interpolation"));
++ INIT_STOCK_ICON(interpolation_type_tcb,"interpolation_type_tcb_icon." IMAGE_EXT,_("TCB interpolation"));
++ INIT_STOCK_ICON(interpolation_type_ease,"interpolation_type_ease_icon." IMAGE_EXT,_("Ease In/Out interpolation"));
++ INIT_STOCK_ICON(interpolation_type_const,"interpolation_type_const_icon." IMAGE_EXT,_("Const interpolation"));
++ INIT_STOCK_ICON(interpolation_type_linear,"interpolation_type_linear_icon." IMAGE_EXT,_("Linear interpolation"));
++ INIT_STOCK_ICON(interpolation_type_clamped,"interpolation_type_clamped_icon." IMAGE_EXT,_("Clamped interpolation"));
+
+- INIT_STOCK_ICON(utils_chain_link_on,"utils_chain_link_on_icon."IMAGE_EXT,_("Linked"));
+- INIT_STOCK_ICON(utils_chain_link_off,"utils_chain_link_off_icon."IMAGE_EXT,_("Unlinked"));
+- INIT_STOCK_ICON(utils_timetrack_align,"utils_timetrack_align_icon."IMAGE_EXT,"Utils Timetrack align");
++ INIT_STOCK_ICON(utils_chain_link_on,"utils_chain_link_on_icon." IMAGE_EXT,_("Linked"));
++ INIT_STOCK_ICON(utils_chain_link_off,"utils_chain_link_off_icon." IMAGE_EXT,_("Unlinked"));
++ INIT_STOCK_ICON(utils_timetrack_align,"utils_timetrack_align_icon." IMAGE_EXT,"Utils Timetrack align");
+
+ INIT_STOCK_ICON_CLONE(cvs_add,"gtk-add",_("CVS Add"));
+ INIT_STOCK_ICON_CLONE(cvs_update,"gtk-open",_("CVS Update"));
diff --git a/multimedia/synfigstudio/patches/patch-src_gui_splash_cpp b/multimedia/synfigstudio/patches/patch-src_gui_splash_cpp
new file mode 100644
index 0000000..c6d13ab
--- /dev/null
+++ b/multimedia/synfigstudio/patches/patch-src_gui_splash_cpp
@@ -0,0 +1,23 @@
+$OpenBSD: patch-src_gui_splash_cpp,v 1.1 2017/05/24 23:59:42 espie Exp $
+
+Index: src/gui/splash.cpp
+--- src/gui/splash.cpp.orig
++++ src/gui/splash.cpp
+@@ -187,7 +187,7 @@ Splash::Splash():
+ //synfig::info("%s", strprintf("%d",number).c_str());
+ splash_image->set(imagepath+"splash_screen"+strprintf("%d",number)+"."IMAGE_EXT);
+ */
+- splash_image->set(imagepath+"splash_screen."IMAGE_EXT);
++ splash_image->set(imagepath+"splash_screen." IMAGE_EXT);
+ splash_image->set_alignment(0.5,0.5);
+ splash_image->set_padding(0,0);
+
+@@ -220,7 +220,7 @@ Splash::Splash():
+ frame->add(*fixed);
+
+ // Set up the parameters for this pop-up window
+- set_title("Synfig Studio "VERSION);
++ set_title("Synfig Studio " VERSION);
+ set_modal(false);
+ property_window_position().set_value(Gtk::WIN_POS_CENTER);
+ set_resizable(false);