[subtitleeditor] Update to 0.41.0, add patch to fix rhbz906226 (subtitles don't show in video window, upstream: 20793

[Martin Sourada]

commit a7e936d8e4e42c9a72acb4c5ce79b8c2b70bf66b
Author: Martin Sourada <mso at fedoraproject.org>
Date:   Thu Jan 16 23:38:04 2014 +0100

    Update to 0.41.0, add patch to fix rhbz906226 (subtitles don't show
    in video window, upstream: 20793, patch taken from there).
    Reused suggested fix from Artur Szymczak.

 .gitignore                              |    1 +
 sources                                 |    2 +-
 subtitleeditor-0.41.0-textoverlay.patch |   16 ++++++++++++++++
 subtitleeditor.spec                     |   15 +++++++++++----
 4 files changed, 29 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9bad288..4284d3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 subtitleeditor-0.37.1.tar.gz
 /subtitleeditor-0.39.0.tar.gz
 /subtitleeditor-0.40.0.tar.gz
+/subtitleeditor-0.41.0.tar.gz
diff --git a/sources b/sources
index f5f00fc..9d5d037 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cb8a5dec7eeea8357ad5a9e977e5d5bd  subtitleeditor-0.40.0.tar.gz
+3c21ccd8296001dcb1a02c62396db1b6  subtitleeditor-0.41.0.tar.gz
diff --git a/subtitleeditor-0.41.0-textoverlay.patch b/subtitleeditor-0.41.0-textoverlay.patch
new file mode 100644
index 0000000..7a8552c
--- /dev/null
+++ b/subtitleeditor-0.41.0-textoverlay.patch
@@ -0,0 +1,16 @@
+Author: Philip Rinn <rinni at inventati.org>
+Description: Get textoverlay working with gstreamermm 0.10.11
+--- a/src/vp/gstplayer.cc
++++ b/src/vp/gstplayer.cc
+@@ -656,7 +656,10 @@
+ 							"Please check your GStreamer installation."), "ffmpegcolorspace"));
+ 		}
+ 		// textoverlay
+-		textoverlay = Gst::ElementFactory::create_element("textoverlay", "overlay");
++		// Workaround to prevent getting a NULL pointer from the 
++		// cast_dynamic(textoverlay) call under gstreamermm 0.10.11
++		textoverlay = Gst::TextOverlay::create("overlay");
++
+ 		if(!textoverlay)
+ 		{
+ 			throw std::runtime_error(
diff --git a/subtitleeditor.spec b/subtitleeditor.spec
index f1aac5d..831ba0e 100644
--- a/subtitleeditor.spec
+++ b/subtitleeditor.spec
@@ -1,11 +1,11 @@
 %define major 0
-%define minor 40
+%define minor 41
 %define maintenance 0
 %define branch_ver %{major}.%{minor}
 
 Name:           subtitleeditor
 Version:        %{major}.%{minor}.%{maintenance}
-Release:        5%{?dist}
+Release:        1%{?dist}
 Summary:        GTK+2 tool to edit subtitles for GNU/Linux/*BSD
 
 Group:          Applications/Multimedia
@@ -14,7 +14,8 @@ URL:            http://home.gna.org/subtitleeditor/
 Source0:        http://download.gna.org/subtitleeditor/%{branch_ver}/%{name}-%{version}.tar.gz
 # Fix for build with GCC 4.6 (taking address of temporary)
 #Patch0:         %{name}-0.39.0-temp-addr.patch
-Patch0:          %{name}-0.40.0-glib.patch
+#Patch0:         %{name}-0.40.0-glib.patch
+Patch0:         %{name}-0.41.0-textoverlay.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -46,7 +47,8 @@ to synchronize subtitles to voices.
 %prep
 %setup -q
 #%patch0 -p1 -b .temp-addr
-%patch0 -p1 -b .glib
+#%patch0 -p1 -b .glib
+%patch0 -p1 -b .textoverlay
 
 %build
 %configure \
@@ -113,6 +115,11 @@ fi
 %{_libdir}/%{name}
 
 %changelog
+* Thu Jan 16 2014 Artur Szymczak <artur.szymczak at nadzieja.pl> - 0.41.0-1
+- Updated to latest release.
+- Dropping the temporary patch (%{name}-0.40.0-glib.patch) - Fixed upstream.
+- Added patch for rhbz #906226 (upstream #20793)
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.40.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild