[SCM] libquicktime/master: 10-gtk+-2.22.patch: Patch to allow libquicktime-1.1.5 to build with gtk+-2.22.

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f894dba8a84868b0ed38cd6ebfad14837f0a9f1d
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Fri Dec 3 13:49:37 2010 +0100

    10-gtk+-2.22.patch: Patch to allow libquicktime-1.1.5 to build with gtk+-2.22.

diff --git a/debian/patches/10-gtk+-2.22.patch b/debian/patches/10-gtk+-2.22.patch
new file mode 100644
index 0000000..68956f7
--- /dev/null
+++ b/debian/patches/10-gtk+-2.22.patch
@@ -0,0 +1,49 @@
+Description: Patch to allow libquicktime-1.1.5 to build with gtk+-2.22
+ It replaces calls to GTK_WIDGET_SET_FLAGS(foo, GTK_CAN_DEFAULT) with
+ gtk_widget_set_can_default(foo, TRUE).
+ .
+ Compatibility notes: the gtk_widget_set_can_default() function first appeared
+ in gtk+-2.18. Since the oldest version of gtk2 in portage is 2.18.7, we do not
+ need any gtk+ version-dependent ifdefs. Upstream might want them though,
+ depending on whether they want to support obsolete gtk+ versions.
+Origin: http://bugs.gentoo.org/show_bug.cgi?id=343419
+Author: Alexandre Rostovtsev <tetromino at gmail.com
+Reviewed-by: Mathieu Pasquet <kiorky at cryptelium.net>
+
+--- libquicktime.orig/utils/gtk/libquicktime_config.c
++++ libquicktime/utils/gtk/libquicktime_config.c
+@@ -112,8 +112,8 @@ static MainWindow * create_main_window()
+                    G_CALLBACK(main_window_button_callback),
+                    (gpointer)ret);
+ 
+-  GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT);
+-  GTK_WIDGET_SET_FLAGS (ret->save_button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(ret->close_button, TRUE);
++  gtk_widget_set_can_default(ret->save_button, TRUE);
+   
+   gtk_widget_show(ret->close_button);
+   gtk_widget_show(ret->save_button);
+--- libquicktime.orig/utils/gtk/lqt_gtk.c
++++ libquicktime/utils/gtk/lqt_gtk.c
+@@ -941,9 +941,9 @@ lqtgtk_create_codec_config_window(lqt_co
+ 		   G_CALLBACK(codec_config_window_button_callback),
+ 		   (gpointer)ret);
+ 
+-  GTK_WIDGET_SET_FLAGS (ret->apply_button, GTK_CAN_DEFAULT);
+-  GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT);
+-  GTK_WIDGET_SET_FLAGS (ret->restore_button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(ret->apply_button, TRUE);
++  gtk_widget_set_can_default(ret->close_button, TRUE);
++  gtk_widget_set_can_default(ret->restore_button, TRUE);
+ 
+   gtk_widget_show(ret->apply_button);
+   gtk_widget_show(ret->close_button);
+@@ -1240,7 +1240,7 @@ lqtgtk_create_codec_info_window(const lq
+   ret->mainbox = gtk_vbox_new(0, 10);
+ 
+   ret->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+-  GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(ret->close_button, TRUE);
+ 
+   g_signal_connect(G_OBJECT(ret->close_button), "clicked",
+                      G_CALLBACK(codec_info_window_button_callback),
diff --git a/debian/patches/series b/debian/patches/series
index 1f2c355..3b78bdb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 02-install-in-libquicktime1.patch
 21-export-quicktime_set_window.patch
+10-gtk+-2.22.patch
 70-relibtoolize.patch

-- 
libquicktime packaging