Fix subtitle editing, bug #536246.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key C6085806)

4 files changed, 45 insertions, 22 deletions

diff --git a/media-video/subtitleeditor/ChangeLog b/media-video/subtitleeditor/ChangeLog
index 7779d5a4bc96..d0ec6f49630d 100644
--- a/media-video/subtitleeditor/ChangeLog
+++ b/media-video/subtitleeditor/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/subtitleeditor
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/ChangeLog,v 1.31 2014/11/30 23:06:18 eva Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/ChangeLog,v 1.32 2015/01/11 12:44:58 eva Exp $
+
+*subtitleeditor-0.41.1-r1 (11 Jan 2015)
+
+  11 Jan 2015; Gilles Dartiguelongue <eva@gentoo.org>
+  -subtitleeditor-0.41.0-r1.ebuild, +subtitleeditor-0.41.1-r1.ebuild,
+  -files/subtitleeditor-0.40.0-glib-2.31.patch,
+  +files/subtitleeditor-0.41.0-subtitle-edition.patch:
+  Fix subtitle editing, bug #536246.
 
   30 Nov 2014; Gilles Dartiguelongue <eva@gentoo.org>
   subtitleeditor-0.41.0-r1.ebuild, subtitleeditor-0.41.1.ebuild:
diff --git a/media-video/subtitleeditor/files/subtitleeditor-0.40.0-glib-2.31.patch b/media-video/subtitleeditor/files/subtitleeditor-0.40.0-glib-2.31.patch
deleted file mode 100644
index 7ac0bd365159..000000000000
--- a/media-video/subtitleeditor/files/subtitleeditor-0.40.0-glib-2.31.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Andre Reinke <andre.reinke@googlemail.com>
-
-https://gna.org/bugs/index.php?19709
-
---- a/plugins/actions/findandreplace/findandreplace.cc
-+++ b/plugins/actions/findandreplace/findandreplace.cc
-@@ -26,7 +26,7 @@
- #include <gui/dialogutility.h>
- #include <gtkmm_utility.h>
- #include <widget_config_utility.h>
--#include <glib/gregex.h>
-+#include <glib.h>
- 
- /*
-  * FIXME:
diff --git a/media-video/subtitleeditor/files/subtitleeditor-0.41.0-subtitle-edition.patch b/media-video/subtitleeditor/files/subtitleeditor-0.41.0-subtitle-edition.patch
new file mode 100644
index 000000000000..eff958fd66cc
--- /dev/null
+++ b/media-video/subtitleeditor/files/subtitleeditor-0.41.0-subtitle-edition.patch
@@ -0,0 +1,27 @@
+Author: Philip Rinn <rinni@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,8 +30,8 @@
+  * Initialize the widget with the AutomaticSpellChecker.
+  */
+ TextViewCell::TextViewCell()
++:	Gtk::CellEditable(), 
++	Glib::ObjectBase(typeid(TextViewCell)),
+-:	Glib::ObjectBase(typeid(TextViewCell)),
+-	Gtk::CellEditable(), 
+ 	m_editing_canceled(false), 
+ 	m_used_ctrl_enter_to_confirm_change(false)
+ {
+ 
+--- 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/media-video/subtitleeditor/subtitleeditor-0.41.0-r1.ebuild b/media-video/subtitleeditor/subtitleeditor-0.41.1-r1.ebuild
index c797786663da..10a5428389e8 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.41.0-r1.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.41.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/subtitleeditor-0.41.0-r1.ebuild,v 1.4 2014/11/30 23:06:18 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/subtitleeditor-0.41.1-r1.ebuild,v 1.1 2015/01/11 12:44:58 eva Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 1-2)/${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug nls opengl"
 
 RDEPEND="
@@ -39,10 +39,13 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	# Get textoverlay working with gstreamermm 0.10.11
-	epatch "${FILESDIR}/${P}-textoverlay.patch"
+	epatch "${FILESDIR}"/${PN}-0.41.0-textoverlay.patch
 
 	# Prevent crash when generating keyframes with gstreamermm 0.10.11
-	epatch "${FILESDIR}/${P}-keyframe-generation.patch"
+	epatch "${FILESDIR}"/${PN}-0.41.0-keyframe-generation.patch
+
+	# Fix typing/editing subtitle, bug #536246
+	epatch "${FILESDIR}"/${PN}-0.41.0-subtitle-edition.patch
 
 	gnome2_src_prepare
 }