[gtk2/f15] fix build

[Matthias Clasen]

commit 9100b9fee212f73d8648a43252e86654b15697f2
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Mon Oct 17 20:15:29 2011 -0400

    fix build

 gtk2-schar.patch      |   36 ++++++++++++++++++++++++++++++++++++
 gtk2.spec             |    4 ++--
 window-dragging.patch |   38 +++++++++++++++-----------------------
 3 files changed, 53 insertions(+), 25 deletions(-)
---
diff --git a/gtk2-schar.patch b/gtk2-schar.patch
new file mode 100644
index 0000000..1846ce8
--- /dev/null
+++ b/gtk2-schar.patch
@@ -0,0 +1,36 @@
+diff -up gtk+-2.24.7/gdk/gdkmarshalers.c.schar gtk+-2.24.7/gdk/gdkmarshalers.c
+--- gtk+-2.24.7/gdk/gdkmarshalers.c.schar	2011-10-17 18:05:32.000000000 -0400
++++ gtk+-2.24.7/gdk/gdkmarshalers.c	2011-10-17 20:07:54.859431530 -0400
+@@ -5,7 +5,7 @@
+ 
+ #ifdef G_ENABLE_DEBUG
+ #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
+-#define g_marshal_value_peek_char(v)     g_value_get_schar (v)
++#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+ #define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
+ #define g_marshal_value_peek_int(v)      g_value_get_int (v)
+ #define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
+diff -up gtk+-2.24.7/gtk/gtkmarshal.c.schar gtk+-2.24.7/gtk/gtkmarshal.c
+--- gtk+-2.24.7/gtk/gtkmarshal.c.schar	2011-10-17 20:10:48.682425316 -0400
++++ gtk+-2.24.7/gtk/gtkmarshal.c	2011-10-17 20:10:56.723425027 -0400
+@@ -6,7 +6,7 @@
+ 
+ #ifdef G_ENABLE_DEBUG
+ #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
+-#define g_marshal_value_peek_char(v)     g_value_get_schar (v)
++#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+ #define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
+ #define g_marshal_value_peek_int(v)      g_value_get_int (v)
+ #define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
+diff -up gtk+-2.24.7/gtk/gtkmarshalers.c.schar gtk+-2.24.7/gtk/gtkmarshalers.c
+--- gtk+-2.24.7/gtk/gtkmarshalers.c.schar	2011-10-17 18:05:54.000000000 -0400
++++ gtk+-2.24.7/gtk/gtkmarshalers.c	2011-10-17 20:07:54.860431529 -0400
+@@ -6,7 +6,7 @@
+ 
+ #ifdef G_ENABLE_DEBUG
+ #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
+-#define g_marshal_value_peek_char(v)     g_value_get_schar (v)
++#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+ #define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
+ #define g_marshal_value_peek_int(v)      g_value_get_int (v)
+ #define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
diff --git a/gtk2.spec b/gtk2.spec
index a0ea860..978fd8c 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -39,7 +39,7 @@ Patch8: tooltip-positioning.patch
 #Patch14: gtk2-landscape-pdf-print.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=611313
 Patch15: window-dragging.patch
-Patch16: gtkdnd-keycode-unbind.patch
+Patch16: gtk2-schar.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -156,7 +156,7 @@ This package contains developer documentation for the GTK+ widget toolkit.
 %patch8 -p1 -b .tooltip-positioning
 #%patch14 -p1 -b .landscape-pdf-print
 %patch15 -p1 -b .window-dragging
-%patch16 -p1 -b .keycode-unbind
+%patch16 -p1 -b .schar
 
 %build
 # For the gobject-introspection patch
diff --git a/window-dragging.patch b/window-dragging.patch
index bb8543c..88aa26b 100644
--- a/window-dragging.patch
+++ b/window-dragging.patch
@@ -1,8 +1,7 @@
-diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
-index 4788590..cb94c64 100644
---- a/gtk/gtkmenushell.c
-+++ b/gtk/gtkmenushell.c
-@@ -585,18 +585,45 @@ gtk_menu_shell_button_press (GtkWidget      *widget,
+diff -up gtk+-2.24.7/gtk/gtkmenushell.c.window-dragging gtk+-2.24.7/gtk/gtkmenushell.c
+--- gtk+-2.24.7/gtk/gtkmenushell.c.window-dragging	2011-08-15 22:30:52.000000000 -0400
++++ gtk+-2.24.7/gtk/gtkmenushell.c	2011-10-17 19:50:52.180468086 -0400
+@@ -589,18 +589,45 @@ gtk_menu_shell_button_press (GtkWidget
  
    if (!menu_shell->active || !menu_shell->button)
      {
@@ -55,26 +54,20 @@ index 4788590..cb94c64 100644
              }
          }
      }
-diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
-index 8f065a7..c72a09f 100644
---- a/gtk/gtktoolbar.c
-+++ b/gtk/gtktoolbar.c
-@@ -2699,17 +2699,41 @@ static gboolean
+diff -up gtk+-2.24.7/gtk/gtktoolbar.c.window-dragging gtk+-2.24.7/gtk/gtktoolbar.c
+--- gtk+-2.24.7/gtk/gtktoolbar.c.window-dragging	2011-10-01 11:29:06.000000000 -0400
++++ gtk+-2.24.7/gtk/gtktoolbar.c	2011-10-17 19:52:56.104463657 -0400
+@@ -2701,6 +2701,8 @@ static gboolean
  gtk_toolbar_button_press (GtkWidget      *toolbar,
      			  GdkEventButton *event)
  {
 +  GtkWidget *window;
 +
-   if (event->button == 3)
+   if (_gtk_button_event_triggers_context_menu (event))
      {
        gboolean return_value;
--      
-+
-       g_signal_emit (toolbar, toolbar_signals[POPUP_CONTEXT_MENU], 0,
- 		     (int)event->x_root, (int)event->y_root, event->button,
- 		     &return_value);
--      
-+
+@@ -2711,7 +2713,29 @@ gtk_toolbar_button_press (GtkWidget
+       
        return return_value;
      }
 -  
@@ -104,11 +97,10 @@ index 8f065a7..c72a09f 100644
    return FALSE;
  }
  
-diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
-index 58ce2db..921c22a 100644
---- a/gtk/gtkwidget.c
-+++ b/gtk/gtkwidget.c
-@@ -2443,6 +2443,13 @@ gtk_widget_class_init (GtkWidgetClass *klass)
+diff -up gtk+-2.24.7/gtk/gtkwidget.c.window-dragging gtk+-2.24.7/gtk/gtkwidget.c
+--- gtk+-2.24.7/gtk/gtkwidget.c.window-dragging	2011-10-17 19:50:52.175468086 -0400
++++ gtk+-2.24.7/gtk/gtkwidget.c	2011-10-17 19:50:52.184468086 -0400
+@@ -2467,6 +2467,13 @@ gtk_widget_class_init (GtkWidgetClass *k
  							       0.0, 1.0, 0.04,
  							       GTK_PARAM_READABLE));