From 7f0c3d7140c0030bd56901d52ecc9f6b1ada2a51 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 22 Aug 2008 23:01:25 +0000 Subject: [PATCH] 2.13.7 --- .cvsignore | 2 +- evo-composer.patch | 13 ------ gtk2.spec | 18 +++----- menu-breakage.patch | 54 ----------------------- panel-crash.patch | 103 -------------------------------------------- sources | 2 +- 6 files changed, 8 insertions(+), 184 deletions(-) delete mode 100644 evo-composer.patch delete mode 100644 menu-breakage.patch delete mode 100644 panel-crash.patch diff --git a/.cvsignore b/.cvsignore index c13813a..6459572 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gtk+-2.13.6.tar.bz2 +gtk+-2.13.7.tar.bz2 diff --git a/evo-composer.patch b/evo-composer.patch deleted file mode 100644 index e8a2062..0000000 --- a/evo-composer.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up gtk+-2.13.6/gtk/gtkadjustment.c.evo-composer gtk+-2.13.6/gtk/gtkadjustment.c ---- gtk+-2.13.6/gtk/gtkadjustment.c.evo-composer 2008-08-11 17:11:17.000000000 -0400 -+++ gtk+-2.13.6/gtk/gtkadjustment.c 2008-08-11 17:11:47.000000000 -0400 -@@ -359,7 +359,8 @@ gtk_adjustment_set_value (GtkAdjustment - { - g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); - -- value = CLAMP (value, adjustment->lower, adjustment->upper - adjustment->page_size); -+ value = MIN (value, adjustment->upper - adjustment->page_size); -+ value = MAX (value, adjustment->lower); - - if (value != adjustment->value) - { diff --git a/gtk2.spec b/gtk2.spec index cfe5d52..2e57302 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -1,6 +1,6 @@ # Note that this is NOT a relocatable package -%define glib2_base_version 2.17.1 +%define glib2_base_version 2.17.7 %define glib2_version %{glib2_base_version}-1 %define pango_base_version 1.20.0 %define pango_version %{pango_base_version}-1 @@ -10,13 +10,13 @@ %define cairo_version %{cairo_base_version}-1 %define libpng_version 2:1.2.2-16 -%define base_version 2.13.6 +%define base_version 2.13.7 %define bin_version 2.10.0 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: %{base_version} -Release: 4%{?dist} +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/gtk+/2.13/gtk+-%{version}.tar.bz2 @@ -30,12 +30,6 @@ Patch1: gtk+-2.11.1-set-invisible-char-to-bullet.patch # a workaround for some brokenness in the flash plugin # see http://bugzilla.gnome.org/show_bug.cgi?id=463773 Patch2: workaround.patch -# from upstream svn -Patch3: menu-breakage.patch -# from upstream svn -Patch4: evo-composer.patch -# from upstream svn -Patch5: panel-crash.patch BuildRequires: atk-devel >= %{atk_version} BuildRequires: pango-devel >= %{pango_version} @@ -121,9 +115,6 @@ docs for the GTK+ widget toolkit. %patch0 -p1 -b .lib64 %patch1 -p1 -b .set-invisible-char-to-bullet %patch2 -p1 -b .workaround -%patch3 -p1 -b .menu-breakage -%patch4 -p1 -b .evo-composer -%patch5 -p1 -b .panel-crash for i in config.guess config.sub ; do test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . @@ -307,6 +298,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-2.0 %changelog +* Fri Aug 22 2008 Matthias Clasen - 2.13.7-1 +- Update to 2.13.7 + * Wed Aug 13 2008 Matthias Clasen - 2.13.6-4 - Fix sporadic panel crashes diff --git a/menu-breakage.patch b/menu-breakage.patch deleted file mode 100644 index ac55492..0000000 --- a/menu-breakage.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -up gtk+-2.13.6/gtk/gtkmenu.c.menu-breakage gtk+-2.13.6/gtk/gtkmenu.c ---- gtk+-2.13.6/gtk/gtkmenu.c.menu-breakage 2008-08-09 23:07:35.000000000 -0400 -+++ gtk+-2.13.6/gtk/gtkmenu.c 2008-08-09 23:08:04.000000000 -0400 -@@ -3623,6 +3623,11 @@ gtk_menu_enter_notify (GtkWidget - GtkWidget *menu_item; - gboolean touchscreen_mode; - -+ if (event->mode == GDK_CROSSING_GTK_GRAB || -+ event->mode == GDK_CROSSING_GTK_UNGRAB || -+ event->mode == GDK_CROSSING_STATE_CHANGED) -+ return TRUE; -+ - g_object_get (gtk_widget_get_settings (widget), - "gtk-touchscreen-mode", &touchscreen_mode, - NULL); -@@ -3694,6 +3699,11 @@ gtk_menu_leave_notify (GtkWidget - GtkMenuItem *menu_item; - GtkWidget *event_widget; - -+ if (event->mode == GDK_CROSSING_GTK_GRAB || -+ event->mode == GDK_CROSSING_GTK_UNGRAB || -+ event->mode == GDK_CROSSING_STATE_CHANGED) -+ return TRUE; -+ - menu = GTK_MENU (widget); - menu_shell = GTK_MENU_SHELL (widget); - -diff -up gtk+-2.13.6/gtk/gtkmenushell.c.menu-breakage gtk+-2.13.6/gtk/gtkmenushell.c ---- gtk+-2.13.6/gtk/gtkmenushell.c.menu-breakage 2008-08-09 23:07:44.000000000 -0400 -+++ gtk+-2.13.6/gtk/gtkmenushell.c 2008-08-09 23:08:40.000000000 -0400 -@@ -802,6 +802,11 @@ gtk_menu_shell_enter_notify (GtkWidget - { - GtkMenuShell *menu_shell = GTK_MENU_SHELL (widget); - -+ if (event->mode == GDK_CROSSING_GTK_GRAB || -+ event->mode == GDK_CROSSING_GTK_UNGRAB || -+ event->mode == GDK_CROSSING_STATE_CHANGED) -+ return TRUE; -+ - if (menu_shell->active) - { - GtkWidget *menu_item; -@@ -867,6 +872,11 @@ static gint - gtk_menu_shell_leave_notify (GtkWidget *widget, - GdkEventCrossing *event) - { -+ if (event->mode == GDK_CROSSING_GTK_GRAB || -+ event->mode == GDK_CROSSING_GTK_UNGRAB || -+ event->mode == GDK_CROSSING_STATE_CHANGED) -+ return TRUE; -+ - if (GTK_WIDGET_VISIBLE (widget)) - { - GtkMenuShell *menu_shell = GTK_MENU_SHELL (widget); diff --git a/panel-crash.patch b/panel-crash.patch deleted file mode 100644 index ff21ef5..0000000 --- a/panel-crash.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff -up gtk+-2.13.6/gtk/gtkimagemenuitem.c.panel-crash gtk+-2.13.6/gtk/gtkimagemenuitem.c ---- gtk+-2.13.6/gtk/gtkimagemenuitem.c.panel-crash 2008-08-13 00:53:00.000000000 -0400 -+++ gtk+-2.13.6/gtk/gtkimagemenuitem.c 2008-08-13 00:53:10.000000000 -0400 -@@ -37,6 +37,7 @@ - #include "gtkprivate.h" - #include "gtkalias.h" - -+static void gtk_image_menu_item_destroy (GtkObject *object); - static void gtk_image_menu_item_size_request (GtkWidget *widget, - GtkRequisition *requisition); - static void gtk_image_menu_item_size_allocate (GtkWidget *widget, -@@ -73,16 +74,14 @@ G_DEFINE_TYPE (GtkImageMenuItem, gtk_ima - static void - gtk_image_menu_item_class_init (GtkImageMenuItemClass *klass) - { -- GObjectClass *gobject_class; -- GtkWidgetClass *widget_class; -- GtkMenuItemClass *menu_item_class; -- GtkContainerClass *container_class; -- -- gobject_class = (GObjectClass*) klass; -- widget_class = (GtkWidgetClass*) klass; -- menu_item_class = (GtkMenuItemClass*) klass; -- container_class = (GtkContainerClass*) klass; -- -+ GObjectClass *gobject_class = (GObjectClass*) klass; -+ GtkObjectClass *object_class = (GtkObjectClass*) klass; -+ GtkWidgetClass *widget_class = (GtkWidgetClass*) klass; -+ GtkMenuItemClass *menu_item_class = (GtkMenuItemClass*) klass; -+ GtkContainerClass *container_class = (GtkContainerClass*) klass; -+ -+ object_class->destroy = gtk_image_menu_item_destroy; -+ - widget_class->screen_changed = gtk_image_menu_item_screen_changed; - widget_class->size_request = gtk_image_menu_item_size_request; - widget_class->size_allocate = gtk_image_menu_item_size_allocate; -@@ -173,6 +172,18 @@ show_image (GtkImageMenuItem *image_menu - } - - static void -+gtk_image_menu_item_destroy (GtkObject *object) -+{ -+ GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (object); -+ -+ if (image_menu_item->image) -+ gtk_container_remove (GTK_CONTAINER (image_menu_item), -+ image_menu_item->image); -+ -+ GTK_OBJECT_CLASS (gtk_image_menu_item_parent_class)->destroy (object); -+} -+ -+static void - gtk_image_menu_item_toggle_size_request (GtkMenuItem *menu_item, - gint *requisition) - { -@@ -239,8 +250,8 @@ gtk_image_menu_item_size_request (GtkWid - child_width = child_requisition.width; - child_height = child_requisition.height; - } -- -- (* GTK_WIDGET_CLASS (gtk_image_menu_item_parent_class)->size_request) (widget, requisition); -+ -+ GTK_WIDGET_CLASS (gtk_image_menu_item_parent_class)->size_request (widget, requisition); - - /* not done with height since that happens via the - * toggle_size_request -@@ -270,8 +281,8 @@ gtk_image_menu_item_size_allocate (GtkWi - pack_dir = GTK_PACK_DIRECTION_LTR; - - image_menu_item = GTK_IMAGE_MENU_ITEM (widget); -- -- (* GTK_WIDGET_CLASS (gtk_image_menu_item_parent_class)->size_allocate) (widget, allocation); -+ -+ GTK_WIDGET_CLASS (gtk_image_menu_item_parent_class)->size_allocate (widget, allocation); - - if (image_menu_item->image && show_image (image_menu_item)) - { -@@ -346,11 +357,11 @@ gtk_image_menu_item_forall (GtkContainer - gpointer callback_data) - { - GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (container); -- -- (* GTK_CONTAINER_CLASS (gtk_image_menu_item_parent_class)->forall) (container, -- include_internals, -- callback, -- callback_data); -+ -+ GTK_CONTAINER_CLASS (gtk_image_menu_item_parent_class)->forall (container, -+ include_internals, -+ callback, -+ callback_data); - - if (include_internals && image_menu_item->image) - (* callback) (image_menu_item->image, callback_data); -@@ -555,7 +566,7 @@ gtk_image_menu_item_remove (GtkContainer - } - else - { -- (* GTK_CONTAINER_CLASS (gtk_image_menu_item_parent_class)->remove) (container, child); -+ GTK_CONTAINER_CLASS (gtk_image_menu_item_parent_class)->remove (container, child); - } - } - diff --git a/sources b/sources index 87f9f31..970ace0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d9b3455d4639d44073abd1fb89d0c7b9 gtk+-2.13.6.tar.bz2 +53c925985a399a68b9c0439ee18b81f3 gtk+-2.13.7.tar.bz2