diff options
author | Ben Woods <woodsb02@FreeBSD.org> | 2019-12-11 11:23:22 +0000 |
---|---|---|
committer | Ben Woods <woodsb02@FreeBSD.org> | 2019-12-11 11:23:22 +0000 |
commit | 721acd7c37f5469d770603ad8d12341347d44761 (patch) | |
tree | 91038eef6d54a9a2369093b32812e66c757c6271 /graphics/synfigstudio | |
parent | 74ee1dac4db19ad24e5e35fb73088d3c6daed242 (diff) | |
download | ports-721acd7c37f5469d770603ad8d12341347d44761.tar.gz ports-721acd7c37f5469d770603ad8d12341347d44761.zip |
devel/etc, devel/synfig, graphics/synfigstudio: Update to 1.2.2
- Changed port to use GitHub as MASTER_SITES (follow upstream)
- Use autoreconf to build configure script (not included in GH repo)
- Introduce patches to fix build with autoreconf
Changes this release:
https://www.synfig.org/2018/09/15/synfig-studio-1-2-2-released/
PR: 237707
Reported by: kunda <chitty_cloud@me.com>
Notes
Notes:
svn path=/head/; revision=519795
Diffstat (limited to 'graphics/synfigstudio')
-rw-r--r-- | graphics/synfigstudio/Makefile | 26 | ||||
-rw-r--r-- | graphics/synfigstudio/distinfo | 6 | ||||
-rw-r--r-- | graphics/synfigstudio/files/patch-73046ac | 59 | ||||
-rw-r--r-- | graphics/synfigstudio/files/patch-configure.ac | 21 | ||||
-rw-r--r-- | graphics/synfigstudio/pkg-descr | 2 | ||||
-rw-r--r-- | graphics/synfigstudio/pkg-plist | 6 |
6 files changed, 101 insertions, 19 deletions
diff --git a/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile index dbb02c2cb940..4eea3a4e70aa 100644 --- a/graphics/synfigstudio/Makefile +++ b/graphics/synfigstudio/Makefile @@ -2,17 +2,16 @@ # $FreeBSD$ PORTNAME= synfigstudio -PORTVERSION= 1.2.1 -PORTREVISION= 12 +PORTVERSION= 1.2.2 +DISTVERSIONPREFIX=v CATEGORIES= graphics multimedia -MASTER_SITES= SF/synfig/releases/${PORTVERSION}/source MAINTAINER= woodsb02@FreeBSD.org COMMENT= Vector-based 2D animation software package LICENSE= GPLv2+ -BUILD_DEPENDS= etl>=0.04.19_1:devel/etl +BUILD_DEPENDS= etl>=1.2.2:devel/etl LIB_DEPENDS= libHalf.so:graphics/ilmbase \ libIlmImf.so:graphics/openexr \ libMagick++-6.so:graphics/ImageMagick6 \ @@ -23,8 +22,15 @@ LIB_DEPENDS= libHalf.so:graphics/ilmbase \ libsynfig.so:devel/synfig RUN_DEPENDS= xdg-open:devel/xdg-utils -USES= compiler:c++11-lang desktop-file-utils gmake gnome libtool \ - localbase pathfix pkgconfig shared-mime-info +PORTSCOUT= limitw:1,even + +USES= autoreconf compiler:c++11-lang desktop-file-utils \ + gmake gnome libtool localbase pathfix pkgconfig \ + shared-mime-info +USE_GITHUB= yes +GH_ACCOUNT= synfig +GH_PROJECT= synfig +WRKSRC_SUBDIR= synfig-studio USE_CXXSTD= c++11 USE_GNOME= gtkmm30 intltool GNU_CONFIGURE= yes @@ -42,15 +48,9 @@ JACK_CONFIGURE_ENABLE= jack NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -post-patch: - @${REINPLACE_CMD} -e \ - '/optimization_flags/s|CXXFLAGS=|#CXXFLAGS=| ; \ - /optimization_flags/s|CFLAGS=|#CFLAGS=|' \ - ${WRKSRC}/configure - post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for doc in AUTHORS ChangeLog INSTALL NEWS README TODO +.for doc in AUTHORS NEWS README TODO (cd ${WRKSRC} && ${INSTALL_DATA} ${doc} ${STAGEDIR}${DOCSDIR}) .endfor diff --git a/graphics/synfigstudio/distinfo b/graphics/synfigstudio/distinfo index 100ee533c445..6cb9ab6be626 100644 --- a/graphics/synfigstudio/distinfo +++ b/graphics/synfigstudio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1515222401 -SHA256 (synfigstudio-1.2.1.tar.gz) = 1a97875e0039895604085649bcd30cf0d6165f4c865299ca13d45d2dfbfab05d -SIZE (synfigstudio-1.2.1.tar.gz) = 5687045 +TIMESTAMP = 1576022739 +SHA256 (synfig-synfig-v1.2.2_GH0.tar.gz) = 7319e9ad62f3ae3e4c25875ac4965f3ecf72b96d8d435b42c91dcd6dd9b0e82d +SIZE (synfig-synfig-v1.2.2_GH0.tar.gz) = 11107386 diff --git a/graphics/synfigstudio/files/patch-73046ac b/graphics/synfigstudio/files/patch-73046ac new file mode 100644 index 000000000000..62e5cf019ad5 --- /dev/null +++ b/graphics/synfigstudio/files/patch-73046ac @@ -0,0 +1,59 @@ +--- src/gui/docks/dock_layers.cpp.orig 2018-09-14 06:35:52 UTC ++++ src/gui/docks/dock_layers.cpp +@@ -118,7 +118,12 @@ Dock_Layers::Dock_Layers(): + for(iter=category_map.begin();iter!=category_map.end();++iter) + { + layer_ui_info+=strprintf("<menu action='%s'>%s</menu>",iter->first.c_str(),iter->second.c_str()); +- action_group_categories->add(Gtk::Action::create(iter->first.c_str(),dgettext("synfig", iter->first.c_str()))); ++ //action_group_categories->add(Gtk::Action::create(iter->first.c_str(),dgettext("synfig", iter->first.c_str()))); ++ #ifdef ENABLE_NLS ++ action_group_categories->add(Gtk::Action::create(iter->first.c_str(), dgettext("synfig", iter->first.c_str()))); ++ #else ++ action_group_categories->add(Gtk::Action::create(iter->first.c_str(), iter->first.c_str())); ++ #endif + } + + App::ui_manager()->insert_action_group(action_group_categories); +--- src/synfigapp/action.cpp.orig 2018-09-14 06:35:52 UTC ++++ src/synfigapp/action.cpp +@@ -170,9 +170,10 @@ synfigapp::Action::Book *book_; + + /* === M E T H O D S ======================================================= */ + ++//be.local_name=dgettext("synfigstudio",x::local_name__); + #define ADD_ACTION(x) { BookEntry &be(book()[x::name__]); \ + be.name=x::name__; \ +- be.local_name=dgettext("synfigstudio",x::local_name__); \ ++ be.local_name=_(x::local_name__); \ + be.version=x::version__; \ + be.task=x::task__; \ + be.priority=x::priority__; \ +--- src/synfigapp/action.h.orig 2018-09-14 06:35:52 UTC ++++ src/synfigapp/action.h +@@ -60,9 +60,13 @@ + Action::Base* class::create() { return new class(); } \ + synfig::String class::get_name()const { return name__; } + ++//#define ACTION_INIT(class) \ ++// ACTION_INIT_NO_GET_LOCAL_NAME(class) \ ++// synfig::String class::get_local_name()const { return dgettext("synfigstudio",local_name__); } ++ + #define ACTION_INIT(class) \ + ACTION_INIT_NO_GET_LOCAL_NAME(class) \ +- synfig::String class::get_local_name()const { return dgettext("synfigstudio",local_name__); } ++ synfig::String class::get_local_name()const { return synfiggui_localize(local_name__); } + + /* === T Y P E D E F S ===================================================== */ + +--- src/synfigapp/localization.h.orig 2018-09-14 06:35:52 UTC ++++ src/synfigapp/localization.h +@@ -48,6 +48,9 @@ + + /* === C L A S S E S & S T R U C T S ======================================= */ + ++inline const char* synfiggui_localize(const char *x) ++ { return _(x); } ++ + /* === E N D =============================================================== */ + + #endif diff --git a/graphics/synfigstudio/files/patch-configure.ac b/graphics/synfigstudio/files/patch-configure.ac new file mode 100644 index 000000000000..d3dec91bec3e --- /dev/null +++ b/graphics/synfigstudio/files/patch-configure.ac @@ -0,0 +1,21 @@ +--- configure.ac.orig 2018-09-14 06:35:52 UTC ++++ configure.ac +@@ -33,7 +33,6 @@ AX_CXX_COMPILE_STDCXX_11([noext], [optional]) + AC_LANG([C++]) + + +-AC_ARG_OPTIMIZATION + AC_ARG_DEBUG + + case "$debug" in +@@ -75,10 +74,6 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKA + + LOCALEDIR=[${prefix}/${DATADIRNAME}/locale] + AC_SUBST(LOCALEDIR) +- +-AM_GNU_GETTEXT([external]) +-# This is here so autoreconf will run autopoint +-AM_GNU_GETTEXT_VERSION([0.15]) + + case "$host" in + *mingw* | *cygwin*) diff --git a/graphics/synfigstudio/pkg-descr b/graphics/synfigstudio/pkg-descr index 1c56695accd2..c96a50a241de 100644 --- a/graphics/synfigstudio/pkg-descr +++ b/graphics/synfigstudio/pkg-descr @@ -2,4 +2,4 @@ synfigstudio is the animation studio for synfig and provides the GUI interface to create synfig animations which are saved in synfig .sif format. -WWW: http://www.synfig.org/ +WWW: https://www.synfig.org/ diff --git a/graphics/synfigstudio/pkg-plist b/graphics/synfigstudio/pkg-plist index efe988ea0bfd..7d6c584099a5 100644 --- a/graphics/synfigstudio/pkg-plist +++ b/graphics/synfigstudio/pkg-plist @@ -46,6 +46,7 @@ include/synfigapp-0.0/synfigapp/layercopy.h include/synfigapp-0.0/synfigapp/layerduplicate.h include/synfigapp-0.0/synfigapp/layerembed.h include/synfigapp-0.0/synfigapp/layerencapsulate.h +include/synfigapp-0.0/synfigapp/layerencapsulatefilter.h include/synfigapp-0.0/synfigapp/layerencapsulateswitch.h include/synfigapp-0.0/synfigapp/layerextract.h include/synfigapp-0.0/synfigapp/layerfit.h @@ -125,8 +126,6 @@ lib/libsynfigapp.so.0.0.0 share/appdata/synfigstudio.appdata.xml share/applications/synfigstudio.desktop %%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO @@ -138,6 +137,7 @@ share/icons/hicolor/32x32/apps/synfig_icon.png share/icons/hicolor/48x48/apps/synfig_icon.png share/icons/hicolor/64x64/apps/synfig_icon.png share/icons/hicolor/scalable/apps/synfig_icon.svg +%%NLS%%share/locale/aa_DJ/LC_MESSAGES/synfigstudio.mo %%NLS%%share/locale/ar/LC_MESSAGES/synfigstudio.mo %%NLS%%share/locale/bs/LC_MESSAGES/synfigstudio.mo %%NLS%%share/locale/ca/LC_MESSAGES/synfigstudio.mo @@ -162,8 +162,10 @@ share/icons/hicolor/scalable/apps/synfig_icon.svg %%NLS%%share/locale/it/LC_MESSAGES/synfigstudio.mo %%NLS%%share/locale/ja/LC_MESSAGES/synfigstudio.mo %%NLS%%share/locale/ja_JP/LC_MESSAGES/synfigstudio.mo +%%NLS%%share/locale/kab/LC_MESSAGES/synfigstudio.mo %%NLS%%share/locale/lt/LC_MESSAGES/synfigstudio.mo %%NLS%%share/locale/lv/LC_MESSAGES/synfigstudio.mo +%%NLS%%share/locale/ne/LC_MESSAGES/synfigstudio.mo %%NLS%%share/locale/nl/LC_MESSAGES/synfigstudio.mo %%NLS%%share/locale/no_NO/LC_MESSAGES/synfigstudio.mo %%NLS%%share/locale/pl_PL/LC_MESSAGES/synfigstudio.mo |