Convert to C++11 as required by libsigc++.

7 files changed, 100 insertions, 5 deletions

diff --git a/multimedia/subtitleeditor/Makefile b/multimedia/subtitleeditor/Makefile
index 4468e479569..e68dbb031e3 100644
--- a/multimedia/subtitleeditor/Makefile
+++ b/multimedia/subtitleeditor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2015/04/25 14:23:41 tnn Exp $
+# $NetBSD: Makefile,v 1.32 2015/11/03 19:04:57 joerg Exp $
 #
 
 DISTNAME=		subtitleeditor-0.30.0
@@ -16,6 +16,8 @@ USE_TOOLS+=		gmake intltool pkg-config msgfmt
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 
+CXXFLAGS+=		-std=c++11
+
 BUILDLINK_API_DEPENDS.glibmm+=	glibmm>=2.16.3
 .include "../../devel/glibmm/buildlink3.mk"
 .include "../../devel/libglademm/buildlink3.mk"
diff --git a/multimedia/subtitleeditor/distinfo b/multimedia/subtitleeditor/distinfo
index 6446e5b424e..48b83102dad 100644
--- a/multimedia/subtitleeditor/distinfo
+++ b/multimedia/subtitleeditor/distinfo
@@ -1,10 +1,14 @@
-$NetBSD: distinfo,v 1.4 2012/05/07 00:04:17 dholland Exp $
+$NetBSD: distinfo,v 1.5 2015/11/03 19:04:57 joerg Exp $
 
 SHA1 (subtitleeditor-0.30.0.tar.gz) = bf1a2064b4c68bf21c05a095ad3f746b53da4ac8
 RMD160 (subtitleeditor-0.30.0.tar.gz) = 77cd4b22740453e986d35cbdd7335fbd5728149c
 Size (subtitleeditor-0.30.0.tar.gz) = 1094597 bytes
-SHA1 (patch-aa) = 7e133810acee32a8c46ce9899765a9931b935592
+SHA1 (patch-aa) = b78809f0e10b76fe298edb4b4c7f995e81ee5276
+SHA1 (patch-plugins_actions_documentmanagement_documentmanagement.cc) = e16a40abe9f4418d078a7505abb0688f782912f7
 SHA1 (patch-plugins_actions_findandreplace_findandreplace_cc) = 8861c1aab7e5fd4551af2019f28cc9e735fdcfdb
 SHA1 (patch-plugins_subtitleformats_advancedsubstationalpha_advancedsubstationalpha.cc) = 813f2890b4fb5ab8802ddb75d978b60b13c1a92e
 SHA1 (patch-plugins_subtitleformats_mpsub_mpsub.cc) = 49f23c5d1e6b8ad8fab687019280bfb2a932c3d3
 SHA1 (patch-plugins_subtitleformats_substationalpha_substationalpha.cc) = a806c0b86530144dedff2415af1df57a262715d3
+SHA1 (patch-src_subtitleview.cc) = f8f284dd8ba25c02a727f1171ffecc59c4115237
+SHA1 (patch-src_utility.h.diff) = ad9504d664d0dfe3883b578e59fab9f39e7ec0f3
+SHA1 (patch-src_vp_gstreamerplayer.cc) = 2c9625302adf02565c16a38e4b77a4d38e4db514
diff --git a/multimedia/subtitleeditor/patches/patch-aa b/multimedia/subtitleeditor/patches/patch-aa
index ade1c8ade44..bc56ad612dd 100644
--- a/multimedia/subtitleeditor/patches/patch-aa
+++ b/multimedia/subtitleeditor/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2009/02/21 14:47:58 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2015/11/03 19:04:57 joerg Exp $
 
---- configure.orig	2009-02-21 14:15:01.000000000 +0000
+--- configure.orig	2008-11-26 16:03:30.000000000 +0000
 +++ configure
 @@ -25653,8 +25653,8 @@ else
  $as_echo "no" >&6; }
@@ -13,3 +13,28 @@ $NetBSD: patch-aa,v 1.2 2009/02/21 14:47:58 wiz Exp $
  
  
  cat >>confdefs.h <<\_ACEOF
+@@ -27103,7 +27103,7 @@ fi
+ 
+ if test "$enable_debug" = "yes"; then
+   CXXFLAGS="$CXXFLAGS -DDEBUG -g"
+-  LDFLAGS="$LDFLAGS -g -ansi -Wall"
++  LDFLAGS="$LDFLAGS -g -Wall"
+ fi
+ 
+ # =========================================================================
+@@ -27119,13 +27119,13 @@ fi
+ 
+ if test "$enable_profile" = "yes"; then
+   CXXFLAGS="$CXXFLAGS -pg"
+-  LDFLAGS="$LDFLAGS -pg -ansi -Wall"
++  LDFLAGS="$LDFLAGS -pg -Wall"
+ fi
+ 
+ # =========================================================================
+ # gcc flags
+ 
+-CXXFLAGS="$CXXFLAGS -ansi -Wall" # -Wextra -Wconversion"
++CXXFLAGS="$CXXFLAGS -Wall" # -Wextra -Wconversion"
+ 
+ # =========================================================================
+ # make use of ccache
diff --git a/multimedia/subtitleeditor/patches/patch-plugins_actions_documentmanagement_documentmanagement.cc b/multimedia/subtitleeditor/patches/patch-plugins_actions_documentmanagement_documentmanagement.cc
new file mode 100644
index 00000000000..a60f4d8ae11
--- /dev/null
+++ b/multimedia/subtitleeditor/patches/patch-plugins_actions_documentmanagement_documentmanagement.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-plugins_actions_documentmanagement_documentmanagement.cc,v 1.1 2015/11/03 19:04:57 joerg Exp $
+
+--- plugins/actions/documentmanagement/documentmanagement.cc.orig	2015-11-03 12:10:06.000000000 +0000
++++ plugins/actions/documentmanagement/documentmanagement.cc
+@@ -167,7 +167,7 @@ public:
+ 
+ 		ui_id = ui->new_merge_id();
+ 
+-		#define ADD_UI(name)	ui->add_ui(ui_id, "/menubar/menu-file/"name, name, name);
++		#define ADD_UI(name)	ui->add_ui(ui_id, "/menubar/menu-file/" name, name, name);
+ 		
+ 		ADD_UI("new-document");
+ 		ADD_UI("open-document");
diff --git a/multimedia/subtitleeditor/patches/patch-src_subtitleview.cc b/multimedia/subtitleeditor/patches/patch-src_subtitleview.cc
new file mode 100644
index 00000000000..d4e35138676
--- /dev/null
+++ b/multimedia/subtitleeditor/patches/patch-src_subtitleview.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_subtitleview.cc,v 1.1 2015/11/03 19:04:57 joerg Exp $
+
+--- src/subtitleview.cc.orig	2015-11-03 11:47:27.000000000 +0000
++++ src/subtitleview.cc
+@@ -1393,7 +1393,7 @@ bool SubtitleView::on_key_press_event(Gd
+ 	{
+ 		int num;
+ 		std::istringstream ss(event->string);
+-		bool is_num = ss >> num != 0; 
++		bool is_num(ss >> num); 
+ 		// Update only if it's different
+ 		if(is_num != get_enable_search())
+ 			set_enable_search(is_num);
diff --git a/multimedia/subtitleeditor/patches/patch-src_utility.h.diff b/multimedia/subtitleeditor/patches/patch-src_utility.h.diff
new file mode 100644
index 00000000000..cac7e47bfbb
--- /dev/null
+++ b/multimedia/subtitleeditor/patches/patch-src_utility.h.diff
@@ -0,0 +1,16 @@
+--- multimedia/subtitleeditor/patches/patch-src_utility.h
++++ multimedia/subtitleeditor/patches/patch-src_utility.h
+@@ -0,0 +1,13 @@
++$NetBSD: patch-src_utility.h.diff,v 1.1 2015/11/03 19:04:57 joerg Exp $
++
++--- src/utility.h.orig	2015-11-03 11:44:20.000000000 +0000
+++++ src/utility.h
++@@ -88,7 +88,7 @@ bool from_string(const Glib::ustring &sr
++ 	std::istringstream s(src);
++ 	// return s >> dest != 0;
++ 
++-	bool state = s >> dest != 0;
+++	bool state(s >> dest);
++ 
++ 	if(!state)
++ 		se_debug_message(SE_DEBUG_UTILITY, "string:'%s'failed.", src.c_str());
diff --git a/multimedia/subtitleeditor/patches/patch-src_vp_gstreamerplayer.cc b/multimedia/subtitleeditor/patches/patch-src_vp_gstreamerplayer.cc
new file mode 100644
index 00000000000..e4a4049d2a3
--- /dev/null
+++ b/multimedia/subtitleeditor/patches/patch-src_vp_gstreamerplayer.cc
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_vp_gstreamerplayer.cc,v 1.1 2015/11/03 19:04:57 joerg Exp $
+
+--- src/vp/gstreamerplayer.cc.orig	2015-11-03 12:01:20.000000000 +0000
++++ src/vp/gstreamerplayer.cc
+@@ -513,7 +513,7 @@ GstElement* GStreamerPlayer::create_elem
+ 		return el;
+ 
+ 	// Error. Could not create element
+-	GST_ELEMENT_ERROR(m_pipeline, RESOURCE, NOT_FOUND, (msg_error.c_str()), (NULL));
++	GST_ELEMENT_ERROR(m_pipeline, RESOURCE, NOT_FOUND, ("%s", msg_error.c_str()), (NULL));
+ 	
+ 	return NULL;
+ }
+@@ -941,7 +941,7 @@ void GStreamerPlayer::on_bus_message_seg
+ 
+ 			gst_message_parse_segment_done(msg, &fmt, &position);
+ 
+-			se_debug_message(SE_DEBUG_VIDEO_PLAYER, "end of segment at %"GST_TIME_FORMAT, GST_TIME_ARGS(position));
++			se_debug_message(SE_DEBUG_VIDEO_PLAYER, "end of segment at %" GST_TIME_FORMAT, GST_TIME_ARGS(position));
+ 		}
+ 
+ 		// subtitle times