diff --git a/editors/subtitleeditor/Makefile b/editors/subtitleeditor/Makefile index 8e003c7db4c..8c0bf443e46 100644 --- a/editors/subtitleeditor/Makefile +++ b/editors/subtitleeditor/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2011/12/03 19:49:45 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.23 2012/02/16 22:20:26 ajacoutot Exp $ ONLY_FOR_ARCHS= ${GCC4_ARCHS} @@ -6,9 +6,8 @@ SHARED_ONLY= Yes COMMENT= GTK+2 subtitles editor -V= 0.37.1 +V= 0.39.0 DISTNAME= subtitleeditor-${V} -REVISION= 2 CATEGORIES= graphics editors @@ -22,30 +21,29 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= http://download.gna.org/subtitleeditor/${V:R}/ +WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes +WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 atkmm-1.6 +WANTLIB += c cairo cairomm-1.0 drm enchant expat ffi fontconfig +WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gdkmm-2.4 gio-2.0 +WANTLIB += giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0 +WANTLIB += gstaudio-0.10 gstbase-0.10 gstcdda-0.10 gstcontroller-0.10 +WANTLIB += gstdataprotocol-0.10 gstinterfaces-0.10 gstnet-0.10 +WANTLIB += gstnetbuffer-0.10 gstpbutils-0.10 gstreamer-0.10 gstreamermm-0.10 +WANTLIB += gstrtp-0.10 gsttag-0.10 gstvideo-0.10 gthread-2.0 gtk-x11-2.0 +WANTLIB += gtkmm-2.4 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4 +WANTLIB += pcre pixman-1 png pthread pthread-stubs sigc-2.0 stdc++ +WANTLIB += xcb xcb-render xcb-shm xml++-2.6 xml2 z -WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes -WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 atkmm-1.6 c cairo -WANTLIB += cairomm-1.0 expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 -WANTLIB += gdkmm-2.4 gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 -WANTLIB += gmodule-2.0 gobject-2.0 gstbase-0.10 gstreamer-0.10 -WANTLIB += gthread-2.0 gtk-x11-2.0 gtkmm-2.4 m pango-1.0 pangocairo-1.0 -WANTLIB += pangoft2-1.0 pangomm-1.4 pixman-1 png pthread sigc-2.0 -WANTLIB += xml2 z pthread-stubs xcb xcb-render gstnet-0.10 xcb-shm -WANTLIB += pcre enchant xml++-2.6 gstaudio-0.10 gsttag-0.10 -WANTLIB += gstinterfaces-0.10 gstvideo-0.10 gstpbutils-0.10 -WANTLIB += GL Xxf86vm drm gstcontroller-0.10 gstdataprotocol-0.10 -WANTLIB += gstreamermm-0.10 gstcdda-0.10 gstnetbuffer-0.10 gstrtp-0.10 -WANTLIB += stdc++ +MASTER_SITES= http://download.gna.org/subtitleeditor/${V:R}/ BUILD_DEPENDS= multimedia/gstreamer-0.10/plugins-good \ devel/iso-codes -LIB_DEPENDS= devel/pcre>=6.4p2 \ - textproc/enchant \ +LIB_DEPENDS= textproc/enchant \ multimedia/gstreamer-0.10/mm \ multimedia/gstreamer-0.10/plugins-base \ x11/gtk2mm RUN_DEPENDS= multimedia/gstreamer-0.10/plugins-good \ + multimedia/gstreamer-0.10/plugins-ffmpeg \ devel/iso-codes \ devel/desktop-file-utils \ x11/gtk+2,-guic diff --git a/editors/subtitleeditor/distinfo b/editors/subtitleeditor/distinfo index b7b44f0cb96..d557daca5ce 100644 --- a/editors/subtitleeditor/distinfo +++ b/editors/subtitleeditor/distinfo @@ -1,5 +1,5 @@ -MD5 (subtitleeditor-0.37.1.tar.gz) = zETyy0YWTgthw4/j0b7ysw== -RMD160 (subtitleeditor-0.37.1.tar.gz) = f0OcI3U1/vCFfLUYDOuEQhMi8nk= -SHA1 (subtitleeditor-0.37.1.tar.gz) = Nrg5lCxSpn8Uu7H9XWmNsmRVQ8o= -SHA256 (subtitleeditor-0.37.1.tar.gz) = JgF1D+M1KeT+yF9CIWXH8057h/YZclwRoaITWxQwbd8= -SIZE (subtitleeditor-0.37.1.tar.gz) = 1325186 +MD5 (subtitleeditor-0.39.0.tar.gz) = F2ZuZS7dJ6v9MQSoI4X2qA== +RMD160 (subtitleeditor-0.39.0.tar.gz) = fh2a2BHXJDbwDuwrh2eei7Mku1s= +SHA1 (subtitleeditor-0.39.0.tar.gz) = QEkWd7TxKQfcMgGbyMUR11B+wXE= +SHA256 (subtitleeditor-0.39.0.tar.gz) = Fo5/cQeVF+i2nZZX2qx1L7chbnzYEio+oN/H04XSnDk= +SIZE (subtitleeditor-0.39.0.tar.gz) = 1360273 diff --git a/editors/subtitleeditor/patches/patch-plugins_actions_documentsnavigation_documentsnavigation_cc b/editors/subtitleeditor/patches/patch-plugins_actions_documentsnavigation_documentsnavigation_cc new file mode 100644 index 00000000000..dcec6fb49ba --- /dev/null +++ b/editors/subtitleeditor/patches/patch-plugins_actions_documentsnavigation_documentsnavigation_cc @@ -0,0 +1,33 @@ +$OpenBSD: patch-plugins_actions_documentsnavigation_documentsnavigation_cc,v 1.1 2012/02/16 22:20:26 ajacoutot Exp $ + +https://gna.org/support/?2743 + +--- plugins/actions/documentsnavigation/documentsnavigation.cc.orig Mon Jan 30 19:34:17 2012 ++++ plugins/actions/documentsnavigation/documentsnavigation.cc Mon Jan 30 19:34:38 2012 +@@ -55,22 +55,22 @@ class DocumentsNavigationPlugin : public Action (publi + action_group->add( + Gtk::Action::create("documentsnavigation-first-document", Gtk::Stock::GOTO_FIRST, _("_First Document")), + sigc::bind( +- sigc::mem_fun(*this, &DocumentsNavigationPlugin::on_select_document), FIRST)); ++ sigc::mem_fun(*this, &DocumentsNavigationPlugin::on_select_document), (int)FIRST)); + + action_group->add( + Gtk::Action::create("documentsnavigation-last-document", Gtk::Stock::GOTO_LAST, _("_Last Document")), + sigc::bind( +- sigc::mem_fun(*this, &DocumentsNavigationPlugin::on_select_document), LAST)); ++ sigc::mem_fun(*this, &DocumentsNavigationPlugin::on_select_document), (int)LAST)); + + action_group->add( + Gtk::Action::create("documentsnavigation-previous-document", Gtk::Stock::GO_BACK, _("_Previous Document")), + sigc::bind( +- sigc::mem_fun(*this, &DocumentsNavigationPlugin::on_select_document), PREVIOUS)); ++ sigc::mem_fun(*this, &DocumentsNavigationPlugin::on_select_document), (int)PREVIOUS)); + + action_group->add( + Gtk::Action::create("documentsnavigation-next-document", Gtk::Stock::GO_FORWARD, _("_Next Document")), + sigc::bind( +- sigc::mem_fun(*this, &DocumentsNavigationPlugin::on_select_document), NEXT)); ++ sigc::mem_fun(*this, &DocumentsNavigationPlugin::on_select_document), (int)NEXT)); + + // ui + Glib::RefPtr ui = get_ui_manager(); diff --git a/editors/subtitleeditor/patches/patch-src_cfg_cc b/editors/subtitleeditor/patches/patch-src_cfg_cc deleted file mode 100644 index c0d8dd3289e..00000000000 --- a/editors/subtitleeditor/patches/patch-src_cfg_cc +++ /dev/null @@ -1,24 +0,0 @@ -$OpenBSD: patch-src_cfg_cc,v 1.1 2009/10/14 21:47:20 ajacoutot Exp $ ---- src/cfg.cc.orig Tue Oct 13 12:49:32 2009 -+++ src/cfg.cc Tue Oct 13 12:47:13 2009 -@@ -737,7 +737,8 @@ Glib::ustring Config::get_value_string(const Glib::ust - - bool state = get_value_string(group, key, value); - -- g_return_val_if_fail(state, Glib::ustring()); -+ Glib::ustring t; -+ g_return_val_if_fail(state, t); - - return value; - } -@@ -750,8 +751,8 @@ Color Config::get_value_color(const Glib::ustring &gro - Color value; - - bool state = get_value_color(group, key, value); -- -- g_return_val_if_fail(state, Color()); -+ Color c; -+ g_return_val_if_fail(state, c); - - return value; - } diff --git a/editors/subtitleeditor/patches/patch-src_extension_action_cc b/editors/subtitleeditor/patches/patch-src_extension_action_cc deleted file mode 100644 index 9699584188f..00000000000 --- a/editors/subtitleeditor/patches/patch-src_extension_action_cc +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_extension_action_cc,v 1.1 2009/10/14 21:47:20 ajacoutot Exp $ ---- src/extension/action.cc.orig Tue Oct 13 12:51:09 2009 -+++ src/extension/action.cc Tue Oct 13 12:52:26 2009 -@@ -86,8 +86,8 @@ Glib::RefPtr Action::get_ui_manager() - se_debug(SE_DEBUG_PLUGINS); - - SubtitleEditorWindow *window = SubtitleEditorWindow::get_instance(); -- -- g_return_val_if_fail(window, Glib::RefPtr()); -+ Glib::RefPtr ref; -+ g_return_val_if_fail(window, ref); - - return window->get_ui_manager(); - } diff --git a/editors/subtitleeditor/patches/patch-src_extensionmanager_cc b/editors/subtitleeditor/patches/patch-src_extensionmanager_cc deleted file mode 100644 index 29a4c69225c..00000000000 --- a/editors/subtitleeditor/patches/patch-src_extensionmanager_cc +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_extensionmanager_cc,v 1.1 2009/10/14 21:47:20 ajacoutot Exp $ ---- src/extensionmanager.cc.orig Tue Oct 13 15:23:57 2009 -+++ src/extensionmanager.cc Tue Oct 13 15:23:19 2009 -@@ -458,8 +458,8 @@ void ExtensionManager::open_module(ExtensionInfo *info - } - - //Fix: bug #12651 : 0.30.0 build error -- //ExtensionRegisterFunc extension_register = (ExtensionRegisterFunc)func; -- ExtensionRegisterFunc extension_register = reinterpret_cast(func); -+ ExtensionRegisterFunc extension_register = (ExtensionRegisterFunc)func; -+ //ExtensionRegisterFunc extension_register = reinterpret_cast(func); - - if(extension_register == NULL) - throw SubtitleError("reinterpret from the function to the ExtensionRegisterFunc failed"); diff --git a/editors/subtitleeditor/pkg/PLIST b/editors/subtitleeditor/pkg/PLIST index ce7a033fa9b..5f11b49ff2f 100644 --- a/editors/subtitleeditor/pkg/PLIST +++ b/editors/subtitleeditor/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2011/12/03 19:49:45 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.7 2012/02/16 22:20:26 ajacoutot Exp $ @bin bin/subtitleeditor lib/libsubtitleeditor.la @lib lib/libsubtitleeditor.so.${LIBsubtitleeditor_VERSION} @@ -23,6 +23,8 @@ lib/subtitleeditor/plugins/actions/libconfigurekeyboardshortcuts.so lib/subtitleeditor/plugins/actions/libdialoguize.so @comment lib/subtitleeditor/plugins/actions/libdocumentmanagement.la lib/subtitleeditor/plugins/actions/libdocumentmanagement.so +@comment lib/subtitleeditor/plugins/actions/libdocumentsnavigation.la +lib/subtitleeditor/plugins/actions/libdocumentsnavigation.so @comment lib/subtitleeditor/plugins/actions/libduplicatesubtitle.la lib/subtitleeditor/plugins/actions/libduplicatesubtitle.so @comment lib/subtitleeditor/plugins/actions/libeditcell.la @@ -37,6 +39,8 @@ lib/subtitleeditor/plugins/actions/libexternalvideoplayer.so lib/subtitleeditor/plugins/actions/libfindandreplace.so @comment lib/subtitleeditor/plugins/actions/libinsertsubtitle.la lib/subtitleeditor/plugins/actions/libinsertsubtitle.so +@comment lib/subtitleeditor/plugins/actions/libinsertsubtitlefromkeyframe.la +lib/subtitleeditor/plugins/actions/libinsertsubtitlefromkeyframe.so @comment lib/subtitleeditor/plugins/actions/libitalicize.la lib/subtitleeditor/plugins/actions/libitalicize.so @comment lib/subtitleeditor/plugins/actions/libjoindocument.la @@ -98,6 +102,8 @@ lib/subtitleeditor/plugins/subtitleformats/libmicrodvd.so lib/subtitleeditor/plugins/subtitleformats/libmpl2.so @comment lib/subtitleeditor/plugins/subtitleformats/libmpsub.la lib/subtitleeditor/plugins/subtitleformats/libmpsub.so +@comment lib/subtitleeditor/plugins/subtitleformats/libsami.la +lib/subtitleeditor/plugins/subtitleformats/libsami.so @comment lib/subtitleeditor/plugins/subtitleformats/libsbv.la lib/subtitleeditor/plugins/subtitleformats/libsbv.so @comment lib/subtitleeditor/plugins/subtitleformats/libsprucestl.la @@ -158,6 +164,7 @@ share/subtitleeditor/plugins-description/actions/command.se-plugin share/subtitleeditor/plugins-description/actions/configurekeyboardshortcuts.se-plugin share/subtitleeditor/plugins-description/actions/dialoguize.se-plugin share/subtitleeditor/plugins-description/actions/documentmanagement.se-plugin +share/subtitleeditor/plugins-description/actions/documentsnavigation.se-plugin share/subtitleeditor/plugins-description/actions/duplicatesubtitle.se-plugin share/subtitleeditor/plugins-description/actions/editcell.se-plugin share/subtitleeditor/plugins-description/actions/errorchecking.se-plugin @@ -165,6 +172,7 @@ share/subtitleeditor/plugins-description/actions/extendlength.se-plugin share/subtitleeditor/plugins-description/actions/externalvideoplayer.se-plugin share/subtitleeditor/plugins-description/actions/findandreplace.se-plugin share/subtitleeditor/plugins-description/actions/insertsubtitle.se-plugin +share/subtitleeditor/plugins-description/actions/insertsubtitlefromkeyframe.se-plugin share/subtitleeditor/plugins-description/actions/italicize.se-plugin share/subtitleeditor/plugins-description/actions/joindocument.se-plugin share/subtitleeditor/plugins-description/actions/keyframesmanagement.se-plugin @@ -196,6 +204,7 @@ share/subtitleeditor/plugins-description/subtitleformats/bitc.se-plugin share/subtitleeditor/plugins-description/subtitleformats/microdvd.se-plugin share/subtitleeditor/plugins-description/subtitleformats/mpl2.se-plugin share/subtitleeditor/plugins-description/subtitleformats/mpsub.se-plugin +share/subtitleeditor/plugins-description/subtitleformats/sami.se-plugin share/subtitleeditor/plugins-description/subtitleformats/sbv.se-plugin share/subtitleeditor/plugins-description/subtitleformats/sprucestl.se-plugin share/subtitleeditor/plugins-description/subtitleformats/subrip.se-plugin @@ -204,6 +213,8 @@ share/subtitleeditor/plugins-description/subtitleformats/subtitleeditorproject.s share/subtitleeditor/plugins-description/subtitleformats/subviewer2.se-plugin share/subtitleeditor/plugins-description/subtitleformats/timedtextauthoringformat1.se-plugin share/subtitleeditor/plugins-share/ +share/subtitleeditor/plugins-share/advancedsubstationalpha/ +share/subtitleeditor/plugins-share/advancedsubstationalpha/dialog-advancedsubstationalpha-preferences.ui share/subtitleeditor/plugins-share/bitc/ share/subtitleeditor/plugins-share/changeframerate/ share/subtitleeditor/plugins-share/changeframerate/dialog-change-framerate.ui @@ -228,6 +239,8 @@ share/subtitleeditor/plugins-share/splitdocument/ share/subtitleeditor/plugins-share/splitdocument/dialog-split-document.ui share/subtitleeditor/plugins-share/styleeditor/ share/subtitleeditor/plugins-share/styleeditor/dialog-style-editor.ui +share/subtitleeditor/plugins-share/substationalpha/ +share/subtitleeditor/plugins-share/substationalpha/dialog-substationalpha-preferences.ui share/subtitleeditor/plugins-share/textcorrection/ share/subtitleeditor/plugins-share/textcorrection/Latn-en-US.common-error.se-pattern share/subtitleeditor/plugins-share/textcorrection/Latn-en.capitalization.se-pattern