[subtitleeditor/f21] Patch for glib2-2.42.

[Martin Sourada]

commit 806cc959ac12351402fa326c4e574da60c61713a
Author: Martin Sourada <mso at fedoraproject.org>
Date:   Sat Jan 31 09:48:10 2015 +0100

    Patch for glib2-2.42.

 ...41.0-fix-custom-class-interfaces-timecell.patch |   17 +++++++++++
 ...editor-0.41.0-fix-custom-class-interfaces.patch |   29 ++++++++++++++++++++
 subtitleeditor.spec                                |    9 +++++-
 3 files changed, 54 insertions(+), 1 deletions(-)
---
diff --git a/subtitleeditor-0.41.0-fix-custom-class-interfaces-timecell.patch b/subtitleeditor-0.41.0-fix-custom-class-interfaces-timecell.patch
new file mode 100644
index 0000000..1d819f0
--- /dev/null
+++ b/subtitleeditor-0.41.0-fix-custom-class-interfaces-timecell.patch
@@ -0,0 +1,17 @@
+--- subtitleeditor-svn/src/subtitleview.cc.orig	2014-12-31 18:27:41.556444986 +0100
++++ subtitleeditor-svn/src/subtitleview.cc	2014-12-31 18:31:23.079171738 +0100
+@@ -38,12 +38,12 @@
+ /*
+  *
+  */
+-class TimeCell : public Gtk::TextView, public Gtk::CellEditable
++class TimeCell : public Gtk::CellEditable, public Gtk::TextView
+ {
+ public:
+ 
+ 	TimeCell()
+-	:Glib::ObjectBase(typeid(TimeCell)), Gtk::CellEditable()
++	:Gtk::CellEditable(), Glib::ObjectBase(typeid(TimeCell))
+ 	{
+ 		se_debug(SE_DEBUG_VIEW);
+ 	}
diff --git a/subtitleeditor-0.41.0-fix-custom-class-interfaces.patch b/subtitleeditor-0.41.0-fix-custom-class-interfaces.patch
new file mode 100644
index 0000000..3e36e17
--- /dev/null
+++ b/subtitleeditor-0.41.0-fix-custom-class-interfaces.patch
@@ -0,0 +1,29 @@
+Author: Philip Rinn <rinni at inventati.org>
+Description: With glib >= 2.42.0  you need to add interfaces before class_init
+--- a/src/gui/textviewcell.cc
++++ b/src/gui/textviewcell.cc
+@@ -30,10 +30,10 @@
+  * Initialize the widget with the AutomaticSpellChecker.
+  */
+ TextViewCell::TextViewCell()
+-:	Glib::ObjectBase(typeid(TextViewCell)),
+-	Gtk::CellEditable(), 
++:	Gtk::CellEditable(),
+ 	m_editing_canceled(false), 
+-	m_used_ctrl_enter_to_confirm_change(false)
++	m_used_ctrl_enter_to_confirm_change(false),
++    Glib::ObjectBase(typeid(TextViewCell))
+ {
+ 	se_debug(SE_DEBUG_VIEW);
+ 
+--- a/src/gui/textviewcell.h
++++ b/src/gui/textviewcell.h
+@@ -29,7 +29,7 @@
+ /*
+  * Cell text editable with multiline support.
+  */
+-class TextViewCell : public Gtk::TextView, public Gtk::CellEditable
++class TextViewCell : public Gtk::CellEditable, public Gtk::TextView
+ {
+ public:
+ 
diff --git a/subtitleeditor.spec b/subtitleeditor.spec
index 55cc099..12bdc99 100644
--- a/subtitleeditor.spec
+++ b/subtitleeditor.spec
@@ -5,7 +5,7 @@
 
 Name:           subtitleeditor
 Version:        %{major}.%{minor}.%{maintenance}
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GTK+2 tool to edit subtitles for GNU/Linux/*BSD
 
 Group:          Applications/Multimedia
@@ -17,6 +17,8 @@ Source0:        http://download.gna.org/subtitleeditor/%{branch_ver}/%{name}-%{v
 #Patch0:         %{name}-0.40.0-glib.patch
 Patch0:         %{name}-0.41.0-textoverlay.patch
 Patch1:         %{name}-0.41.0-keyframe-generation.patch
+Patch2:         %{name}-0.41.0-fix-custom-class-interfaces.patch
+Patch3:         %{name}-0.41.0-fix-custom-class-interfaces-timecell.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -51,6 +53,8 @@ to synchronize subtitles to voices.
 #%patch0 -p1 -b .glib
 %patch0 -p1 -b .textoverlay
 %patch1 -p1 -b .keyframe-generation
+%patch2 -p1 -b .fix-custom-class-interfaces
+%patch3 -p1 -b .fix-custom-class-interfaces-timecell
 
 %build
 %configure \
@@ -117,6 +121,9 @@ fi
 %{_libdir}/%{name}
 
 %changelog
+* Thu Jan 29 2015 Artur Szymczak <artur.szymczak at nadzieja.pl> - 0.41.0-5
+- Added patches for rhbz #1187152 (upstream #22857 and #23018)
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.41.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild