diff --git a/.gitignore b/.gitignore index 971fb03..b37dbf5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ gtk+-2.90.5.tar.bz2 /gtk+-2.90.7.tar.bz2 /gtk+-2.91.0.tar.bz2 /gtk+-2.91.1.tar.bz2 +/gtk+-2.91.3.tar.bz2 diff --git a/0001-New-tooltip-style.patch b/0001-New-tooltip-style.patch index 0eee688..c9335ed 100644 --- a/0001-New-tooltip-style.patch +++ b/0001-New-tooltip-style.patch @@ -1,6 +1,6 @@ -diff -up gtk+-2.91.0/gtk/gtktooltip.c.fresh-tooltips gtk+-2.91.0/gtk/gtktooltip.c ---- gtk+-2.91.0/gtk/gtktooltip.c.fresh-tooltips 2010-09-27 20:40:00.000000000 -0400 -+++ gtk+-2.91.0/gtk/gtktooltip.c 2010-10-12 12:24:35.351808000 -0400 +diff -up gtk+-2.91.3/gtk/gtktooltip.c.fresh-tooltips gtk+-2.91.3/gtk/gtktooltip.c +--- gtk+-2.91.3/gtk/gtktooltip.c.fresh-tooltips 2010-10-31 14:28:19.000000000 -0400 ++++ gtk+-2.91.3/gtk/gtktooltip.c 2010-11-01 14:12:41.027410023 -0400 @@ -35,6 +35,9 @@ #include "gtkalignment.h" #include "gtksizerequest.h" @@ -9,9 +9,9 @@ diff -up gtk+-2.91.0/gtk/gtktooltip.c.fresh-tooltips gtk+-2.91.0/gtk/gtktooltip. +#include "gdk/x11/gdkx.h" +#endif - #undef DEBUG_TOOLTIP - -@@ -99,6 +102,7 @@ static void gtk_tooltip_display_cl + /** + * SECTION:gtktooltip +@@ -165,6 +168,7 @@ static void gtk_tooltip_display_cl GtkTooltip *tooltip); static void gtk_tooltip_set_last_window (GtkTooltip *tooltip, GdkWindow *window); @@ -19,7 +19,7 @@ diff -up gtk+-2.91.0/gtk/gtktooltip.c.fresh-tooltips gtk+-2.91.0/gtk/gtktooltip. G_DEFINE_TYPE (GtkTooltip, gtk_tooltip, G_TYPE_OBJECT); -@@ -114,6 +118,40 @@ gtk_tooltip_class_init (GtkTooltipClass +@@ -180,6 +184,40 @@ gtk_tooltip_class_init (GtkTooltipClass } static void @@ -60,7 +60,7 @@ diff -up gtk+-2.91.0/gtk/gtktooltip.c.fresh-tooltips gtk+-2.91.0/gtk/gtktooltip. gtk_tooltip_init (GtkTooltip *tooltip) { GtkStyle *style; -@@ -133,8 +171,12 @@ gtk_tooltip_init (GtkTooltip *tooltip) +@@ -199,8 +237,12 @@ gtk_tooltip_init (GtkTooltip *tooltip) tooltip->last_window = NULL; tooltip->window = g_object_ref (gtk_window_new (GTK_WINDOW_POPUP)); @@ -73,7 +73,7 @@ diff -up gtk+-2.91.0/gtk/gtktooltip.c.fresh-tooltips gtk+-2.91.0/gtk/gtktooltip. 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"); -@@ -168,6 +210,13 @@ gtk_tooltip_init (GtkTooltip *tooltip) +@@ -234,6 +276,13 @@ gtk_tooltip_init (GtkTooltip *tooltip) gtk_box_pack_start (GTK_BOX (tooltip->box), tooltip->label, FALSE, FALSE, 0); @@ -87,7 +87,7 @@ diff -up gtk+-2.91.0/gtk/gtktooltip.c.fresh-tooltips gtk+-2.91.0/gtk/gtktooltip. tooltip->custom_widget = NULL; } -@@ -517,19 +566,209 @@ gtk_tooltip_window_style_set (GtkTooltip +@@ -583,19 +632,209 @@ gtk_tooltip_window_style_set (GtkTooltip gtk_widget_queue_draw (tooltip->window); } @@ -307,10 +307,10 @@ diff -up gtk+-2.91.0/gtk/gtktooltip.c.fresh-tooltips gtk+-2.91.0/gtk/gtktooltip. return FALSE; } -diff -up gtk+-2.91.0/gtk/gtkwidget.c.fresh-tooltips gtk+-2.91.0/gtk/gtkwidget.c ---- gtk+-2.91.0/gtk/gtkwidget.c.fresh-tooltips 2010-09-30 21:30:41.000000000 -0400 -+++ gtk+-2.91.0/gtk/gtkwidget.c 2010-10-12 12:07:04.421808000 -0400 -@@ -2891,6 +2891,14 @@ gtk_widget_class_init (GtkWidgetClass *k +diff -up gtk+-2.91.3/gtk/gtkwidget.c.fresh-tooltips gtk+-2.91.3/gtk/gtkwidget.c +--- gtk+-2.91.3/gtk/gtkwidget.c.fresh-tooltips 2010-11-01 09:17:21.000000000 -0400 ++++ gtk+-2.91.3/gtk/gtkwidget.c 2010-11-01 14:11:38.921410003 -0400 +@@ -3190,6 +3190,14 @@ gtk_widget_class_init (GtkWidgetClass *k 1, G_MAXINT, 16, GTK_PARAM_READABLE)); diff --git a/gtk3.spec b/gtk3.spec index 38964a2..efe1ee8 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -10,7 +10,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk3 -Version: 2.91.1 +Version: 2.91.3 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -110,7 +110,7 @@ widget toolkit. %prep %setup -q -n gtk+-%{version} %patch0 -p1 -b .system-python -#%patch2 -p1 -b .fresh-tooltips +%patch2 -p1 -b .fresh-tooltips %build @@ -264,6 +264,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache %doc tmpdocs/faq %changelog +* Mon Nov 1 2010 Matthias Clasen 2.91.3-1 +- Update to 2.91.3 + * Wed Oct 20 2010 Richard Hughes 2.91.1-1 - Update to 2.91.1 diff --git a/sources b/sources index bf57641..03fc9c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -efd1dd3914ef9b892fabddad43cc74e6 gtk+-2.91.1.tar.bz2 +69eaef0eb544033c3ef067abcf4812b9 gtk+-2.91.3.tar.bz2