[SCM] libquicktime/master: Remove 11-gtk+-2.24.patch, applied upstream.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sat Jul 9 08:29:44 UTC 2011
The following commit has been merged in the master branch:
commit b39281a3d9c6da29e400abe99799539331f23b83
Author: Alessio Treglia <alessio at debian.org>
Date: Sat Jul 9 10:29:37 2011 +0200
Remove 11-gtk+-2.24.patch, applied upstream.
diff --git a/debian/patches/11-gtk+-2.24.patch b/debian/patches/11-gtk+-2.24.patch
deleted file mode 100644
index 44297e1..0000000
--- a/debian/patches/11-gtk+-2.24.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Patch to remove deprecation warning when compiling against new gtk libraries
- changed gtk_combo_box_new_text into gtk_combo_box_text_new as proposed by gtk
- documentation.
-Origin: http://bugs.gentoo.org/show_bug.cgi?id=351854
-Author: Ingo Krabbe
-Reviewed-by: Stian Jenssen
-Forwarded: Burkhard Plaum <plaum at ipf.uni-stuttgart.de>
-Applied-Upstream: http://libquicktime.cvs.sf.net/viewvc/libquicktime/libquicktime/utils/gtk/lqt_gtk.c?r1=1.24&r2=1.25
----
- utils/gtk/lqt_gtk.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- libquicktime.orig/utils/gtk/lqt_gtk.c
-+++ libquicktime/utils/gtk/lqt_gtk.c
-@@ -332,11 +332,20 @@ lqtgtk_create_parameter_widget(lqt_param
- ret->label = gtk_label_new(TR_DOM(info->real_name));
- gtk_misc_set_alignment(GTK_MISC(ret->label), 0.0, 0.5);
-
-+#if ((GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION >= 24))
-+ ret->widget = gtk_combo_box_text_new();
-+#else
- ret->widget = gtk_combo_box_new_text();
-+#endif
- for(i = 0; i < info->num_stringlist_options; i++)
- {
-+#if ((GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION >= 24))
-+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (ret->widget),
-+ info->stringlist_options[i]);
-+#else
- gtk_combo_box_append_text (GTK_COMBO_BOX (ret->widget),
- info->stringlist_options[i]);
-+#endif
- }
- g_signal_connect(GTK_COMBO_BOX (ret->widget),
- "changed",
--
libquicktime packaging
More information about the pkg-multimedia-commits
mailing list