Index: branches/2017Q2/multimedia/subtitleeditor/Makefile =================================================================== --- branches/2017Q2/multimedia/subtitleeditor/Makefile (revision 439176) +++ branches/2017Q2/multimedia/subtitleeditor/Makefile (revision 439177) @@ -1,39 +1,40 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= subtitleeditor PORTVERSION= 0.41.1 CATEGORIES= multimedia MASTER_SITES= http://download.gna.org/${PORTNAME}/${PORTVERSION:C/\.[0-9]*$//}/ MAINTAINER= multimedia@FreeBSD.org COMMENT= Subtitle editor LICENSE= GPLv3 BUILD_DEPENDS= iso-codes>0:misc/iso-codes LIB_DEPENDS= libglademm-2.4.so:devel/libglademm24 \ libpcre.so:devel/pcre \ libenchant.so:textproc/enchant RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= desktop-file-utils gettext gmake libtool pkgconfig +USES= compiler:c++11-lang desktop-file-utils gettext gmake libtool pkgconfig USE_GNOME= gtkmm24 intltool USE_GSTREAMER= good mm GNU_CONFIGURE= yes INSTALL_TARGET= install-strip INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include +CXXFLAGS+= -std=c++11 LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= NLS OPENGL OPTIONS_SUB= yes NLS_CONFIGURE_OFF= --disable-nls OPENGL_LIB_DEPENDS= libgtkglextmm-x11-1.2.so:x11-toolkits/gtkglextmm OPENGL_USE= gl=glu OPENGL_CONFIGURE_ENABLE=gl .include Index: branches/2017Q2/multimedia/subtitleeditor/files/patch-plugins_actions_documentmanagement_documentmanagement.cc =================================================================== --- branches/2017Q2/multimedia/subtitleeditor/files/patch-plugins_actions_documentmanagement_documentmanagement.cc (nonexistent) +++ branches/2017Q2/multimedia/subtitleeditor/files/patch-plugins_actions_documentmanagement_documentmanagement.cc (revision 439177) @@ -0,0 +1,15 @@ +--- plugins/actions/documentmanagement/documentmanagement.cc.orig 2014-02-12 22:02:56 UTC ++++ plugins/actions/documentmanagement/documentmanagement.cc +@@ -177,9 +177,9 @@ public: + + ui_id = ui->new_merge_id(); + +- #define ADD_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/"name, name, name); +- #define ADD_OPEN_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-open/"name, name, name); +- #define ADD_SAVE_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-save/"name, name, name); ++ #define ADD_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/" name, name, name); ++ #define ADD_OPEN_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-open/" name, name, name); ++ #define ADD_SAVE_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-save/" name, name, name); + + ADD_UI("new-document"); + ADD_OPEN_UI("open-document"); Property changes on: branches/2017Q2/multimedia/subtitleeditor/files/patch-plugins_actions_documentmanagement_documentmanagement.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q2/multimedia/subtitleeditor/files/patch-plugins_actions_insertsubtitlefromkeyframe_insertsubtitlefromkeyframe.cc =================================================================== --- branches/2017Q2/multimedia/subtitleeditor/files/patch-plugins_actions_insertsubtitlefromkeyframe_insertsubtitlefromkeyframe.cc (nonexistent) +++ branches/2017Q2/multimedia/subtitleeditor/files/patch-plugins_actions_insertsubtitlefromkeyframe_insertsubtitlefromkeyframe.cc (revision 439177) @@ -0,0 +1,11 @@ +--- plugins/actions/insertsubtitlefromkeyframe/insertsubtitlefromkeyframe.cc.orig 2014-02-12 22:02:55 UTC ++++ plugins/actions/insertsubtitlefromkeyframe/insertsubtitlefromkeyframe.cc +@@ -103,7 +103,7 @@ public: + se_debug(SE_DEBUG_PLUGINS); + + bool has_doc = (get_current_document() != NULL); +- bool has_kf = (player()->get_keyframes()); ++ bool has_kf = static_cast(player()->get_keyframes()); + bool has_media = player()->get_state() != Player::NONE; + + action_group->get_action("insert-subtitle-between-keyframes")->set_sensitive(has_doc && has_kf && has_media); Property changes on: branches/2017Q2/multimedia/subtitleeditor/files/patch-plugins_actions_insertsubtitlefromkeyframe_insertsubtitlefromkeyframe.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q2/multimedia/subtitleeditor/files/patch-plugins_actions_keyframesmanagement_keyframesmanagement.cc =================================================================== --- branches/2017Q2/multimedia/subtitleeditor/files/patch-plugins_actions_keyframesmanagement_keyframesmanagement.cc (nonexistent) +++ branches/2017Q2/multimedia/subtitleeditor/files/patch-plugins_actions_keyframesmanagement_keyframesmanagement.cc (revision 439177) @@ -0,0 +1,11 @@ +--- plugins/actions/keyframesmanagement/keyframesmanagement.cc.orig 2014-02-12 22:02:57 UTC ++++ plugins/actions/keyframesmanagement/keyframesmanagement.cc +@@ -223,7 +223,7 @@ public: + se_debug(SE_DEBUG_PLUGINS); + + bool has_doc = (get_current_document() != NULL); +- bool has_kf = (player()->get_keyframes()); ++ bool has_kf = static_cast(player()->get_keyframes()); + bool has_media = player()->get_state() != Player::NONE; + + #define SET_SENSITIVE(action, state) { Glib::RefPtr act = action_group->get_action(action); if(act) act->set_sensitive(state); else g_warning(action); } Property changes on: branches/2017Q2/multimedia/subtitleeditor/files/patch-plugins_actions_keyframesmanagement_keyframesmanagement.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q2/multimedia/subtitleeditor/files/patch-plugins_subtitleformats_sami_sami.cc =================================================================== --- branches/2017Q2/multimedia/subtitleeditor/files/patch-plugins_subtitleformats_sami_sami.cc (nonexistent) +++ branches/2017Q2/multimedia/subtitleeditor/files/patch-plugins_subtitleformats_sami_sami.cc (revision 439177) @@ -0,0 +1,11 @@ +--- plugins/subtitleformats/sami/sami.cc.orig 2014-02-12 22:02:58 UTC ++++ plugins/subtitleformats/sami/sami.cc +@@ -263,7 +263,7 @@ public: + { + inptr = (char *)(line.c_str()); + p = tmptext; +- p = '\0'; ++ *p = '\0'; + + state = SAMI_STATE_INIT; + continue; Property changes on: branches/2017Q2/multimedia/subtitleeditor/files/patch-plugins_subtitleformats_sami_sami.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q2/multimedia/subtitleeditor/files/patch-src_subtitleview.cc =================================================================== --- branches/2017Q2/multimedia/subtitleeditor/files/patch-src_subtitleview.cc (nonexistent) +++ branches/2017Q2/multimedia/subtitleeditor/files/patch-src_subtitleview.cc (revision 439177) @@ -0,0 +1,11 @@ +--- src/subtitleview.cc.orig 2014-02-12 22:02:59 UTC ++++ src/subtitleview.cc +@@ -1370,7 +1370,7 @@ bool SubtitleView::on_key_press_event(Gd + { + int num; + std::istringstream ss(event->string); +- bool is_num = ss >> num != 0; ++ bool is_num = static_cast(ss >> num); + // Update only if it's different + if(is_num != get_enable_search()) + set_enable_search(is_num); Property changes on: branches/2017Q2/multimedia/subtitleeditor/files/patch-src_subtitleview.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q2/multimedia/subtitleeditor/files/patch-src_utility.h =================================================================== --- branches/2017Q2/multimedia/subtitleeditor/files/patch-src_utility.h (nonexistent) +++ branches/2017Q2/multimedia/subtitleeditor/files/patch-src_utility.h (revision 439177) @@ -0,0 +1,20 @@ +--- src/utility.h.orig 2014-02-12 22:03:00 UTC ++++ src/utility.h +@@ -72,7 +72,7 @@ bool from_string(const std::string &src, + std::istringstream s(src); + // return s >> dest != 0; + +- bool state = s >> dest != 0; ++ bool state = static_cast(s >> dest); + + if(!state) + se_debug_message(SE_DEBUG_UTILITY, "string:'%s'failed.", src.c_str()); +@@ -92,7 +92,7 @@ bool from_string(const Glib::ustring &sr + std::istringstream s(src); + // return s >> dest != 0; + +- bool state = s >> dest != 0; ++ bool state = static_cast(s >> dest); + + if(!state) + se_debug_message(SE_DEBUG_UTILITY, "string:'%s'failed.", src.c_str()); Property changes on: branches/2017Q2/multimedia/subtitleeditor/files/patch-src_utility.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q2/multimedia/subtitleeditor/files/patch-src_vp_gstplayer.cc =================================================================== --- branches/2017Q2/multimedia/subtitleeditor/files/patch-src_vp_gstplayer.cc (nonexistent) +++ branches/2017Q2/multimedia/subtitleeditor/files/patch-src_vp_gstplayer.cc (revision 439177) @@ -0,0 +1,11 @@ +--- src/vp/gstplayer.cc.orig 2014-02-12 22:02:59 UTC ++++ src/vp/gstplayer.cc +@@ -261,7 +261,7 @@ bool GstPlayer::seek(long start, long en + gint64 gend = end * Gst::MILLI_SECOND; + + se_debug_message(SE_DEBUG_VIDEO_PLAYER, +- "pipeline->seek(%" GST_TIME_FORMAT", %"GST_TIME_FORMAT")", ++ "pipeline->seek(%" GST_TIME_FORMAT", %" GST_TIME_FORMAT")", + GST_TIME_ARGS(gstart), GST_TIME_ARGS(gend)); + + bool ret = m_pipeline->seek( Property changes on: branches/2017Q2/multimedia/subtitleeditor/files/patch-src_vp_gstplayer.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q2 =================================================================== --- branches/2017Q2 (revision 439176) +++ branches/2017Q2 (revision 439177) Property changes on: branches/2017Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r439176