From 850ed7dfbac7c642cbc09e03131fa6ee1a9141c5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 12 Jul 2010 18:07:16 +0000 Subject: [PATCH] 2.90.5 --- .cvsignore | 2 +- 0001-New-tooltip-style.patch | 46 ++++++++++++------------------------ gtk3.spec | 7 ++++-- sources | 2 +- 4 files changed, 22 insertions(+), 35 deletions(-) diff --git a/.cvsignore b/.cvsignore index bc6bad8..26ea574 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gtk+-2.90.4.tar.bz2 +gtk+-2.90.5.tar.bz2 diff --git a/0001-New-tooltip-style.patch b/0001-New-tooltip-style.patch index 93192a0..36f5dec 100644 --- a/0001-New-tooltip-style.patch +++ b/0001-New-tooltip-style.patch @@ -1,29 +1,17 @@ -From d5c9b3a4149fdeb40ac8377ba0867b447eb0f5aa Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Thu, 8 Jul 2010 17:58:40 -0400 -Subject: [PATCH] New tooltip style - ---- - gtk/gtktooltip.c | 261 +++++++++++++++++++++++++++++++++++++++++++++++++++--- - gtk/gtkwidget.c | 8 ++ - 2 files changed, 258 insertions(+), 11 deletions(-) - -diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c -index 67c2f6c..75fd6a7 100644 ---- a/gtk/gtktooltip.c -+++ b/gtk/gtktooltip.c -@@ -33,6 +33,10 @@ +diff -up gtk+-2.90.5/gtk/gtktooltip.c.fresh-tooltips gtk+-2.90.5/gtk/gtktooltip.c +--- gtk+-2.90.5/gtk/gtktooltip.c.fresh-tooltips 2010-07-09 21:00:19.000000000 -0400 ++++ gtk+-2.90.5/gtk/gtktooltip.c 2010-07-12 14:03:40.993938699 -0400 +@@ -33,6 +33,9 @@ #include "gtkhbox.h" #include "gtkalignment.h" +#ifdef GDK_WINDOWING_X11 +#include "gdk/x11/gdkx.h" +#endif -+ - #include "gtkalias.h" #undef DEBUG_TOOLTIP -@@ -97,6 +101,7 @@ static void gtk_tooltip_display_closed (GdkDisplay *display, + +@@ -96,6 +99,7 @@ static void gtk_tooltip_display_cl GtkTooltip *tooltip); static void gtk_tooltip_set_last_window (GtkTooltip *tooltip, GdkWindow *window); @@ -31,7 +19,7 @@ index 67c2f6c..75fd6a7 100644 G_DEFINE_TYPE (GtkTooltip, gtk_tooltip, G_TYPE_OBJECT); -@@ -112,8 +117,43 @@ gtk_tooltip_class_init (GtkTooltipClass *klass) +@@ -111,8 +115,43 @@ gtk_tooltip_class_init (GtkTooltipClass } static void @@ -75,7 +63,7 @@ index 67c2f6c..75fd6a7 100644 tooltip->timeout_id = 0; tooltip->browse_mode_timeout_id = 0; -@@ -129,8 +169,12 @@ gtk_tooltip_init (GtkTooltip *tooltip) +@@ -128,8 +167,12 @@ gtk_tooltip_init (GtkTooltip *tooltip) tooltip->last_window = NULL; tooltip->window = g_object_ref (gtk_window_new (GTK_WINDOW_POPUP)); @@ -88,7 +76,7 @@ index 67c2f6c..75fd6a7 100644 gtk_widget_set_app_paintable (tooltip->window, TRUE); gtk_window_set_resizable (GTK_WINDOW (tooltip->window), FALSE); gtk_widget_set_name (tooltip->window, "gtk-tooltip"); -@@ -147,7 +191,7 @@ gtk_tooltip_init (GtkTooltip *tooltip) +@@ -146,7 +189,7 @@ gtk_tooltip_init (GtkTooltip *tooltip) gtk_widget_show (tooltip->alignment); g_signal_connect_swapped (tooltip->window, "style-set", @@ -97,7 +85,7 @@ index 67c2f6c..75fd6a7 100644 g_signal_connect_swapped (tooltip->window, "expose-event", G_CALLBACK (gtk_tooltip_paint_window), tooltip); -@@ -164,6 +208,13 @@ gtk_tooltip_init (GtkTooltip *tooltip) +@@ -163,6 +206,13 @@ gtk_tooltip_init (GtkTooltip *tooltip) gtk_box_pack_start (GTK_BOX (tooltip->box), tooltip->label, FALSE, FALSE, 0); @@ -111,7 +99,7 @@ index 67c2f6c..75fd6a7 100644 tooltip->custom_widget = NULL; } -@@ -510,19 +561,207 @@ gtk_tooltip_window_style_set (GtkTooltip *tooltip) +@@ -509,19 +559,207 @@ gtk_tooltip_window_style_set (GtkTooltip gtk_widget_queue_draw (tooltip->window); } @@ -329,11 +317,10 @@ index 67c2f6c..75fd6a7 100644 return FALSE; } -diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c -index d302589..0f71849 100644 ---- a/gtk/gtkwidget.c -+++ b/gtk/gtkwidget.c -@@ -2608,6 +2608,14 @@ gtk_widget_class_init (GtkWidgetClass *klass) +diff -up gtk+-2.90.5/gtk/gtkwidget.c.fresh-tooltips gtk+-2.90.5/gtk/gtkwidget.c +--- gtk+-2.90.5/gtk/gtkwidget.c.fresh-tooltips 2010-07-12 10:05:33.000000000 -0400 ++++ gtk+-2.90.5/gtk/gtkwidget.c 2010-07-12 13:58:53.671956649 -0400 +@@ -2608,6 +2608,14 @@ gtk_widget_class_init (GtkWidgetClass *k P_("The length of vertical scroll arrows"), 1, G_MAXINT, 16, GTK_PARAM_READABLE)); @@ -348,6 +335,3 @@ index d302589..0f71849 100644 } static void --- -1.7.1.1 - diff --git a/gtk3.spec b/gtk3.spec index 358de8d..9a7c580 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -10,8 +10,8 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk3 -Version: 2.90.4 -Release: 3%{?dist} +Version: 2.90.5 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -264,6 +264,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache %doc tmpdocs/examples %changelog +* Mon Jul 22 2010 Matthias Clasen 2.90.5-1 +- Update to 2.90.5 + * Fri Jul 9 2010 Colin Walters - 2.90.4-3 - Update tooltip style patch to remove unused GdkRegion diff --git a/sources b/sources index fb5a281..171829e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c70b0c0617b02de3d1ff24a8b1fad5e6 gtk+-2.90.4.tar.bz2 +7d569950325c2fb0c68a94fd9265d876 gtk+-2.90.5.tar.bz2