Bug#622050: libquicktime: patch from upstream

[Andreas Moog]

user ubuntu-devel at lists.ubuntu.com
usertags 622050 + origin-ubuntu natty ubuntu-patch
tags 622050 + patch
thanks


*** /tmp/tmph6DnDB
In Ubuntu, the attached patch was applied to achieve the following:

  * debian/patches/22_upstream_fix_deprecated_gtk.patch:
    - add patch from upstream cvs to fix FTBFS
    (LP: #756131) (Closes: #622050)

Thanks for considering the patch.


-- System Information:
Debian Release: squeeze/sid
  APT prefers natty
  APT policy: (500, 'natty')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.38-8-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-------------- next part --------------
=== added file 'debian/patches/22_upstream_fix_deprecated_gtk.patch'
--- debian/patches/22_upstream_fix_deprecated_gtk.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/22_upstream_fix_deprecated_gtk.patch	2011-04-23 00:05:45 +0000
@@ -0,0 +1,68 @@
+## Description: Cherry-pick patch from upstream to fix FTBFS with newer GTK versions
+## Origin/Author: gmerlin
+## Bug-Ubuntu: https://bugs.launchpad.net/bugs/756131
+## Bug-Debian: http://bugs.debian.org/622050
+Index: libquicktime/utils/gtk/lqt_gtk.c
+===================================================================
+--- libquicktime.orig/utils/gtk/lqt_gtk.c	2011-04-23 01:55:00.462556015 +0200
++++ libquicktime/utils/gtk/lqt_gtk.c	2011-04-23 02:03:25.886187635 +0200
+@@ -16,6 +16,18 @@
+ LQGTK_LIST_CODEC_NUM_COLS
+ };
+ 
++void lqtgtk_widget_set_can_default(GtkWidget * w, gboolean can_default)
++  {
++#if GTK_CHECK_VERSION(2,18,0)
++  gtk_widget_set_can_default(w, can_default);
++#else
++  if(can_default)
++    GTK_WIDGET_SET_FLAGS(w, GTK_CAN_DEFAULT);
++  else
++    GTK_WIDGET_UNSET_FLAGS(w, GTK_CAN_DEFAULT);
++#endif
++  }
++
+ static void parameter_combobox_callback(GtkWidget * w, gpointer data)
+   {
+   LqtGtkParameterWidget * p = (LqtGtkParameterWidget*)data;
+@@ -941,10 +953,10 @@
+ 		   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);
+-
++  lqtgtk_widget_set_can_default(ret->apply_button, TRUE);
++  lqtgtk_widget_set_can_default(ret->close_button, TRUE);
++  lqtgtk_widget_set_can_default(ret->restore_button, TRUE);
++  
+   gtk_widget_show(ret->apply_button);
+   gtk_widget_show(ret->close_button);
+   gtk_widget_show(ret->restore_button);
+@@ -1240,8 +1252,8 @@
+   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);
+-
++  lqtgtk_widget_set_can_default(ret->close_button, TRUE);
++  
+   g_signal_connect(G_OBJECT(ret->close_button), "clicked",
+                      G_CALLBACK(codec_info_window_button_callback),
+                      (gpointer)ret);
+Index: libquicktime/utils/gtk/libquicktime_config.c
+===================================================================
+--- libquicktime.orig/utils/gtk/libquicktime_config.c	2011-04-23 02:03:37.745568716 +0200
++++ libquicktime/utils/gtk/libquicktime_config.c	2011-04-23 02:03:59.734421140 +0200
+@@ -112,8 +112,8 @@
+                    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);
++  lqtgtk_widget_set_can_default(ret->close_button, TRUE);
++  lqtgtk_widget_set_can_default(ret->save_button, TRUE);
+   
+   gtk_widget_show(ret->close_button);
+   gtk_widget_show(ret->save_button);

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-03-16 12:07:29 +0000
+++ debian/patches/series	2011-04-22 23:53:59 +0000
@@ -1,3 +1,4 @@
 02-install-in-libquicktime1.patch
 21-export-quicktime_set_window.patch
+22_upstream_fix_deprecated_gtk.patch
 70-relibtoolize.patch