[SCM] freetuxtv/master: Added 02_gtkv2_port.diff to get source building with Gtk v2 in Debian Stable.

[pere at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 433cb077985351e09e8f3253562b28c9f9962769
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Jun 2 11:13:14 2016 +0200

    Added 02_gtkv2_port.diff to get source building with Gtk v2 in Debian Stable.

diff --git a/debian/changelog b/debian/changelog
index 4346c7c..8706d72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ freetuxtv (0.6.8~dfsg1-1) unstable; urgency=medium
 
   [ Petter Reinholdtsen ]
   * Updated d/copyright to correct a few issues reported by 'debmake - k'.
+  * Added 02_gtkv2_port.diff to get source building with Gtk v2 in Debian
+    Stable.
 
  -- Eric Beuque <ebeuque at debian>  Tue, 24 May 2016 18:49:41 +0200
 
diff --git a/debian/patches/02_gtkv2_port.diff b/debian/patches/02_gtkv2_port.diff
new file mode 100644
index 0000000..5bd8b14
--- /dev/null
+++ b/debian/patches/02_gtkv2_port.diff
@@ -0,0 +1,50 @@
+Description: Port code to Gtk v2
+ Ifdef a few calls that changed between Gtk 2 and 3 to make
+ the program easier to backport.
+Author: Petter Reinholdtsen <pere at hungry.com>
+Forwarded: no
+Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
+Last-Update: 2016-06-02
+
+--- freetuxtv-0.6.8.orig/src/freetuxtv-player-error-dialog.c
++++ freetuxtv-0.6.8/src/freetuxtv-player-error-dialog.c
+@@ -61,7 +61,11 @@ freetuxtv_player_error_dialog_init (Free
+ 	//gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(pScroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ 
+ 	GtkWidget* vbox;
++#if GTK_API_VERSION == 3
+ 	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
++#else
++	vbox = gtk_vbox_new(FALSE, 5);
++#endif
+ 	gtk_box_pack_start (GTK_BOX (vbox),
+ 	    GTK_WIDGET(pScroll), TRUE, TRUE, 5);
+ 
+--- freetuxtv-0.6.8.orig/src/gtk-date-time-picker.c
++++ freetuxtv-0.6.8/src/gtk-date-time-picker.c
+@@ -123,7 +123,11 @@ gtk_date_time_picker_init (GtkDateTimePi
+ 	    NULL);*/
+ 
+ 	// Hour
++#if GTK_API_VERSION == 3
+ 	hbox_time = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
++#else
++	hbox_time = gtk_hbox_new(FALSE, 0);
++#endif
+ 	gtk_widget_show(hbox_time);
+ 	gtk_box_pack_start(GTK_BOX(object), hbox_time, FALSE, FALSE, 0);
+ 	
+--- freetuxtv-0.6.8.orig/src/gtk-progress-dialog.c
++++ freetuxtv-0.6.8/src/gtk-progress-dialog.c
+@@ -87,7 +87,11 @@ gtk_progress_dialog_new(GtkWindow* paren
+ 
+ 	// Construct the dialog
+ 	GtkWidget* vbox;
++#if GTK_API_VERSION == 3
+ 	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
++#else
++	vbox = gtk_vbox_new(FALSE, 5);
++#endif
+ 	gtk_container_set_border_width (GTK_CONTAINER(vbox), 10);
+ 
+ 	priv->title_widget = gtk_label_new("");
diff --git a/debian/patches/series b/debian/patches/series
index 38b2f11..f336ca0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_desktop_keywords.diff
+02_gtkv2_port.diff

-- 
freetuxtv packaging