On Mon Dec 04, 2017 at 10:29:03PM +0100, Rafael Sadowski wrote:
> Hi all,
> 
> please find blow a straightforward update to synfigstudio and all direct
> dependencies. Synfigstudio will not build with upcoming boost and an
> update is easier than patch.
> 
> I'd like to see it soon in the tree to go forward with my boost update.
> 
> Comments? Test? Oks?
> 
> Works fine here with current bosst and upcoming on amd64.
> 

Please find below a new diff after gettext note from landry@

Additional changes:

* Add USE_GMAKE in synfig as well as in synfigstudio to fix
  translations.
* Remove CXXFLAGS="-std=c++11" in synfig (No longer necessary)
* Remove CXXFLAGS+=-O1 -std=c++11 in synfig. synfigstudio builds fine
  with clang and -02.

ok?


Index: devel/etl/Makefile
===================================================================
RCS file: /cvs/ports/devel/etl/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- devel/etl/Makefile  2 Dec 2017 21:39:49 -0000       1.5
+++ devel/etl/Makefile  7 Dec 2017 13:58:05 -0000
@@ -2,21 +2,18 @@
 
 COMMENT =              C++ class and template library
 
-V =                    0.04.19
+V =                    1.2.1
 DISTNAME =             ETL-${V}
 PKGNAME =              etl-${V}
-# Keep in sync with multimedia/synfig
-SYNFIG_V =             1.0.1
-REVISION =             0
 
 CATEGORIES =           devel
 
-HOMEPAGE =             http://www.synfig.org/
+HOMEPAGE =             https://www.synfig.org/
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM = Yes
 
-MASTER_SITES=          
https://download.tuxfamily.org/synfig/releases/${SYNFIG_V}/
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=synfig/}
 
 CONFIGURE_STYLE =      gnu
 
Index: devel/etl/distinfo
===================================================================
RCS file: /cvs/ports/devel/etl/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- devel/etl/distinfo  21 Sep 2015 16:58:21 -0000      1.3
+++ devel/etl/distinfo  7 Dec 2017 13:58:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (ETL-0.04.19.tar.gz) = IWlogfqxuaNFiqp3qLEMiZwpey0TLj7Uz7f/opzYuP4=
-SIZE (ETL-0.04.19.tar.gz) = 371439
+SHA256 (ETL-1.2.1.tar.gz) = dU2Ixd3971TyfR4X9iqQLrnwn75++a697TRUG0wXAOY=
+SIZE (ETL-1.2.1.tar.gz) = 373906
Index: multimedia/synfig/Makefile
===================================================================
RCS file: /cvs/ports/multimedia/synfig/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- multimedia/synfig/Makefile  2 Dec 2017 21:39:49 -0000       1.21
+++ multimedia/synfig/Makefile  7 Dec 2017 13:58:13 -0000
@@ -1,38 +1,40 @@
 # $OpenBSD: Makefile,v 1.21 2017/12/02 21:39:49 juanfra Exp $
 
 COMMENT =              2D animation software
-REVISION =             9
 
-V=                     1.0.1
+V=                     1.2.1
 DISTNAME =             synfig-$V
 API_V =                        1.0
 
-SHARED_LIBS +=  synfig                    1.0 # 0.0
+SHARED_LIBS +=  synfig                    2.0 # 0.0
 
 CATEGORIES =           multimedia
 
-HOMEPAGE =             http://www.synfig.org/
+HOMEPAGE =             https://www.synfig.org/
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += Half ICE Iex IexMath IlmImf IlmThread Imath Magick++-6.Q16
-WANTLIB += MagickCore-6.Q16 MagickWand-6.Q16 SM X11 Xext Xrender
-WANTLIB += Xt boost_chrono-mt boost_filesystem boost_program_options-mt
-WANTLIB += boost_system bz2 c cairo djvulibre expat ffi fftw3
-WANTLIB += fontconfig freetype gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4
-WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 harfbuzz iconv intl
-WANTLIB += jbig jpeg lcms2 ltdl lzma m mlt mlt++ mng openjp2 pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
-WANTLIB += sigc-2.0 tiff webp xcb xcb-render xcb-shm
-WANTLIB += xml++-2.6 xml2 z boost_system-mt lcms ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} Half ICE Iex IexMath IlmImf IlmThread
+WANTLIB += Imath Magick++-6.Q16 MagickCore-6.Q16 MagickWand-6.Q16
+WANTLIB += SM X11 Xext Xrender Xt boost_chrono-mt boost_filesystem
+WANTLIB += boost_program_options-mt boost_system boost_system-mt
+WANTLIB += bz2 c cairo djvulibre expat ffi fftw3 fontconfig freetype
+WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0
+WANTLIB += graphite2 gthread-2.0 harfbuzz iconv intl jasper jbig
+WANTLIB += jpeg lcms lcms2 ltdl lzma m mlt mlt++ mng openjp2 pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png png16
+WANTLIB += raw_r sigc-2.0 tiff webp xcb xcb-render xcb-shm xml++-2.6
+WANTLIB += xml2 z
 
-MASTER_SITES=          https://download.tuxfamily.org/synfig/releases/${V}/
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=synfig/}
 
 # c++11
 COMPILER =             base-clang ports-gcc
 
-BUILD_DEPENDS =                devel/etl>=0.04.19
+BUILD_DEPENDS =                devel/etl>=1.2.1 \
+                       devel/gettext-tools
+
 LIB_DEPENDS =          archivers/xz \
                        devel/boost \
                        devel/libtool,-ltdl \
@@ -40,16 +42,20 @@ LIB_DEPENDS =               archivers/xz \
                        graphics/ImageMagick \
                        graphics/libmng \
                        graphics/openexr \
+                       graphics/libraw \
+                       graphics/jasper \
+                       graphics/png \
                        multimedia/mlt \
                        textproc/libxml++
 
-# XXX crash during multimedia/synfigstudio build with default -O2
-CXXFLAGS+=             -O1 -std=c++11
+USE_GMAKE =            Yes
+
 CONFIGURE_ENV =                CPPFLAGS="-I${LOCALBASE}/include" \
                        LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_STYLE =      autoconf
 AUTOCONF_VERSION =     2.69
-CONFIGURE_ARGS =       --without-included-ltdl
+CONFIGURE_ARGS =       --without-included-ltdl \
+                       --disable-static
 
 FAKE_FLAGS =           sysconfdir=${PREFIX}/share/examples/synfig
 
@@ -57,8 +63,5 @@ SUBST_VARS +=         API_V
 
 pre-configure:
        ${SUBST_CMD} ${WRKDIST}/src/synfig/main.cpp
-
-post-install:
-       rm ${PREFIX}/lib/synfig/modules/*.{a,la}
 
 .include <bsd.port.mk>
Index: multimedia/synfig/distinfo
===================================================================
RCS file: /cvs/ports/multimedia/synfig/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- multimedia/synfig/distinfo  21 Sep 2015 16:58:37 -0000      1.2
+++ multimedia/synfig/distinfo  7 Dec 2017 13:58:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (synfig-1.0.1.tar.gz) = I4br/fvWj0bCXpARkoy+zlJc5MGaY2fIE0O3X3kXLlA=
-SIZE (synfig-1.0.1.tar.gz) = 4570667
+SHA256 (synfig-1.2.1.tar.gz) = TYutpOmfBe4WtCVvw/WlUdAKdFNHlEg3u9b6FYtX5Fc=
+SIZE (synfig-1.2.1.tar.gz) = 4913740
Index: multimedia/synfig/patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/multimedia/synfig/patches/patch-configure_ac,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-configure_ac
--- multimedia/synfig/patches/patch-configure_ac        24 Jul 2017 17:11:22 
-0000      1.1
+++ multimedia/synfig/patches/patch-configure_ac        7 Dec 2017 13:58:13 
-0000
@@ -5,7 +5,7 @@ Don't override CXXFLAGS optimisation lev
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
-@@ -46,7 +46,6 @@ AC_C_BIGENDIAN
+@@ -47,7 +47,6 @@ AC_C_BIGENDIAN
  
  # -- A R G U M E N T S ----------------------------------------
  
Index: multimedia/synfig/patches/patch-src_synfig_main_cpp
===================================================================
RCS file: multimedia/synfig/patches/patch-src_synfig_main_cpp
diff -N multimedia/synfig/patches/patch-src_synfig_main_cpp
--- multimedia/synfig/patches/patch-src_synfig_main_cpp 24 May 2017 21:27:45 
-0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-src_synfig_main_cpp,v 1.3 2017/05/24 21:27:45 espie Exp $
-Index: src/synfig/main.cpp
---- src/synfig/main.cpp.orig
-+++ src/synfig/main.cpp
-@@ -289,14 +289,14 @@ synfig::Main::Main(const synfig::String& basepath,Prog
-               locations.push_back(getenv("SYNFIG_MODULE_LIST"));
-       else
-       {
--              locations.push_back("./"MODULE_LIST_FILENAME);
-+              locations.push_back("./" MODULE_LIST_FILENAME);
-               if(getenv("HOME"))
-                       
locations.push_back(strprintf("%s/.local/share/synfig/%s", getenv("HOME"), 
MODULE_LIST_FILENAME));
-       #ifdef SYSCONFDIR
--              locations.push_back(SYSCONFDIR"/"MODULE_LIST_FILENAME);
-+              locations.push_back(SYSCONFDIR "/" MODULE_LIST_FILENAME);
-       #endif
-               
locations.push_back(prefix+ETL_DIRECTORY_SEPARATOR+"etc"+ETL_DIRECTORY_SEPARATOR+MODULE_LIST_FILENAME);
--              locations.push_back("/usr/local/etc/"MODULE_LIST_FILENAME);
-+              locations.push_back("/usr/local/etc/" MODULE_LIST_FILENAME);
-       #ifdef __APPLE__
-               
locations.push_back("/Library/Frameworks/synfig.framework/Resources/"MODULE_LIST_FILENAME);
-               locations.push_back("/Library/Synfig/"MODULE_LIST_FILENAME);
-@@ -458,6 +458,10 @@ synfig::get_binary_path(const String &fallback_path)
-       result = String(path);
-       
-       free(path);
-+
-+#elif defined(__OpenBSD__)
-+
-+      result = String("${PREFIX}/bin/synfig");
- 
- #elif defined(__APPLE__)
-       
Index: multimedia/synfig/patches/patch-src_synfig_zstreambuf_cpp
===================================================================
RCS file: multimedia/synfig/patches/patch-src_synfig_zstreambuf_cpp
diff -N multimedia/synfig/patches/patch-src_synfig_zstreambuf_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ multimedia/synfig/patches/patch-src_synfig_zstreambuf_cpp   7 Dec 2017 
13:58:13 -0000
@@ -0,0 +1,41 @@
+$OpenBSD$
+Base zlib don't provide z_const.
+Index: src/synfig/zstreambuf.cpp
+--- src/synfig/zstreambuf.cpp.orig
++++ src/synfig/zstreambuf.cpp
+@@ -74,7 +74,7 @@ bool zstreambuf::pack(std::vector<char> &dest, const v
+       )) return false;
+ 
+       stream.avail_in = size;
+-      stream.next_in = (z_const Bytef*)src;
++      stream.next_in = ( Bytef*)src;
+       bool result = true;
+       do
+       {
+@@ -104,7 +104,7 @@ size_t zstreambuf::pack(void *dest, size_t dest_size, 
+       )) return 0;
+ 
+       stream.avail_in = src_size;
+-      stream.next_in = (z_const Bytef*)src;
++      stream.next_in = ( Bytef*)src;
+       stream.avail_out = dest_size;
+       stream.next_out = (Bytef*)dest;
+       size_t size = 0;
+@@ -120,7 +120,7 @@ bool zstreambuf::unpack(std::vector<char> &dest, const
+       if (Z_OK != inflateInit2(&stream, option_window_bits )) return false;
+ 
+       stream.avail_in = size;
+-      stream.next_in = (z_const Bytef*)src;
++      stream.next_in = ( Bytef*)src;
+       bool result = true;
+       do
+       {
+@@ -144,7 +144,7 @@ size_t zstreambuf::unpack(void *dest, size_t dest_size
+       if (Z_OK != inflateInit2(&stream, option_window_bits )) return 0;
+ 
+       stream.avail_in = src_size;
+-      stream.next_in = (z_const Bytef*)src;
++      stream.next_in = ( Bytef*)src;
+       stream.avail_out = dest_size;
+       stream.next_out = (Bytef*)dest;
+       size_t size = 0;
Index: multimedia/synfig/pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/synfig/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- multimedia/synfig/pkg/PLIST 21 Sep 2015 16:58:37 -0000      1.3
+++ multimedia/synfig/pkg/PLIST 7 Dec 2017 13:58:13 -0000
@@ -16,6 +16,7 @@ include/synfig-${API_V}/synfig/cairoimpo
 include/synfig-${API_V}/synfig/cairolistimporter.h
 include/synfig-${API_V}/synfig/canvas.h
 include/synfig-${API_V}/synfig/canvasbase.h
+include/synfig-${API_V}/synfig/canvasfilenaming.h
 include/synfig-${API_V}/synfig/color/
 include/synfig-${API_V}/synfig/color.h
 include/synfig-${API_V}/synfig/color/cairocolor.h
@@ -23,20 +24,26 @@ include/synfig-${API_V}/synfig/color/cai
 include/synfig-${API_V}/synfig/color/color.h
 include/synfig-${API_V}/synfig/color/color.hpp
 include/synfig-${API_V}/synfig/color/coloraccumulator.h
+include/synfig-${API_V}/synfig/color/colormatrix.h
 include/synfig-${API_V}/synfig/color/common.h
 include/synfig-${API_V}/synfig/color/pixelformat.h
+include/synfig-${API_V}/synfig/complex.h
 include/synfig-${API_V}/synfig/context.h
 include/synfig-${API_V}/synfig/curve_helper.h
 include/synfig-${API_V}/synfig/curveset.h
 include/synfig-${API_V}/synfig/dashitem.h
+include/synfig-${API_V}/synfig/debug/
+include/synfig-${API_V}/synfig/debug/debugsurface.h
+include/synfig-${API_V}/synfig/debug/log.h
+include/synfig-${API_V}/synfig/debug/measure.h
 include/synfig-${API_V}/synfig/distance.h
 include/synfig-${API_V}/synfig/exception.h
 include/synfig-${API_V}/synfig/filecontainer.h
-include/synfig-${API_V}/synfig/filecontainertemporary.h
 include/synfig-${API_V}/synfig/filecontainerzip.h
 include/synfig-${API_V}/synfig/filesystem.h
 include/synfig-${API_V}/synfig/filesystemgroup.h
 include/synfig-${API_V}/synfig/filesystemnative.h
+include/synfig-${API_V}/synfig/filesystemtemporary.h
 include/synfig-${API_V}/synfig/gamma.h
 include/synfig-${API_V}/synfig/general.h
 include/synfig-${API_V}/synfig/gradient.h
@@ -49,13 +56,16 @@ include/synfig-${API_V}/synfig/layer.h
 include/synfig-${API_V}/synfig/layers/
 include/synfig-${API_V}/synfig/layers/layer_bitmap.h
 include/synfig-${API_V}/synfig/layers/layer_composite.h
+include/synfig-${API_V}/synfig/layers/layer_composite_fork.h
 include/synfig-${API_V}/synfig/layers/layer_duplicate.h
 include/synfig-${API_V}/synfig/layers/layer_group.h
+include/synfig-${API_V}/synfig/layers/layer_invisible.h
 include/synfig-${API_V}/synfig/layers/layer_meshtransform.h
 include/synfig-${API_V}/synfig/layers/layer_mime.h
 include/synfig-${API_V}/synfig/layers/layer_motionblur.h
 include/synfig-${API_V}/synfig/layers/layer_pastecanvas.h
 include/synfig-${API_V}/synfig/layers/layer_polygon.h
+include/synfig-${API_V}/synfig/layers/layer_rendering_task.h
 include/synfig-${API_V}/synfig/layers/layer_shape.h
 include/synfig-${API_V}/synfig/layers/layer_skeleton.h
 include/synfig-${API_V}/synfig/layers/layer_skeletondeformation.h
@@ -64,6 +74,7 @@ include/synfig-${API_V}/synfig/layers/la
 include/synfig-${API_V}/synfig/layers/layer_switch.h
 include/synfig-${API_V}/synfig/listimporter.h
 include/synfig-${API_V}/synfig/loadcanvas.h
+include/synfig-${API_V}/synfig/localization.h
 include/synfig-${API_V}/synfig/main.h
 include/synfig-${API_V}/synfig/matrix.h
 include/synfig-${API_V}/synfig/mesh.h
@@ -75,6 +86,7 @@ include/synfig-${API_V}/synfig/palette.h
 include/synfig-${API_V}/synfig/paramdesc.h
 include/synfig-${API_V}/synfig/polygon.h
 include/synfig-${API_V}/synfig/polynomial_root.h
+include/synfig-${API_V}/synfig/progresscallback.h
 include/synfig-${API_V}/synfig/protocol.h
 include/synfig-${API_V}/synfig/quick_rng.h
 include/synfig-${API_V}/synfig/real.h
@@ -82,8 +94,96 @@ include/synfig-${API_V}/synfig/rect.h
 include/synfig-${API_V}/synfig/releases.h
 include/synfig-${API_V}/synfig/renddesc.h
 include/synfig-${API_V}/synfig/render.h
-include/synfig-${API_V}/synfig/renderer.h
-include/synfig-${API_V}/synfig/renderersoftware.h
+include/synfig-${API_V}/synfig/rendering/
+include/synfig-${API_V}/synfig/rendering/common/
+include/synfig-${API_V}/synfig/rendering/common/optimizer/
+include/synfig-${API_V}/synfig/rendering/common/optimizer/optimizerblendassociative.h
+include/synfig-${API_V}/synfig/rendering/common/optimizer/optimizerblendblend.h
+include/synfig-${API_V}/synfig/rendering/common/optimizer/optimizerblendcomposite.h
+include/synfig-${API_V}/synfig/rendering/common/optimizer/optimizerblendseparate.h
+include/synfig-${API_V}/synfig/rendering/common/optimizer/optimizerblendsplit.h
+include/synfig-${API_V}/synfig/rendering/common/optimizer/optimizerblendzero.h
+include/synfig-${API_V}/synfig/rendering/common/optimizer/optimizercalcbounds.h
+include/synfig-${API_V}/synfig/rendering/common/optimizer/optimizerlinear.h
+include/synfig-${API_V}/synfig/rendering/common/optimizer/optimizerlist.h
+include/synfig-${API_V}/synfig/rendering/common/optimizer/optimizerpixelprocessorsplit.h
+include/synfig-${API_V}/synfig/rendering/common/optimizer/optimizersplit.h
+include/synfig-${API_V}/synfig/rendering/common/optimizer/optimizersurface.h
+include/synfig-${API_V}/synfig/rendering/common/optimizer/optimizersurfaceconvert.h
+include/synfig-${API_V}/synfig/rendering/common/optimizer/optimizersurfacecreate.h
+include/synfig-${API_V}/synfig/rendering/common/optimizer/optimizersurfacedestroy.h
+include/synfig-${API_V}/synfig/rendering/common/optimizer/optimizersurfaceresample.h
+include/synfig-${API_V}/synfig/rendering/common/optimizer/optimizertransformation.h
+include/synfig-${API_V}/synfig/rendering/common/optimizer/optimizertransformationaffine.h
+include/synfig-${API_V}/synfig/rendering/common/surfacememoryreadwrapper.h
+include/synfig-${API_V}/synfig/rendering/common/task/
+include/synfig-${API_V}/synfig/rendering/common/task/taskblend.h
+include/synfig-${API_V}/synfig/rendering/common/task/taskblur.h
+include/synfig-${API_V}/synfig/rendering/common/task/taskcallback.h
+include/synfig-${API_V}/synfig/rendering/common/task/taskcomposite.h
+include/synfig-${API_V}/synfig/rendering/common/task/taskcontour.h
+include/synfig-${API_V}/synfig/rendering/common/task/tasklayer.h
+include/synfig-${API_V}/synfig/rendering/common/task/tasklist.h
+include/synfig-${API_V}/synfig/rendering/common/task/taskmesh.h
+include/synfig-${API_V}/synfig/rendering/common/task/taskpixelcolormatrix.h
+include/synfig-${API_V}/synfig/rendering/common/task/taskpixelgamma.h
+include/synfig-${API_V}/synfig/rendering/common/task/taskpixelprocessor.h
+include/synfig-${API_V}/synfig/rendering/common/task/tasksolid.h
+include/synfig-${API_V}/synfig/rendering/common/task/tasksplittable.h
+include/synfig-${API_V}/synfig/rendering/common/task/tasksurface.h
+include/synfig-${API_V}/synfig/rendering/common/task/tasksurfaceconvert.h
+include/synfig-${API_V}/synfig/rendering/common/task/tasksurfacecreate.h
+include/synfig-${API_V}/synfig/rendering/common/task/tasksurfacedestroy.h
+include/synfig-${API_V}/synfig/rendering/common/task/tasksurfaceempty.h
+include/synfig-${API_V}/synfig/rendering/common/task/tasksurfaceresample.h
+include/synfig-${API_V}/synfig/rendering/common/task/tasktransformableaffine.h
+include/synfig-${API_V}/synfig/rendering/common/task/tasktransformation.h
+include/synfig-${API_V}/synfig/rendering/common/task/tasktransformationpass.h
+include/synfig-${API_V}/synfig/rendering/optimizer.h
+include/synfig-${API_V}/synfig/rendering/primitive/
+include/synfig-${API_V}/synfig/rendering/primitive/affinetransformation.h
+include/synfig-${API_V}/synfig/rendering/primitive/blur.h
+include/synfig-${API_V}/synfig/rendering/primitive/contour.h
+include/synfig-${API_V}/synfig/rendering/primitive/mesh.h
+include/synfig-${API_V}/synfig/rendering/primitive/polyspan.h
+include/synfig-${API_V}/synfig/rendering/primitive/transformation.h
+include/synfig-${API_V}/synfig/rendering/renderer.h
+include/synfig-${API_V}/synfig/rendering/renderqueue.h
+include/synfig-${API_V}/synfig/rendering/resource.h
+include/synfig-${API_V}/synfig/rendering/software/
+include/synfig-${API_V}/synfig/rendering/software/function/
+include/synfig-${API_V}/synfig/rendering/software/function/array.h
+include/synfig-${API_V}/synfig/rendering/software/function/blur.h
+include/synfig-${API_V}/synfig/rendering/software/function/blurtemplates.h
+include/synfig-${API_V}/synfig/rendering/software/function/contour.h
+include/synfig-${API_V}/synfig/rendering/software/function/fft.h
+include/synfig-${API_V}/synfig/rendering/software/function/packedsurface.h
+include/synfig-${API_V}/synfig/rendering/software/optimizer/
+include/synfig-${API_V}/synfig/rendering/software/optimizer/optimizerblendsw.h
+include/synfig-${API_V}/synfig/rendering/software/optimizer/optimizerblursw.h
+include/synfig-${API_V}/synfig/rendering/software/optimizer/optimizercontoursw.h
+include/synfig-${API_V}/synfig/rendering/software/optimizer/optimizerlayersw.h
+include/synfig-${API_V}/synfig/rendering/software/optimizer/optimizermeshsw.h
+include/synfig-${API_V}/synfig/rendering/software/optimizer/optimizerpixelcolormatrixsw.h
+include/synfig-${API_V}/synfig/rendering/software/optimizer/optimizerpixelgammasw.h
+include/synfig-${API_V}/synfig/rendering/software/optimizer/optimizersurfaceresamplesw.h
+include/synfig-${API_V}/synfig/rendering/software/renderersafe.h
+include/synfig-${API_V}/synfig/rendering/software/renderersw.h
+include/synfig-${API_V}/synfig/rendering/software/surfacesw.h
+include/synfig-${API_V}/synfig/rendering/software/surfaceswpacked.h
+include/synfig-${API_V}/synfig/rendering/software/task/
+include/synfig-${API_V}/synfig/rendering/software/task/taskblendsw.h
+include/synfig-${API_V}/synfig/rendering/software/task/taskblursw.h
+include/synfig-${API_V}/synfig/rendering/software/task/taskcontoursw.h
+include/synfig-${API_V}/synfig/rendering/software/task/taskexpandsurfacesw.h
+include/synfig-${API_V}/synfig/rendering/software/task/tasklayersw.h
+include/synfig-${API_V}/synfig/rendering/software/task/taskmeshsw.h
+include/synfig-${API_V}/synfig/rendering/software/task/taskpixelcolormatrixsw.h
+include/synfig-${API_V}/synfig/rendering/software/task/taskpixelgammasw.h
+include/synfig-${API_V}/synfig/rendering/software/task/tasksurfaceresamplesw.h
+include/synfig-${API_V}/synfig/rendering/software/task/tasksw.h
+include/synfig-${API_V}/synfig/rendering/surface.h
+include/synfig-${API_V}/synfig/rendering/task.h
 include/synfig-${API_V}/synfig/rendermethod.h
 include/synfig-${API_V}/synfig/savecanvas.h
 include/synfig-${API_V}/synfig/segment.h
@@ -110,11 +210,14 @@ include/synfig-${API_V}/synfig/types.h
 include/synfig-${API_V}/synfig/uniqueid.h
 include/synfig-${API_V}/synfig/value.h
 include/synfig-${API_V}/synfig/valuenode.h
+include/synfig-${API_V}/synfig/valuenode_registry.h
 include/synfig-${API_V}/synfig/valuenodes/
 include/synfig-${API_V}/synfig/valuenodes/valuenode_add.h
 include/synfig-${API_V}/synfig/valuenodes/valuenode_and.h
 include/synfig-${API_V}/synfig/valuenodes/valuenode_anglestring.h
 include/synfig-${API_V}/synfig/valuenodes/valuenode_animated.h
+include/synfig-${API_V}/synfig/valuenodes/valuenode_animatedfile.h
+include/synfig-${API_V}/synfig/valuenodes/valuenode_animatedinterface.h
 include/synfig-${API_V}/synfig/valuenodes/valuenode_atan2.h
 include/synfig-${API_V}/synfig/valuenodes/valuenode_average.h
 include/synfig-${API_V}/synfig/valuenodes/valuenode_bline.h
@@ -155,6 +258,7 @@ include/synfig-${API_V}/synfig/valuenode
 include/synfig-${API_V}/synfig/valuenodes/valuenode_reciprocal.h
 include/synfig-${API_V}/synfig/valuenodes/valuenode_reference.h
 include/synfig-${API_V}/synfig/valuenodes/valuenode_repeat_gradient.h
+include/synfig-${API_V}/synfig/valuenodes/valuenode_reverse.h
 include/synfig-${API_V}/synfig/valuenodes/valuenode_scale.h
 include/synfig-${API_V}/synfig/valuenodes/valuenode_segcalctangent.h
 include/synfig-${API_V}/synfig/valuenodes/valuenode_segcalcvertex.h
@@ -188,26 +292,68 @@ lib/libsynfig.la
 lib/pkgconfig/synfig.pc
 lib/synfig/
 lib/synfig/modules/
+lib/synfig/modules/liblyr_freetype.a
+lib/synfig/modules/liblyr_freetype.la
 lib/synfig/modules/liblyr_freetype.so
+lib/synfig/modules/liblyr_std.a
+lib/synfig/modules/liblyr_std.la
 lib/synfig/modules/liblyr_std.so
+lib/synfig/modules/libmod_bmp.a
+lib/synfig/modules/libmod_bmp.la
 lib/synfig/modules/libmod_bmp.so
+lib/synfig/modules/libmod_dv.a
+lib/synfig/modules/libmod_dv.la
 lib/synfig/modules/libmod_dv.so
+lib/synfig/modules/libmod_example.a
+lib/synfig/modules/libmod_example.la
 lib/synfig/modules/libmod_example.so
+lib/synfig/modules/libmod_ffmpeg.a
+lib/synfig/modules/libmod_ffmpeg.la
 lib/synfig/modules/libmod_ffmpeg.so
+lib/synfig/modules/libmod_filter.a
+lib/synfig/modules/libmod_filter.la
 lib/synfig/modules/libmod_filter.so
+lib/synfig/modules/libmod_geometry.a
+lib/synfig/modules/libmod_geometry.la
 lib/synfig/modules/libmod_geometry.so
+lib/synfig/modules/libmod_gif.a
+lib/synfig/modules/libmod_gif.la
 lib/synfig/modules/libmod_gif.so
+lib/synfig/modules/libmod_gradient.a
+lib/synfig/modules/libmod_gradient.la
 lib/synfig/modules/libmod_gradient.so
+lib/synfig/modules/libmod_imagemagick.a
+lib/synfig/modules/libmod_imagemagick.la
 lib/synfig/modules/libmod_imagemagick.so
+lib/synfig/modules/libmod_jpeg.a
+lib/synfig/modules/libmod_jpeg.la
 lib/synfig/modules/libmod_jpeg.so
+lib/synfig/modules/libmod_magickpp.a
+lib/synfig/modules/libmod_magickpp.la
 lib/synfig/modules/libmod_magickpp.so
+lib/synfig/modules/libmod_mng.a
+lib/synfig/modules/libmod_mng.la
 lib/synfig/modules/libmod_mng.so
+lib/synfig/modules/libmod_noise.a
+lib/synfig/modules/libmod_noise.la
 lib/synfig/modules/libmod_noise.so
+lib/synfig/modules/libmod_openexr.a
+lib/synfig/modules/libmod_openexr.la
 lib/synfig/modules/libmod_openexr.so
+lib/synfig/modules/libmod_particle.a
+lib/synfig/modules/libmod_particle.la
 lib/synfig/modules/libmod_particle.so
+lib/synfig/modules/libmod_png.a
+lib/synfig/modules/libmod_png.la
 lib/synfig/modules/libmod_png.so
+lib/synfig/modules/libmod_ppm.a
+lib/synfig/modules/libmod_ppm.la
 lib/synfig/modules/libmod_ppm.so
+lib/synfig/modules/libmod_svg.a
+lib/synfig/modules/libmod_svg.la
 lib/synfig/modules/libmod_svg.so
+lib/synfig/modules/libmod_yuv420p.a
+lib/synfig/modules/libmod_yuv420p.la
 lib/synfig/modules/libmod_yuv420p.so
 share/examples/synfig/
 share/examples/synfig/synfig_modules.cfg
@@ -215,6 +361,7 @@ share/examples/synfig/synfig_modules.cfg
 share/locale/ar/LC_MESSAGES/synfig.mo
 share/locale/bs/LC_MESSAGES/synfig.mo
 share/locale/ca/LC_MESSAGES/synfig.mo
+share/locale/ca@valencia/LC_MESSAGES/synfig.mo
 share/locale/cs/LC_MESSAGES/synfig.mo
 share/locale/cs_CZ/
 share/locale/cs_CZ/LC_MESSAGES/
@@ -229,20 +376,30 @@ share/locale/en_CZ/LC_MESSAGES/
 share/locale/en_CZ/LC_MESSAGES/synfig.mo
 share/locale/en_GB/LC_MESSAGES/synfig.mo
 share/locale/es/LC_MESSAGES/synfig.mo
+share/locale/es_PY/
+share/locale/es_PY/LC_MESSAGES/
+share/locale/es_PY/LC_MESSAGES/synfig.mo
 share/locale/eu/LC_MESSAGES/synfig.mo
 share/locale/eu_ES/
 share/locale/eu_ES/LC_MESSAGES/
 share/locale/eu_ES/LC_MESSAGES/synfig.mo
+share/locale/fa_IR/
+share/locale/fa_IR/LC_MESSAGES/
 share/locale/fa_IR/LC_MESSAGES/synfig.mo
 share/locale/fr/LC_MESSAGES/synfig.mo
 share/locale/gl/LC_MESSAGES/synfig.mo
 share/locale/he/LC_MESSAGES/synfig.mo
+share/locale/hi_IN/
+share/locale/hi_IN/LC_MESSAGES/
+share/locale/hi_IN/LC_MESSAGES/synfig.mo
 share/locale/hu/LC_MESSAGES/synfig.mo
 share/locale/it/LC_MESSAGES/synfig.mo
+share/locale/ja/LC_MESSAGES/synfig.mo
 share/locale/ja_JP/
 share/locale/ja_JP/LC_MESSAGES/
 share/locale/ja_JP/LC_MESSAGES/synfig.mo
 share/locale/lt/LC_MESSAGES/synfig.mo
+share/locale/lv/LC_MESSAGES/synfig.mo
 share/locale/nl/LC_MESSAGES/synfig.mo
 share/locale/no_NO/
 share/locale/no_NO/LC_MESSAGES/
@@ -250,13 +407,16 @@ share/locale/no_NO/LC_MESSAGES/synfig.mo
 share/locale/pl_PL/
 share/locale/pl_PL/LC_MESSAGES/
 share/locale/pl_PL/LC_MESSAGES/synfig.mo
+share/locale/pt/LC_MESSAGES/synfig.mo
 share/locale/pt_BR/LC_MESSAGES/synfig.mo
 share/locale/ro/LC_MESSAGES/synfig.mo
 share/locale/ru/LC_MESSAGES/synfig.mo
 share/locale/si/LC_MESSAGES/synfig.mo
+share/locale/sk/LC_MESSAGES/synfig.mo
 share/locale/sk_SK/
 share/locale/sk_SK/LC_MESSAGES/
 share/locale/sk_SK/LC_MESSAGES/synfig.mo
+share/locale/sl/LC_MESSAGES/synfig.mo
 share/locale/sr_RS/
 share/locale/sr_RS/LC_MESSAGES/
 share/locale/sr_RS/LC_MESSAGES/synfig.mo
Index: multimedia/synfigstudio/Makefile
===================================================================
RCS file: /cvs/ports/multimedia/synfigstudio/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- multimedia/synfigstudio/Makefile    2 Dec 2017 21:39:49 -0000       1.19
+++ multimedia/synfigstudio/Makefile    7 Dec 2017 13:58:13 -0000
@@ -5,51 +5,52 @@ BROKEN-alpha =                [keyframe_lock_past_on_i
 BROKEN-hppa =          Illegal instruction (core dumped)
 BROKEN-sparc64 =       terminate called after throwing an instance of 
'synfig::Exception::IDNotFound'
 
-V =                    1.0.1
+V =                    1.2.1
 DISTNAME =             synfigstudio-$V
 API_V =                        1.0
-REVISION =             6
 
-SHARED_LIBS +=  synfigapp                 1.0 # 0.0
+SHARED_LIBS +=  synfigapp                 2.0 # 0.0
 
 CATEGORIES =           multimedia
 
-HOMEPAGE =             http://www.synfig.org/
+HOMEPAGE =             https://www.synfig.org/
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += Half ICE Iex IexMath IlmImf IlmThread Imath Magick++-6.Q16
-WANTLIB += MagickCore-6.Q16 MagickWand-6.Q16 SM X11 Xcomposite
-WANTLIB += Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender
-WANTLIB += Xt atk-1.0 atk-bridge-2.0 atkmm-1.6 atspi bz2 c cairo
-WANTLIB += cairo-gobject cairomm-1.0 db dbus-1 djvulibre epoxy
-WANTLIB += expat ffi fftw3 fontconfig freetype gdk-3 gdk_pixbuf-2.0
-WANTLIB += gdkmm-3.0 gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0
-WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3 gtkmm-3.0 harfbuzz
-WANTLIB += iconv intl 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 sigc-2.0 synfig
-WANTLIB += tiff webp xcb xcb-render xcb-shm xml++-2.6 xml2 z ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} Half ICE Iex IexMath IlmImf IlmThread
+WANTLIB += Imath Magick++-6.Q16 MagickCore-6.Q16 MagickWand-6.Q16
+WANTLIB += SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender Xt Xtst atk-1.0 atk-bridge-2.0 atkmm-1.6
+WANTLIB += atspi bz2 c cairo cairo-gobject cairomm-1.0 db dbus-1
+WANTLIB += djvulibre epoxy expat ffi fftw3 fontconfig freetype
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0 giomm-2.4 glib-2.0
+WANTLIB += glibmm-2.4 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
+WANTLIB += gtk-3 gtkmm-3.0 harfbuzz iconv intl jack jasper jbig
+WANTLIB += jpeg lcms2 ltdl lzma m mlt mlt++ openjp2 pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pangomm-1.4 pcre pixman-1
+WANTLIB += png raw_r sigc-2.0 synfig tiff webp xcb xcb-render
+WANTLIB += xcb-shm xml++-2.6 xml2 z
 
-MASTER_SITES=          https://download.tuxfamily.org/synfig/releases/${V}/
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=synfig/}
 
 MODULES =              textproc/intltool
 
 # c++11
 COMPILER =             base-clang ports-gcc
 
-BUILD_DEPENDS =                devel/etl>=0.04.19
+BUILD_DEPENDS =                devel/etl>=1.2.1
 RUN_DEPENDS =          devel/desktop-file-utils \
                        misc/shared-mime-info \
                        x11/gtk+3,-guic
-LIB_DEPENDS =          multimedia/synfig>=1.0.1 \
+LIB_DEPENDS =          multimedia/synfig>=1.2.1 \
+                       graphics/libraw \
+                       graphics/jasper \
                        x11/gtk3mm
 
 USE_GMAKE =            Yes
 CONFIGURE_STYLE =      gnu
 CONFIGURE_ARGS +=      --disable-update-mimedb
-CONFIGURE_ENV =                CXXFLAGS="-std=c++11"
 
 SUBST_VAR +=           API_v
 
Index: multimedia/synfigstudio/distinfo
===================================================================
RCS file: /cvs/ports/multimedia/synfigstudio/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- multimedia/synfigstudio/distinfo    21 Sep 2015 16:59:13 -0000      1.2
+++ multimedia/synfigstudio/distinfo    7 Dec 2017 13:58:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (synfigstudio-1.0.1.tar.gz) = 
0XkEapPGQroFbMKzXggkLTuXJLXzo3CfWg1Alw1Jykk=
-SIZE (synfigstudio-1.0.1.tar.gz) = 5207441
+SHA256 (synfigstudio-1.2.1.tar.gz) = 
GpeHXgA5iVYECFZJvNMM8NYWX0yGUpnKE9RdLfv6sF0=
+SIZE (synfigstudio-1.2.1.tar.gz) = 5687045
Index: multimedia/synfigstudio/patches/patch-images_Makefile_in
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-images_Makefile_in
diff -N multimedia/synfigstudio/patches/patch-images_Makefile_in
--- multimedia/synfigstudio/patches/patch-images_Makefile_in    4 Dec 2015 
13:58:42 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-images_Makefile_in,v 1.1 2015/12/04 13:58:42 sthen Exp $
-
-XXX  This fails with SIGABRT:
-
-synfig -q splash_screen-1.0.1.sif -o splash_screen.png --time 0
-synfig(1645) [06:33:36] info: Loading modules from /etc/synfig_modules.cfg
-/usr/local/bin/synfig: warning: Unable to find module "mod_libavcodec" (file 
not found)
-synfig(1645) [06:33:36] info: Loading file: splash_screen-1.0.1.sif
-synfig(1645) [06:33:36] info: Loading file: ./splash_screen-1.0.x.sif
-Makefile:1367: recipe for target 'splash_screen.png' failed
-
-So just use 1.0.x.sif for now, it misses out the version number on the splash
-screen, but avoids the failure.
-
---- images/Makefile.in.orig    Fri Dec  4 06:48:01 2015
-+++ images/Makefile.in Fri Dec  4 06:52:53 2015
-@@ -1363,7 +1363,7 @@ action_doc_redo_icon.$(EXT): $(srcdir)/action_doc_icon
- @DEVELOPMENT_SNAPSHOT_TRUE@   echo "  File \"images\\$@\"" >>./images.nsh
- @DEVELOPMENT_SNAPSHOT_TRUE@   echo "  Delete 
\"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
- @DEVELOPMENT_SNAPSHOT_TRUE@.PHONY: splash_screen_development.sif
--@DEVELOPMENT_SNAPSHOT_FALSE@splash_screen.$(EXT): 
$(srcdir)/splash_screen-$(PACKAGE_VERSION).sif
-+@DEVELOPMENT_SNAPSHOT_FALSE@splash_screen.$(EXT): 
$(srcdir)/splash_screen-1.0.x.sif
- @DEVELOPMENT_SNAPSHOT_FALSE@  $(SYNFIG) -q $< -o $@ --time 0
- @DEVELOPMENT_SNAPSHOT_FALSE@  echo "  File \"images\\$@\"" >>./images.nsh
- @DEVELOPMENT_SNAPSHOT_FALSE@  echo "  Delete 
\"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
Index: multimedia/synfigstudio/patches/patch-src_gui_canvasview_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_canvasview_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_canvasview_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_canvasview_cpp        24 Sep 
2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_gui_canvasview_cpp,v 1.1 2015/09/24 10:40:16 ajacoutot Exp 
$
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/canvasview.cpp.orig        Sat Jul 18 10:59:00 2015
-+++ src/gui/canvasview.cpp     Thu Sep 24 11:08:06 2015
-@@ -92,8 +92,6 @@
- //#include <synfigapp/action_deletewaypoint.h>
- 
- #include <sigc++/retype_return.h>
--#include <sigc++/retype.h>
--//#include <sigc++/hide.h>
- 
- #include "canvasview.h"
- #include "instance.h"
Index: multimedia/synfigstudio/patches/patch-src_gui_compview_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_compview_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_compview_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_compview_cpp  24 Sep 2015 
10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_compview_cpp,v 1.1 2015/09/24 10:40:16 ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/compview.cpp.orig  Thu Jul  9 09:33:04 2015
-+++ src/gui/compview.cpp       Thu Sep 24 11:08:06 2015
-@@ -39,7 +39,6 @@
- #include <iostream>
- #include "instance.h"
- #include <sigc++/signal.h>
--#include <sigc++/hide.h>
- #include <sigc++/slot.h>
- #include "canvasview.h"
- #include <synfigapp/action.h>
Index: multimedia/synfigstudio/patches/patch-src_gui_dialogs_about_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_dialogs_about_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_dialogs_about_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_dialogs_about_cpp     24 May 
2017 23:59:42 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$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
Index: multimedia/synfigstudio/patches/patch-src_gui_docks_dock_children_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_docks_dock_children_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_docks_dock_children_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_docks_dock_children_cpp       
24 Sep 2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_docks_dock_children_cpp,v 1.1 2015/09/24 10:40:16 
ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/docks/dock_children.cpp.orig       Thu Jul  9 09:33:04 2015
-+++ src/gui/docks/dock_children.cpp    Thu Sep 24 11:08:06 2015
-@@ -37,7 +37,6 @@
- #include <cassert>
- #include "instance.h"
- #include <sigc++/signal.h>
--#include <sigc++/hide.h>
- #include <sigc++/retype_return.h>
- #include <sigc++/slot.h>
- #include "trees/childrentreestore.h"
Index: multimedia/synfigstudio/patches/patch-src_gui_docks_dock_curves_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_docks_dock_curves_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_docks_dock_curves_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_docks_dock_curves_cpp 24 Sep 
2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_docks_dock_curves_cpp,v 1.1 2015/09/24 10:40:16 
ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/docks/dock_curves.cpp.orig Thu Jul  9 09:33:04 2015
-+++ src/gui/docks/dock_curves.cpp      Thu Sep 24 11:08:06 2015
-@@ -36,7 +36,6 @@
- #include <cassert>
- #include "instance.h"
- #include <sigc++/signal.h>
--#include <sigc++/hide.h>
- #include <sigc++/slot.h>
- #include "canvasview.h"
- #include "trees/layerparamtreestore.h"
Index: multimedia/synfigstudio/patches/patch-src_gui_docks_dock_history_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_docks_dock_history_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_docks_dock_history_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_docks_dock_history_cpp        
24 Sep 2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_docks_dock_history_cpp,v 1.1 2015/09/24 10:40:16 
ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/docks/dock_history.cpp.orig        Thu Jul  9 09:33:04 2015
-+++ src/gui/docks/dock_history.cpp     Thu Sep 24 11:08:06 2015
-@@ -39,7 +39,6 @@
- #include <cassert>
- #include "instance.h"
- #include <sigc++/signal.h>
--#include <sigc++/hide.h>
- #include <sigc++/slot.h>
- #include <synfigapp/action.h>
- #include "trees/historytreestore.h"
Index: multimedia/synfigstudio/patches/patch-src_gui_docks_dock_keyframes_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_docks_dock_keyframes_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_docks_dock_keyframes_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_docks_dock_keyframes_cpp      
24 Sep 2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_docks_dock_keyframes_cpp,v 1.1 2015/09/24 10:40:16 
ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/docks/dock_keyframes.cpp.orig      Thu Jul  9 09:33:04 2015
-+++ src/gui/docks/dock_keyframes.cpp   Thu Sep 24 11:08:06 2015
-@@ -36,7 +36,6 @@
- #include <cassert>
- #include "instance.h"
- #include <sigc++/signal.h>
--#include <sigc++/hide.h>
- #include <sigc++/slot.h>
- #include "trees/keyframetreestore.h"
- #include "trees/keyframetree.h"
Index: multimedia/synfigstudio/patches/patch-src_gui_docks_dock_layergroups_cpp
===================================================================
RCS file: 
multimedia/synfigstudio/patches/patch-src_gui_docks_dock_layergroups_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_docks_dock_layergroups_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_docks_dock_layergroups_cpp    
24 Sep 2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_docks_dock_layergroups_cpp,v 1.1 2015/09/24 10:40:16 
ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/docks/dock_layergroups.cpp.orig    Thu Jul  9 09:33:04 2015
-+++ src/gui/docks/dock_layergroups.cpp Thu Sep 24 11:08:06 2015
-@@ -36,7 +36,6 @@
- #include <cassert>
- #include "instance.h"
- #include <sigc++/signal.h>
--#include <sigc++/hide.h>
- #include <sigc++/retype_return.h>
- #include <sigc++/slot.h>
- #include "canvasview.h"
Index: multimedia/synfigstudio/patches/patch-src_gui_docks_dock_layers_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_docks_dock_layers_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_docks_dock_layers_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_docks_dock_layers_cpp 24 Sep 
2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_docks_dock_layers_cpp,v 1.1 2015/09/24 10:40:16 
ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/docks/dock_layers.cpp.orig Thu Jul  9 09:33:04 2015
-+++ src/gui/docks/dock_layers.cpp      Thu Sep 24 11:08:06 2015
-@@ -39,7 +39,6 @@
- #include <cassert>
- #include "instance.h"
- #include <sigc++/signal.h>
--#include <sigc++/hide.h>
- #include <sigc++/retype_return.h>
- #include <sigc++/slot.h>
- #include "trees/layertreestore.h"
Index: multimedia/synfigstudio/patches/patch-src_gui_docks_dock_metadata_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_docks_dock_metadata_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_docks_dock_metadata_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_docks_dock_metadata_cpp       
24 Sep 2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_docks_dock_metadata_cpp,v 1.1 2015/09/24 10:40:16 
ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/docks/dock_metadata.cpp.orig       Thu Jul  9 09:33:04 2015
-+++ src/gui/docks/dock_metadata.cpp    Thu Sep 24 11:08:06 2015
-@@ -37,7 +37,6 @@
- #include <cassert>
- #include "instance.h"
- #include <sigc++/signal.h>
--#include <sigc++/hide.h>
- #include <sigc++/slot.h>
- #include "trees/metadatatreestore.h"
- #include "trees/metadatatree.h"
Index: multimedia/synfigstudio/patches/patch-src_gui_docks_dock_params_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_docks_dock_params_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_docks_dock_params_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_docks_dock_params_cpp 24 Sep 
2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_docks_dock_params_cpp,v 1.1 2015/09/24 10:40:16 
ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/docks/dock_params.cpp.orig Thu Jul  9 09:33:04 2015
-+++ src/gui/docks/dock_params.cpp      Thu Sep 24 11:08:06 2015
-@@ -36,7 +36,6 @@
- #include <cassert>
- #include "instance.h"
- #include <sigc++/signal.h>
--#include <sigc++/hide.h>
- #include <sigc++/slot.h>
- #include "canvasview.h"
- #include "trees/layerparamtreestore.h"
Index: multimedia/synfigstudio/patches/patch-src_gui_docks_dock_timetrack_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_docks_dock_timetrack_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_docks_dock_timetrack_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_docks_dock_timetrack_cpp      
24 Sep 2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_docks_dock_timetrack_cpp,v 1.1 2015/09/24 10:40:16 
ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/docks/dock_timetrack.cpp.orig      Thu Jul  9 09:33:04 2015
-+++ src/gui/docks/dock_timetrack.cpp   Thu Sep 24 11:08:06 2015
-@@ -38,7 +38,6 @@
- #include <cassert>
- #include "instance.h"
- #include <sigc++/signal.h>
--#include <sigc++/hide.h>
- #include <sigc++/slot.h>
- #include "canvasview.h"
- #include "trees/layerparamtreestore.h"
Index: multimedia/synfigstudio/patches/patch-src_gui_docks_dock_toolbox_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_docks_dock_toolbox_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_docks_dock_toolbox_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_docks_dock_toolbox_cpp        
24 Sep 2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_gui_docks_dock_toolbox_cpp,v 1.1 2015/09/24 10:40:16 
ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/docks/dock_toolbox.cpp.orig        Thu Jul  9 09:33:04 2015
-+++ src/gui/docks/dock_toolbox.cpp     Thu Sep 24 11:08:06 2015
-@@ -38,10 +38,8 @@
- #include <gtkmm/accelmap.h>
- 
- #include <sigc++/signal.h>
--#include <sigc++/hide.h>
- #include <sigc++/slot.h>
- #include <sigc++/retype_return.h>
--#include <sigc++/retype.h>
- 
- #include "general.h"
- #include <sstream>
Index: multimedia/synfigstudio/patches/patch-src_gui_docks_dockable_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_docks_dockable_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_docks_dockable_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_docks_dockable_cpp    24 Sep 
2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_docks_dockable_cpp,v 1.1 2015/09/24 10:40:16 ajacoutot 
Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/docks/dockable.cpp.orig    Thu Jul  9 09:33:04 2015
-+++ src/gui/docks/dockable.cpp Thu Sep 24 11:08:06 2015
-@@ -30,7 +30,6 @@
- #endif
- 
- #include "app.h"
--#include <sigc++/hide.h>
- 
- #include "docks/dockable.h"
- #include "docks/dockmanager.h"
Index: multimedia/synfigstudio/patches/patch-src_gui_docks_dockdialog_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_docks_dockdialog_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_docks_dockdialog_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_docks_dockdialog_cpp  24 Sep 
2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_gui_docks_dockdialog_cpp,v 1.1 2015/09/24 10:40:16 
ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/docks/dockdialog.cpp.orig  Thu Jul  9 09:33:04 2015
-+++ src/gui/docks/dockdialog.cpp       Thu Sep 24 11:08:06 2015
-@@ -42,10 +42,8 @@
- #include <synfig/general.h>
- #include <synfig/uniqueid.h>
- #include <gtkmm/table.h>
--#include <sigc++/hide.h>
- #include <sigc++/slot.h>
- #include <sigc++/retype_return.h>
--#include <sigc++/retype.h>
- #include "canvasview.h"
- #include <gtkmm/paned.h>
- #include <gtkmm/box.h>
Index: multimedia/synfigstudio/patches/patch-src_gui_docks_dockmanager_h
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_docks_dockmanager_h
diff -N multimedia/synfigstudio/patches/patch-src_gui_docks_dockmanager_h
--- multimedia/synfigstudio/patches/patch-src_gui_docks_dockmanager_h   24 Sep 
2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_docks_dockmanager_h,v 1.1 2015/09/24 10:40:16 
ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/docks/dockmanager.h.orig   Thu Jul  9 09:33:04 2015
-+++ src/gui/docks/dockmanager.h        Thu Sep 24 11:06:18 2015
-@@ -32,7 +32,6 @@
- #include <map>
- #include <synfig/string.h>
- #include <sigc++/signal.h>
--#include <sigc++/object.h>
- #include <ETL/smart_ptr>
- 
- #include <gtkmm/widget.h>
Index: multimedia/synfigstudio/patches/patch-src_gui_duck_h
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_duck_h
diff -N multimedia/synfigstudio/patches/patch-src_gui_duck_h
--- multimedia/synfigstudio/patches/patch-src_gui_duck_h        24 Sep 2015 
10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_duck_h,v 1.1 2015/09/24 10:40:16 ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/duck.h.orig        Thu Jul  9 09:33:04 2015
-+++ src/gui/duck.h     Thu Sep 24 11:06:18 2015
-@@ -38,7 +38,6 @@
- #include <synfig/string.h>
- #include <synfig/real.h>
- #include <sigc++/signal.h>
--#include <sigc++/object.h>
- #include <synfig/time.h>
- #include <ETL/smart_ptr>
- #include <synfigapp/value_desc.h>
Index: multimedia/synfigstudio/patches/patch-src_gui_duckmatic_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_duckmatic_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_duckmatic_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_duckmatic_cpp 24 Sep 2015 
10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_gui_duckmatic_cpp,v 1.1 2015/09/24 10:40:16 ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/duckmatic.cpp.orig Sat Jul 18 07:34:53 2015
-+++ src/gui/duckmatic.cpp      Thu Sep 24 11:08:06 2015
-@@ -68,8 +68,6 @@
- #include <synfig/layers/layer_pastecanvas.h>
- 
- #include <sigc++/retype_return.h>
--#include <sigc++/retype.h>
--#include <sigc++/hide.h>
- #include <sigc++/bind.h>
- 
- #include "ducktransform_matrix.h"
Index: multimedia/synfigstudio/patches/patch-src_gui_duckmatic_h
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_duckmatic_h
diff -N multimedia/synfigstudio/patches/patch-src_gui_duckmatic_h
--- multimedia/synfigstudio/patches/patch-src_gui_duckmatic_h   24 Sep 2015 
10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_duckmatic_h,v 1.1 2015/09/24 10:40:16 ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/duckmatic.h.orig   Sat Jul 18 07:34:53 2015
-+++ src/gui/duckmatic.h        Thu Sep 24 11:06:18 2015
-@@ -40,7 +40,6 @@
- #include <synfig/string.h>
- #include <synfig/real.h>
- #include <sigc++/signal.h>
--#include <sigc++/object.h>
- #include <synfig/time.h>
- #include <synfig/color.h>
- #include <ETL/smart_ptr>
Index: multimedia/synfigstudio/patches/patch-src_gui_iconcontroller_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_iconcontroller_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_iconcontroller_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_iconcontroller_cpp    24 May 
2017 23:59:42 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,392 +0,0 @@
-$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"));
Index: multimedia/synfigstudio/patches/patch-src_gui_instance_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_instance_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_instance_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_instance_cpp  24 Sep 2015 
10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_instance_cpp,v 1.1 2015/09/24 10:40:16 ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/instance.cpp.orig  Thu Jul  9 09:33:04 2015
-+++ src/gui/instance.cpp       Thu Sep 24 11:08:06 2015
-@@ -54,7 +54,6 @@
- 
- #include "autorecover.h"
- #include <sigc++/retype_return.h>
--#include <sigc++/retype.h>
- //#include <sigc++/hide.h>
- #include <synfig/valuenodes/valuenode_composite.h>
- #include <synfig/valuenodes/valuenode_duplicate.h>
Index: multimedia/synfigstudio/patches/patch-src_gui_instance_h
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_instance_h
diff -N multimedia/synfigstudio/patches/patch-src_gui_instance_h
--- multimedia/synfigstudio/patches/patch-src_gui_instance_h    24 Sep 2015 
10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_instance_h,v 1.1 2015/09/24 10:40:16 ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/instance.h.orig    Thu Jul  9 09:33:04 2015
-+++ src/gui/instance.h Thu Sep 24 11:06:18 2015
-@@ -33,7 +33,6 @@
- #include <gtkmm/treeview.h>
- #include <gtkmm/treestore.h>
- #include <synfigapp/instance.h>
--#include <sigc++/object.h>
- #include <synfigapp/value_desc.h>
- #include "trees/historytreestore.h"
- #include <synfig/canvas.h>
Index: multimedia/synfigstudio/patches/patch-src_gui_splash_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_splash_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_splash_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_splash_cpp    24 May 2017 
23:59:42 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$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);
Index: multimedia/synfigstudio/patches/patch-src_gui_states_state_stroke_h
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_states_state_stroke_h
diff -N multimedia/synfigstudio/patches/patch-src_gui_states_state_stroke_h
--- multimedia/synfigstudio/patches/patch-src_gui_states_state_stroke_h 24 Sep 
2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_states_state_stroke_h,v 1.1 2015/09/24 10:40:16 
ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/states/state_stroke.h.orig Thu Jul  9 09:33:04 2015
-+++ src/gui/states/state_stroke.h      Thu Sep 24 11:06:18 2015
-@@ -29,7 +29,6 @@
- 
- #include "canvasview.h"
- #include "workarea.h"
--#include <sigc++/object.h>
- #include "duckmatic.h"
- #include <synfig/blinepoint.h>
- #include <list>
Index: multimedia/synfigstudio/patches/patch-src_gui_states_state_zoom_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_states_state_zoom_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_states_state_zoom_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_states_state_zoom_cpp 24 Sep 
2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_states_state_zoom_cpp,v 1.1 2015/09/24 10:40:16 
ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/states/state_zoom.cpp.orig Thu Jul  9 09:33:04 2015
-+++ src/gui/states/state_zoom.cpp      Thu Sep 24 11:08:06 2015
-@@ -31,7 +31,6 @@
- #endif
- 
- #include <sigc++/signal.h>
--#include <sigc++/object.h>
- 
- #include <ETL/handle>
- #include <synfig/vector.h>
Index: multimedia/synfigstudio/patches/patch-src_gui_widgets_widget_curves_cpp
===================================================================
RCS file: 
multimedia/synfigstudio/patches/patch-src_gui_widgets_widget_curves_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_widgets_widget_curves_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_widgets_widget_curves_cpp     
24 Sep 2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_widgets_widget_curves_cpp,v 1.1 2015/09/24 10:40:16 
ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/widgets/widget_curves.cpp.orig     Thu Jul  9 09:33:04 2015
-+++ src/gui/widgets/widget_curves.cpp  Thu Sep 24 11:08:06 2015
-@@ -38,7 +38,6 @@
- #include <map>
- #include <vector>
- #include <ETL/misc>
--#include <sigc++/object.h>
- 
- #include "general.h"
- 
Index: multimedia/synfigstudio/patches/patch-src_gui_workarea_cpp
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_gui_workarea_cpp
diff -N multimedia/synfigstudio/patches/patch-src_gui_workarea_cpp
--- multimedia/synfigstudio/patches/patch-src_gui_workarea_cpp  24 Sep 2015 
10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_gui_workarea_cpp,v 1.1 2015/09/24 10:40:16 ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/workarea.cpp.orig  Sat Jul 18 07:34:53 2015
-+++ src/gui/workarea.cpp       Thu Sep 24 11:08:06 2015
-@@ -45,8 +45,6 @@
- #include <gtkmm/scrollbar.h>
- #include <cmath>
- #include <sigc++/retype_return.h>
--#include <sigc++/retype.h>
--#include <sigc++/hide.h>
- #include <ETL/misc>
- 
- #include <synfig/target_scanline.h>
Index: 
multimedia/synfigstudio/patches/patch-src_gui_workarearenderer_workarearenderer_h
===================================================================
RCS file: 
multimedia/synfigstudio/patches/patch-src_gui_workarearenderer_workarearenderer_h
diff -N 
multimedia/synfigstudio/patches/patch-src_gui_workarearenderer_workarearenderer_h
--- 
multimedia/synfigstudio/patches/patch-src_gui_workarearenderer_workarearenderer_h
   24 Sep 2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_workarearenderer_workarearenderer_h,v 1.1 2015/09/24 
10:40:16 ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/gui/workarearenderer/workarearenderer.h.orig   Thu Jul  9 09:33:04 2015
-+++ src/gui/workarearenderer/workarearenderer.h        Thu Sep 24 11:06:18 2015
-@@ -29,7 +29,6 @@
- 
- #include <ETL/handle>
- #include <sigc++/signal.h>
--#include <sigc++/object.h>
- #include <synfig/vector.h>
- #include <gdkmm/window.h>
- #include <gdkmm/rectangle.h>
Index: multimedia/synfigstudio/patches/patch-src_synfigapp_action_system_h
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_synfigapp_action_system_h
diff -N multimedia/synfigstudio/patches/patch-src_synfigapp_action_system_h
--- multimedia/synfigstudio/patches/patch-src_synfigapp_action_system_h 24 Sep 
2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_synfigapp_action_system_h,v 1.1 2015/09/24 10:40:16 
ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/synfigapp/action_system.h.orig Thu Jul  9 09:33:04 2015
-+++ src/synfigapp/action_system.h      Thu Sep 24 11:06:18 2015
-@@ -29,7 +29,6 @@
- 
- #include "action.h"
- #include <sigc++/signal.h>
--#include <sigc++/object.h>
- #include <ETL/handle>
- #include <synfig/canvas.h>
- #include "uimanager.h"
Index: multimedia/synfigstudio/patches/patch-src_synfigapp_canvasinterface_h
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_synfigapp_canvasinterface_h
diff -N multimedia/synfigstudio/patches/patch-src_synfigapp_canvasinterface_h
--- multimedia/synfigstudio/patches/patch-src_synfigapp_canvasinterface_h       
24 Sep 2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_synfigapp_canvasinterface_h,v 1.1 2015/09/24 10:40:16 
ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/synfigapp/canvasinterface.h.orig       Thu Jul  9 09:33:04 2015
-+++ src/synfigapp/canvasinterface.h    Thu Sep 24 11:06:18 2015
-@@ -31,7 +31,6 @@
- //#include <synfig/canvas.h>
- #include <synfig/value.h>
- #include <sigc++/signal.h>
--#include <sigc++/object.h>
- #include <list>
- #include "selectionmanager.h"
- #include "uimanager.h"
Index: multimedia/synfigstudio/patches/patch-src_synfigapp_instance_h
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_synfigapp_instance_h
diff -N multimedia/synfigstudio/patches/patch-src_synfigapp_instance_h
--- multimedia/synfigstudio/patches/patch-src_synfigapp_instance_h      24 Sep 
2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_synfigapp_instance_h,v 1.1 2015/09/24 10:40:16 ajacoutot 
Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/synfigapp/instance.h.orig      Thu Jul  9 09:33:04 2015
-+++ src/synfigapp/instance.h   Thu Sep 24 11:06:18 2015
-@@ -36,7 +36,6 @@
- #include <list>
- #include <set>
- #include <sigc++/signal.h>
--#include <sigc++/object.h>
- #include "action_system.h"
- #include "selectionmanager.h"
- #include "cvs.h"
Index: multimedia/synfigstudio/patches/patch-src_synfigapp_main_h
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_synfigapp_main_h
diff -N multimedia/synfigstudio/patches/patch-src_synfigapp_main_h
--- multimedia/synfigstudio/patches/patch-src_synfigapp_main_h  24 Sep 2015 
10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_synfigapp_main_h,v 1.1 2015/09/24 10:40:16 ajacoutot Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/synfigapp/main.h.orig  Thu Jul  9 09:33:04 2015
-+++ src/synfigapp/main.h       Thu Sep 24 11:06:17 2015
-@@ -35,7 +35,6 @@
- #include <synfig/real.h>
- #include <synfig/waypoint.h>
- #include <sigc++/signal.h>
--#include <sigc++/object.h>
- #include "inputdevice.h"
- #include "settings.h"
- 
Index: multimedia/synfigstudio/patches/patch-src_synfigapp_uimanager_h
===================================================================
RCS file: multimedia/synfigstudio/patches/patch-src_synfigapp_uimanager_h
diff -N multimedia/synfigstudio/patches/patch-src_synfigapp_uimanager_h
--- multimedia/synfigstudio/patches/patch-src_synfigapp_uimanager_h     24 Sep 
2015 10:40:16 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_synfigapp_uimanager_h,v 1.1 2015/09/24 10:40:16 ajacoutot 
Exp $
-
-Fix build with libsigc++ >= 2.6.0.
-
---- src/synfigapp/uimanager.h.orig     Thu Jul  9 09:33:04 2015
-+++ src/synfigapp/uimanager.h  Thu Sep 24 11:06:18 2015
-@@ -30,7 +30,7 @@
- #include <ETL/handle>
- #include <synfig/general.h>
- #include <synfig/string.h>
--#include <sigc++/object.h>
-+#include <sigc++/trackable.h>
- 
- /* === M A C R O S ========================================================= 
*/
- 
Index: multimedia/synfigstudio/pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/synfigstudio/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- multimedia/synfigstudio/pkg/PLIST   21 Sep 2015 16:59:13 -0000      1.2
+++ multimedia/synfigstudio/pkg/PLIST   7 Dec 2017 13:58:13 -0000
@@ -28,7 +28,6 @@ include/synfigapp-0.0/synfigapp/colorset
 include/synfigapp-0.0/synfigapp/cvs.h
 include/synfigapp-0.0/synfigapp/editmode.h
 include/synfigapp-0.0/synfigapp/editmodeset.h
-include/synfigapp-0.0/synfigapp/general.h
 include/synfigapp-0.0/synfigapp/gradientset.h
 include/synfigapp-0.0/synfigapp/groupaddlayers.h
 include/synfigapp-0.0/synfigapp/groupremove.h
@@ -68,6 +67,7 @@ include/synfigapp-0.0/synfigapp/layerres
 include/synfigapp-0.0/synfigapp/layersetdesc.h
 include/synfigapp-0.0/synfigapp/layersetexcludefromrendering.h
 include/synfigapp-0.0/synfigapp/layerzdepthrangeset.h
+include/synfigapp-0.0/synfigapp/localization.h
 include/synfigapp-0.0/synfigapp/main.h
 include/synfigapp-0.0/synfigapp/pluginmanager.h
 include/synfigapp-0.0/synfigapp/selectionmanager.h
@@ -137,73 +137,49 @@ share/icons/hicolor/48x48/apps/synfig_ic
 share/icons/hicolor/64x64/apps/synfig_icon.png
 share/icons/hicolor/scalable/apps/synfig_icon.svg
 share/locale/ar/LC_MESSAGES/synfigstudio.mo
-share/locale/bs/
-share/locale/bs/LC_MESSAGES/
 share/locale/bs/LC_MESSAGES/synfigstudio.mo
 share/locale/ca/LC_MESSAGES/synfigstudio.mo
+share/locale/ca@valencia/LC_MESSAGES/synfigstudio.mo
 share/locale/cs/LC_MESSAGES/synfigstudio.mo
-share/locale/cs_CZ/
-share/locale/cs_CZ/LC_MESSAGES/
 share/locale/cs_CZ/LC_MESSAGES/synfigstudio.mo
 share/locale/da/LC_MESSAGES/synfigstudio.mo
 share/locale/de/LC_MESSAGES/synfigstudio.mo
-share/locale/el_GR/
-share/locale/el_GR/LC_MESSAGES/
 share/locale/el_GR/LC_MESSAGES/synfigstudio.mo
-share/locale/en_CZ/
-share/locale/en_CZ/LC_MESSAGES/
 share/locale/en_CZ/LC_MESSAGES/synfigstudio.mo
 share/locale/en_GB/LC_MESSAGES/synfigstudio.mo
 share/locale/es/LC_MESSAGES/synfigstudio.mo
+share/locale/es_PY/LC_MESSAGES/synfigstudio.mo
 share/locale/eu/LC_MESSAGES/synfigstudio.mo
-share/locale/eu_ES/
-share/locale/eu_ES/LC_MESSAGES/
 share/locale/eu_ES/LC_MESSAGES/synfigstudio.mo
 share/locale/fa_IR/LC_MESSAGES/synfigstudio.mo
 share/locale/fr/LC_MESSAGES/synfigstudio.mo
 share/locale/gl/LC_MESSAGES/synfigstudio.mo
 share/locale/he/LC_MESSAGES/synfigstudio.mo
+share/locale/hi_IN/LC_MESSAGES/synfigstudio.mo
 share/locale/hu/LC_MESSAGES/synfigstudio.mo
 share/locale/it/LC_MESSAGES/synfigstudio.mo
-share/locale/ja_JP/
-share/locale/ja_JP/LC_MESSAGES/
+share/locale/ja/LC_MESSAGES/synfigstudio.mo
 share/locale/ja_JP/LC_MESSAGES/synfigstudio.mo
 share/locale/lt/LC_MESSAGES/synfigstudio.mo
+share/locale/lv/LC_MESSAGES/synfigstudio.mo
 share/locale/nl/LC_MESSAGES/synfigstudio.mo
-share/locale/no_NO/
-share/locale/no_NO/LC_MESSAGES/
 share/locale/no_NO/LC_MESSAGES/synfigstudio.mo
-share/locale/pl_PL/
-share/locale/pl_PL/LC_MESSAGES/
 share/locale/pl_PL/LC_MESSAGES/synfigstudio.mo
+share/locale/pt/LC_MESSAGES/synfigstudio.mo
 share/locale/pt_BR/LC_MESSAGES/synfigstudio.mo
 share/locale/ro/LC_MESSAGES/synfigstudio.mo
 share/locale/ru/LC_MESSAGES/synfigstudio.mo
-share/locale/si/
-share/locale/si/LC_MESSAGES/
 share/locale/si/LC_MESSAGES/synfigstudio.mo
-share/locale/sk_SK/
-share/locale/sk_SK/LC_MESSAGES/
+share/locale/sk/LC_MESSAGES/synfigstudio.mo
 share/locale/sk_SK/LC_MESSAGES/synfigstudio.mo
-share/locale/sr_RS/
-share/locale/sr_RS/LC_MESSAGES/
+share/locale/sl/LC_MESSAGES/synfigstudio.mo
 share/locale/sr_RS/LC_MESSAGES/synfigstudio.mo
-share/locale/sv_SE/
-share/locale/sv_SE/LC_MESSAGES/
 share/locale/sv_SE/LC_MESSAGES/synfigstudio.mo
 share/locale/tr/LC_MESSAGES/synfigstudio.mo
-share/locale/ur/
-share/locale/ur/LC_MESSAGES/
 share/locale/ur/LC_MESSAGES/synfigstudio.mo
-share/locale/uz@Latn/
-share/locale/uz@Latn/LC_MESSAGES/
 share/locale/uz@Latn/LC_MESSAGES/synfigstudio.mo
-share/locale/zh-Hant/
-share/locale/zh-Hant/LC_MESSAGES/
 share/locale/zh-Hant/LC_MESSAGES/synfigstudio.mo
 share/locale/zh_CN/LC_MESSAGES/synfigstudio.mo
-share/locale/zh_TW.Big5/
-share/locale/zh_TW.Big5/LC_MESSAGES/
 share/locale/zh_TW.Big5/LC_MESSAGES/synfigstudio.mo
 share/locale/zh_TW/LC_MESSAGES/synfigstudio.mo
 share/mime-info/

Reply via email to