[packages/subtitleeditor] - up to 0.53.0

baggins baggins at pld-linux.org
Sun Apr 16 16:52:38 CEST 2017


commit bdc8f075d2a1f3c53d344d760487f9ee6332bf8d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Apr 16 16:52:27 2017 +0200

    - up to 0.53.0

 gstreamermm-1.8.patch       | 40 ++++++++++++++++++++++++++++++++++++++++
 subtitleeditor-flags.patch  | 27 ---------------------------
 subtitleeditor-format.patch | 15 ---------------
 subtitleeditor-gcc.patch    | 32 --------------------------------
 subtitleeditor.spec         | 22 +++++++---------------
 5 files changed, 47 insertions(+), 89 deletions(-)
---
diff --git a/subtitleeditor.spec b/subtitleeditor.spec
index ebe801d..893cc62 100644
--- a/subtitleeditor.spec
+++ b/subtitleeditor.spec
@@ -5,15 +5,14 @@
 Summary:	GTK+ tool to edit subtitles
 Summary(pl.UTF-8):	Narzędzie napisane w GTK+ do edycji napisów
 Name:		subtitleeditor
-Version:	0.52.1
-Release:	2
+Version:	0.53.0
+Release:	1
 License:	GPL v3+
 Group:		X11/Applications
-Source0:	http://download.gna.org/subtitleeditor/0.52/%{name}-%{version}.tar.gz
-# Source0-md5:	d25a3f6966f4d6355485d3dfbcfb437a
-Patch0:		%{name}-flags.patch
-Patch1:		%{name}-format.patch
-Patch2:		%{name}-gcc.patch
+Source0:	http://download.gna.org/subtitleeditor/0.53/%{name}-%{version}.tar.gz
+# Source0-md5:	bcd3ce93a4759ed3f99a56dc7e4c4e00
+Patch0:		%{name}-format.patch
+Patch1:		gstreamermm-1.8.patch
 URL:		http://home.gna.org/subtitleeditor/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -57,16 +56,8 @@ Subtitle Editor jest narzędziem napisanym w GTK+ do edycji napisów.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-CXXFLAGS="%{rpmcxxflags} -std=c++0x"
 %configure \
 	--disable-debug \
 	%{?with_opengl:--enable-gl}
@@ -145,6 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/plugins/actions/libsplitsubtitle.so
 %attr(755,root,root) %{_libdir}/%{name}/plugins/actions/libstyleeditor.so
 %attr(755,root,root) %{_libdir}/%{name}/plugins/actions/libstylize.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/actions/libtemplate.so
 %attr(755,root,root) %{_libdir}/%{name}/plugins/actions/libtextcorrection.so
 %attr(755,root,root) %{_libdir}/%{name}/plugins/actions/libtimemodemanagement.so
 %attr(755,root,root) %{_libdir}/%{name}/plugins/actions/libtimingfromplayer.so
diff --git a/gstreamermm-1.8.patch b/gstreamermm-1.8.patch
new file mode 100644
index 0000000..a484a53
--- /dev/null
+++ b/gstreamermm-1.8.patch
@@ -0,0 +1,40 @@
+--- trunk/plugins/actions/keyframesmanagement/mediadecoder.h	2014/01/26 16:03:30	855
++++ trunk/plugins/actions/keyframesmanagement/mediadecoder.h	2016/10/16 09:36:00	982
+@@ -200,7 +200,7 @@
+ 	{
+ 		check_missing_plugins();
+ 		
+-		Glib::ustring error = (msg) ? msg->parse().what() : Glib::ustring();
++		Glib::ustring error = (msg) ? Glib::ustring(msg->parse_debug()) : Glib::ustring();
+ 		
+ 		dialog_error(_("Media file could not be played.\n"), error);
+ 		// Critical error, cancel the work.
+@@ -214,7 +214,7 @@
+ 	{
+ 		check_missing_plugins();
+ 		
+-		Glib::ustring error = (msg) ? msg->parse().what() : Glib::ustring();
++		Glib::ustring error = (msg) ? Glib::ustring(msg->parse_debug()) : Glib::ustring();
+ 		dialog_error(_("Media file could not be played.\n"), error);
+ 
+ 		return true;
+--- trunk/plugins/actions/waveformmanagement/mediadecoder.h	2015/06/21 21:15:10	942
++++ trunk/plugins/actions/waveformmanagement/mediadecoder.h	2016/10/16 09:36:00	982
+@@ -200,7 +200,7 @@
+ 	{
+ 		check_missing_plugins();
+ 		
+-		Glib::ustring error = (msg) ? msg->parse().what() : Glib::ustring();
++		Glib::ustring error = (msg) ? Glib::ustring(msg->parse_debug()) : Glib::ustring();
+ 		
+ 		dialog_error(_("Media file could not be played.\n"), error);
+ 		// Critical error, cancel the work.
+@@ -214,7 +214,7 @@
+ 	{
+ 		check_missing_plugins();
+ 		
+-		Glib::ustring error = (msg) ? msg->parse().what() : Glib::ustring();
++		Glib::ustring error = (msg) ? Glib::ustring(msg->parse_debug()) : Glib::ustring();
+ 		dialog_error(_("Media file could not be played.\n"), error);
+ 
+ 		return true;
diff --git a/subtitleeditor-flags.patch b/subtitleeditor-flags.patch
deleted file mode 100644
index fcec0d4..0000000
--- a/subtitleeditor-flags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- subtitleeditor-0.52.1/configure.ac.orig	2015-06-25 23:05:40.000000000 +0200
-+++ subtitleeditor-0.52.1/configure.ac	2016-02-19 21:25:10.363815003 +0100
-@@ -253,7 +253,7 @@
- 
- if test "$enable_debug" = "yes"; then
-   CXXFLAGS="$CXXFLAGS -DDEBUG -g"
--  LDFLAGS="$LDFLAGS -g -ansi -Wall"
-+  LDFLAGS="$LDFLAGS -g -Wall"
- fi
- 
- # =========================================================================
-@@ -265,13 +265,13 @@
- 
- 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" #-Werror
-+CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wconversion" #-Werror
- 
- # =========================================================================
- # make use of ccache
diff --git a/subtitleeditor-format.patch b/subtitleeditor-format.patch
index 1fb1fb6..a318c40 100644
--- a/subtitleeditor-format.patch
+++ b/subtitleeditor-format.patch
@@ -27,18 +27,3 @@
  	}
  	// Return an NULL ptr
  	return Glib::RefPtr<Gst::Element>();
---- subtitleeditor-0.52.1/plugins/actions/documentmanagement/documentmanagement.cc.orig	2015-06-21 23:09:31.000000000 +0200
-+++ subtitleeditor-0.52.1/plugins/actions/documentmanagement/documentmanagement.cc	2016-02-19 22:31:33.540314480 +0100
-@@ -178,9 +178,9 @@
- 
- 		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");
diff --git a/subtitleeditor-gcc.patch b/subtitleeditor-gcc.patch
deleted file mode 100644
index 01c60a3..0000000
--- a/subtitleeditor-gcc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- subtitleeditor-0.52.1/plugins/actions/dialoguize/dialoguize.cc.orig	2015-06-21 23:09:31.000000000 +0200
-+++ subtitleeditor-0.52.1/plugins/actions/dialoguize/dialoguize.cc	2016-02-19 22:27:48.430323938 +0100
-@@ -23,6 +23,7 @@
-  *	along with this program. If not, see <http://www.gnu.org/licenses/>.
-  */
-  
-+#include <memory>
- #include <auto_ptr.h>
- #include "extension/action.h"
- #include "i18n.h"
---- subtitleeditor-0.52.1/src/utility.h.orig	2015-06-21 23:09:29.000000000 +0200
-+++ subtitleeditor-0.52.1/src/utility.h	2016-02-20 10:47:25.319878426 +0100
-@@ -91,7 +91,7 @@
- 	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());
---- subtitleeditor-0.52.1/src/subtitleview.cc.orig	2015-06-21 23:09:29.000000000 +0200
-+++ subtitleeditor-0.52.1/src/subtitleview.cc	2016-02-20 11:24:45.551626891 +0100
-@@ -1363,7 +1363,7 @@
- 	{
- 		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);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/subtitleeditor.git/commitdiff/bdc8f075d2a1f3c53d344d760487f9ee6332bf8d



More information about the pld-cvs-commit mailing list