Date: Sat, 22 Apr 2017 14:44:11 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r439176 - in head/multimedia/subtitleeditor: . files Message-ID: <201704221444.v3MEiB22033509@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sat Apr 22 14:44:11 2017 New Revision: 439176 URL: https://svnweb.freebsd.org/changeset/ports/439176 Log: Fix build after dependencies enforce C++11 MFH: 2017Q2 (build fix blanket) Added: head/multimedia/subtitleeditor/files/ head/multimedia/subtitleeditor/files/patch-plugins_actions_documentmanagement_documentmanagement.cc (contents, props changed) head/multimedia/subtitleeditor/files/patch-plugins_actions_insertsubtitlefromkeyframe_insertsubtitlefromkeyframe.cc (contents, props changed) head/multimedia/subtitleeditor/files/patch-plugins_actions_keyframesmanagement_keyframesmanagement.cc (contents, props changed) head/multimedia/subtitleeditor/files/patch-plugins_subtitleformats_sami_sami.cc (contents, props changed) head/multimedia/subtitleeditor/files/patch-src_subtitleview.cc (contents, props changed) head/multimedia/subtitleeditor/files/patch-src_utility.h (contents, props changed) head/multimedia/subtitleeditor/files/patch-src_vp_gstplayer.cc (contents, props changed) Modified: head/multimedia/subtitleeditor/Makefile Modified: head/multimedia/subtitleeditor/Makefile ============================================================================== --- head/multimedia/subtitleeditor/Makefile Sat Apr 22 14:42:02 2017 (r439175) +++ head/multimedia/subtitleeditor/Makefile Sat Apr 22 14:44:11 2017 (r439176) @@ -17,7 +17,7 @@ LIB_DEPENDS= libglademm-2.4.so:devel/lib 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 @@ -25,6 +25,7 @@ INSTALL_TARGET= install-strip INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include +CXXFLAGS+= -std=c++11 LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= NLS OPENGL Added: head/multimedia/subtitleeditor/files/patch-plugins_actions_documentmanagement_documentmanagement.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/subtitleeditor/files/patch-plugins_actions_documentmanagement_documentmanagement.cc Sat Apr 22 14:44:11 2017 (r439176) @@ -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"); Added: head/multimedia/subtitleeditor/files/patch-plugins_actions_insertsubtitlefromkeyframe_insertsubtitlefromkeyframe.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/subtitleeditor/files/patch-plugins_actions_insertsubtitlefromkeyframe_insertsubtitlefromkeyframe.cc Sat Apr 22 14:44:11 2017 (r439176) @@ -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<bool>(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); Added: head/multimedia/subtitleeditor/files/patch-plugins_actions_keyframesmanagement_keyframesmanagement.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/subtitleeditor/files/patch-plugins_actions_keyframesmanagement_keyframesmanagement.cc Sat Apr 22 14:44:11 2017 (r439176) @@ -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<bool>(player()->get_keyframes()); + bool has_media = player()->get_state() != Player::NONE; + + #define SET_SENSITIVE(action, state) { Glib::RefPtr<Gtk::Action> act = action_group->get_action(action); if(act) act->set_sensitive(state); else g_warning(action); } Added: head/multimedia/subtitleeditor/files/patch-plugins_subtitleformats_sami_sami.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/subtitleeditor/files/patch-plugins_subtitleformats_sami_sami.cc Sat Apr 22 14:44:11 2017 (r439176) @@ -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; Added: head/multimedia/subtitleeditor/files/patch-src_subtitleview.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/subtitleeditor/files/patch-src_subtitleview.cc Sat Apr 22 14:44:11 2017 (r439176) @@ -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<bool>(ss >> num); + // Update only if it's different + if(is_num != get_enable_search()) + set_enable_search(is_num); Added: head/multimedia/subtitleeditor/files/patch-src_utility.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/subtitleeditor/files/patch-src_utility.h Sat Apr 22 14:44:11 2017 (r439176) @@ -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<bool>(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<bool>(s >> dest); + + if(!state) + se_debug_message(SE_DEBUG_UTILITY, "string:'%s'failed.", src.c_str()); Added: head/multimedia/subtitleeditor/files/patch-src_vp_gstplayer.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/subtitleeditor/files/patch-src_vp_gstplayer.cc Sat Apr 22 14:44:11 2017 (r439176) @@ -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(
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704221444.v3MEiB22033509>