[SCM] synfig-synfigstudio/master: New patches for compatibility with Glib-2.42 (Closes: #772748)

[onlyjob at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2065efcdf127466ba7787d825e2ffe2c5afc5edd
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Sat Dec 13 16:23:08 2014 +1100

    New patches for compatibility with Glib-2.42 (Closes: #772748)

diff --git a/debian/changelog b/debian/changelog
index 27a0fa7..4067e0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+synfigstudio (0.64.2-2) unstable; urgency=medium
+
+  * Added two new upstream patches for compatibility with Glib-2.42
+    (Closes: #772748).
+
+ -- Dmitry Smirnov <onlyjob at debian.org>  Sat, 13 Dec 2014 16:22:23 +1100
+
 synfigstudio (0.64.2-1) unstable; urgency=medium
 
   * New upstream release [October 2014].
diff --git a/debian/patches/b699.patch b/debian/patches/b699.patch
new file mode 100644
index 0000000..daa694e
--- /dev/null
+++ b/debian/patches/b699.patch
@@ -0,0 +1,69 @@
+Bug-Upstream: http://www.synfig.org/issues/thebuggenie/synfig/issues/699
+Origin: upstream, https://github.com/synfig/synfig/commit/3a3389cfefc91f95ff165ba3ba5d2e3c976cb278
+From: "[d.j.a.y] Jerome Blanchi" <d.j.a.y at free.fr>
+Date: Mon, 1 Dec 2014 22:52:26 +0100
+Subject: [PATCH] Glib 2.42 fixes : Parameters are not editable
+
+--- a/src/gui/cellrenderer/cellrenderer_value.cpp
++++ b/src/gui/cellrenderer/cellrenderer_value.cpp
+@@ -71,19 +71,30 @@
+ #define DIGITS		15
+ 
+ /* === G L O B A L S ======================================================= */
+ 
++#if GLIB_CHECK_VERSION(2, 42, 0)
++class studio::ValueBase_Entry : public Gtk::CellEditable, public Gtk::EventBox
++#else
+ class studio::ValueBase_Entry : public Gtk::EventBox, public Gtk::CellEditable
++#endif
+ {
+ 	Glib::ustring path;
+ 	Widget_ValueBase *valuewidget;
+ 	bool edit_done_called;
+ 	Gtk::Widget *parent;
+ public:
++#if GLIB_CHECK_VERSION(2, 42, 0)
+ 	ValueBase_Entry():
+-		Glib::ObjectBase  (typeid(ValueBase_Entry)),
++		Gtk::CellEditable (),
+ 		Gtk::EventBox     (),
+-		Gtk::CellEditable ()
++		Glib::ObjectBase  (typeid(ValueBase_Entry))
++#else
++	ValueBase_Entry():
++		Glib::ObjectBase  (typeid(ValueBase_Entry)),
++		Gtk::CellEditable (),
++		Gtk::EventBox     ()
++#endif
+ 	{
+ 		parent=0;
+ 		edit_done_called=false;
+ /*
+@@ -273,16 +284,27 @@
+ }
+ 
+ /* === M E T H O D S ======================================================= */
+ 
++#if GLIB_CHECK_VERSION(2, 42, 0)
++CellRenderer_ValueBase::CellRenderer_ValueBase():
++	Gtk::CellRendererText	(),
++	property_value_	(*this,"value",synfig::ValueBase()),
++	property_canvas_(*this,"canvas",etl::handle<synfig::Canvas>()),
++	property_param_desc_(*this,"param_desc",synfig::ParamDesc()),
++	property_value_desc_(*this,"value_desc",synfigapp::ValueDesc()),
++	property_child_param_desc_(*this,"child_param_desc", synfig::ParamDesc()),
++	Glib::ObjectBase	(typeid(CellRenderer_ValueBase))
++#else
+ CellRenderer_ValueBase::CellRenderer_ValueBase():
+ 	Glib::ObjectBase	(typeid(CellRenderer_ValueBase)),
+ 	Gtk::CellRendererText	(),
+ 	property_value_	(*this,"value",synfig::ValueBase()),
+ 	property_canvas_(*this,"canvas",etl::handle<synfig::Canvas>()),
+ 	property_param_desc_(*this,"param_desc",synfig::ParamDesc()),
+ 	property_value_desc_(*this,"value_desc",synfigapp::ValueDesc()),
+ 	property_child_param_desc_(*this,"child_param_desc", synfig::ParamDesc())
++#endif
+ {
+ 	CellRendererText::signal_edited().connect(sigc::mem_fun(*this,&CellRenderer_ValueBase::string_edited_));
+ 	value_entry=new ValueBase_Entry();
+ 	value_entry->hide();
diff --git a/debian/patches/b715.patch b/debian/patches/b715.patch
new file mode 100644
index 0000000..7dde4c5
--- /dev/null
+++ b/debian/patches/b715.patch
@@ -0,0 +1,30 @@
+Bug-Upstream: http://www.synfig.org/issues/thebuggenie/synfig/issues/715
+Origin: upstream, https://github.com/synfig/synfig/commit/082290ea89462e1a3864bb3cf26a4ea66cd58d94
+From: Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+Date: Wed, 3 Dec 2014 22:50:24 +0600
+Subject: [PATCH] Fix #715: Glib 2.42 issue for keyframes list. Thanks to Ron Bentley.
+
+--- a/src/gui/trees/keyframetreestore.h
++++ b/src/gui/trees/keyframetreestore.h
+@@ -46,13 +46,21 @@
+ namespace studio {
+ 
+ class KeyframeTreeStore_Class;
+ 
++#if GLIB_CHECK_VERSION(2, 37, 5)
++class KeyframeTreeStore :
++	public Gtk::TreeModel,
++	public Gtk::TreeDragSource,
++	public Gtk::TreeDragDest,
++	public Glib::Object
++#else
+ class KeyframeTreeStore :
+ 	public Glib::Object,
+ 	public Gtk::TreeModel,
+ 	public Gtk::TreeDragSource,
+ 	public Gtk::TreeDragDest
++#endif
+ {
+ 	/*
+  -- ** -- P U B L I C   T Y P E S ---------------------------------------------
+ 	*/
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..55b9c14
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+b699.patch
+b715.patch

-- 
synfig-synfigstudio packaging