From 62d5286d37d46bc3e8d1a861d87506fadcb93cb0 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 20 Mar 2006 12:57:55 +0000 Subject: [PATCH] Upgrade GTK+ 2.8.9 to 2.8.16 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@305 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../automake-lossage.patch | 0 .../disable-tooltips.patch | 0 .../gtk+-handhelds.patch | 0 .../gtklabel-resize-patch | 0 .../gtktreeview-316689.patch | 0 .../hardcoded_libtool.patch | 0 .../menu-deactivate.patch | 0 .../no-demos.patch | 0 .../{gtk+-2.8.9 => gtk+-2.8.16}/no-xwc.patch | 0 .../scroll-timings.patch | 0 .../single-click.patch | 0 .../small-gtkfilesel.patch | 0 .../spinbutton.patch | 0 .../xsettings.patch | 0 .../gtk+/gtk+-2.8.9/treeviewfix.patch | 29 ------------------- .../gtk+/{gtk+_2.8.9.bb => gtk+_2.8.16.bb} | 3 +- 16 files changed, 1 insertion(+), 31 deletions(-) rename openembedded/packages/gtk+/{gtk+-2.8.9 => gtk+-2.8.16}/automake-lossage.patch (100%) rename openembedded/packages/gtk+/{gtk+-2.8.9 => gtk+-2.8.16}/disable-tooltips.patch (100%) rename openembedded/packages/gtk+/{gtk+-2.8.9 => gtk+-2.8.16}/gtk+-handhelds.patch (100%) rename openembedded/packages/gtk+/{gtk+-2.8.9 => gtk+-2.8.16}/gtklabel-resize-patch (100%) rename openembedded/packages/gtk+/{gtk+-2.8.9 => gtk+-2.8.16}/gtktreeview-316689.patch (100%) rename openembedded/packages/gtk+/{gtk+-2.8.9 => gtk+-2.8.16}/hardcoded_libtool.patch (100%) rename openembedded/packages/gtk+/{gtk+-2.8.9 => gtk+-2.8.16}/menu-deactivate.patch (100%) rename openembedded/packages/gtk+/{gtk+-2.8.9 => gtk+-2.8.16}/no-demos.patch (100%) rename openembedded/packages/gtk+/{gtk+-2.8.9 => gtk+-2.8.16}/no-xwc.patch (100%) rename openembedded/packages/gtk+/{gtk+-2.8.9 => gtk+-2.8.16}/scroll-timings.patch (100%) rename openembedded/packages/gtk+/{gtk+-2.8.9 => gtk+-2.8.16}/single-click.patch (100%) rename openembedded/packages/gtk+/{gtk+-2.8.9 => gtk+-2.8.16}/small-gtkfilesel.patch (100%) rename openembedded/packages/gtk+/{gtk+-2.8.9 => gtk+-2.8.16}/spinbutton.patch (100%) rename openembedded/packages/gtk+/{gtk+-2.8.9 => gtk+-2.8.16}/xsettings.patch (100%) delete mode 100644 openembedded/packages/gtk+/gtk+-2.8.9/treeviewfix.patch rename openembedded/packages/gtk+/{gtk+_2.8.9.bb => gtk+_2.8.16.bb} (97%) diff --git a/openembedded/packages/gtk+/gtk+-2.8.9/automake-lossage.patch b/openembedded/packages/gtk+/gtk+-2.8.16/automake-lossage.patch similarity index 100% rename from openembedded/packages/gtk+/gtk+-2.8.9/automake-lossage.patch rename to openembedded/packages/gtk+/gtk+-2.8.16/automake-lossage.patch diff --git a/openembedded/packages/gtk+/gtk+-2.8.9/disable-tooltips.patch b/openembedded/packages/gtk+/gtk+-2.8.16/disable-tooltips.patch similarity index 100% rename from openembedded/packages/gtk+/gtk+-2.8.9/disable-tooltips.patch rename to openembedded/packages/gtk+/gtk+-2.8.16/disable-tooltips.patch diff --git a/openembedded/packages/gtk+/gtk+-2.8.9/gtk+-handhelds.patch b/openembedded/packages/gtk+/gtk+-2.8.16/gtk+-handhelds.patch similarity index 100% rename from openembedded/packages/gtk+/gtk+-2.8.9/gtk+-handhelds.patch rename to openembedded/packages/gtk+/gtk+-2.8.16/gtk+-handhelds.patch diff --git a/openembedded/packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch b/openembedded/packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch similarity index 100% rename from openembedded/packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch rename to openembedded/packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch diff --git a/openembedded/packages/gtk+/gtk+-2.8.9/gtktreeview-316689.patch b/openembedded/packages/gtk+/gtk+-2.8.16/gtktreeview-316689.patch similarity index 100% rename from openembedded/packages/gtk+/gtk+-2.8.9/gtktreeview-316689.patch rename to openembedded/packages/gtk+/gtk+-2.8.16/gtktreeview-316689.patch diff --git a/openembedded/packages/gtk+/gtk+-2.8.9/hardcoded_libtool.patch b/openembedded/packages/gtk+/gtk+-2.8.16/hardcoded_libtool.patch similarity index 100% rename from openembedded/packages/gtk+/gtk+-2.8.9/hardcoded_libtool.patch rename to openembedded/packages/gtk+/gtk+-2.8.16/hardcoded_libtool.patch diff --git a/openembedded/packages/gtk+/gtk+-2.8.9/menu-deactivate.patch b/openembedded/packages/gtk+/gtk+-2.8.16/menu-deactivate.patch similarity index 100% rename from openembedded/packages/gtk+/gtk+-2.8.9/menu-deactivate.patch rename to openembedded/packages/gtk+/gtk+-2.8.16/menu-deactivate.patch diff --git a/openembedded/packages/gtk+/gtk+-2.8.9/no-demos.patch b/openembedded/packages/gtk+/gtk+-2.8.16/no-demos.patch similarity index 100% rename from openembedded/packages/gtk+/gtk+-2.8.9/no-demos.patch rename to openembedded/packages/gtk+/gtk+-2.8.16/no-demos.patch diff --git a/openembedded/packages/gtk+/gtk+-2.8.9/no-xwc.patch b/openembedded/packages/gtk+/gtk+-2.8.16/no-xwc.patch similarity index 100% rename from openembedded/packages/gtk+/gtk+-2.8.9/no-xwc.patch rename to openembedded/packages/gtk+/gtk+-2.8.16/no-xwc.patch diff --git a/openembedded/packages/gtk+/gtk+-2.8.9/scroll-timings.patch b/openembedded/packages/gtk+/gtk+-2.8.16/scroll-timings.patch similarity index 100% rename from openembedded/packages/gtk+/gtk+-2.8.9/scroll-timings.patch rename to openembedded/packages/gtk+/gtk+-2.8.16/scroll-timings.patch diff --git a/openembedded/packages/gtk+/gtk+-2.8.9/single-click.patch b/openembedded/packages/gtk+/gtk+-2.8.16/single-click.patch similarity index 100% rename from openembedded/packages/gtk+/gtk+-2.8.9/single-click.patch rename to openembedded/packages/gtk+/gtk+-2.8.16/single-click.patch diff --git a/openembedded/packages/gtk+/gtk+-2.8.9/small-gtkfilesel.patch b/openembedded/packages/gtk+/gtk+-2.8.16/small-gtkfilesel.patch similarity index 100% rename from openembedded/packages/gtk+/gtk+-2.8.9/small-gtkfilesel.patch rename to openembedded/packages/gtk+/gtk+-2.8.16/small-gtkfilesel.patch diff --git a/openembedded/packages/gtk+/gtk+-2.8.9/spinbutton.patch b/openembedded/packages/gtk+/gtk+-2.8.16/spinbutton.patch similarity index 100% rename from openembedded/packages/gtk+/gtk+-2.8.9/spinbutton.patch rename to openembedded/packages/gtk+/gtk+-2.8.16/spinbutton.patch diff --git a/openembedded/packages/gtk+/gtk+-2.8.9/xsettings.patch b/openembedded/packages/gtk+/gtk+-2.8.16/xsettings.patch similarity index 100% rename from openembedded/packages/gtk+/gtk+-2.8.9/xsettings.patch rename to openembedded/packages/gtk+/gtk+-2.8.16/xsettings.patch diff --git a/openembedded/packages/gtk+/gtk+-2.8.9/treeviewfix.patch b/openembedded/packages/gtk+/gtk+-2.8.9/treeviewfix.patch deleted file mode 100644 index 0608075ed4..0000000000 --- a/openembedded/packages/gtk+/gtk+-2.8.9/treeviewfix.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: gtktreeview.c -=================================================================== -RCS file: /cvs/gnome/gtk+/gtk/gtktreeview.c,v -retrieving revision 1.498 -diff -u -p -r1.498 gtktreeview.c ---- gtk+-2.8.9/gtk/gtktreeview.c.old 22 Oct 2005 21:08:23 -0000 1.498 -+++ gtk+-2.8.9/gtk/gtktreeview.c 24 Oct 2005 22:30:27 -0000 -@@ -2098,6 +2098,9 @@ gtk_tree_view_size_allocate (GtkWidget - /* now the adjustments and window sizes are in sync, we can sync toprow/dy again */ - if (tree_view->priv->height <= tree_view->priv->vadjustment->page_size) - gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), 0); -+ else if (tree_view->priv->vadjustment->value + tree_view->priv->vadjustment->page_size > tree_view->priv->height) -+ gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), -+ tree_view->priv->height - tree_view->priv->vadjustment->page_size); - else if (gtk_tree_row_reference_valid (tree_view->priv->top_row)) - gtk_tree_view_top_row_to_dy (tree_view); - else -@ -5031,6 +5034,11 @@ validate_visible_area (GtkTreeView *tree - * else than zero. we update top_row to be in sync with dy = 0. - */ - gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), 0); -+ gtk_tree_view_dy_to_top_row (tree_view); -+ } -+ else if (tree_view->priv->vadjustment->value + tree_view->priv->vadjustment->page_size > tree_view->priv->height) -+ { -+ gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), tree_view->priv->height - tree_view->priv->vadjustment->page_size); - gtk_tree_view_dy_to_top_row (tree_view); - } - else diff --git a/openembedded/packages/gtk+/gtk+_2.8.9.bb b/openembedded/packages/gtk+/gtk+_2.8.16.bb similarity index 97% rename from openembedded/packages/gtk+/gtk+_2.8.9.bb rename to openembedded/packages/gtk+/gtk+_2.8.16.bb index 7268d74f3e..875efa8d39 100644 --- a/openembedded/packages/gtk+/gtk+_2.8.9.bb +++ b/openembedded/packages/gtk+/gtk+_2.8.16.bb @@ -15,8 +15,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \ file://hardcoded_libtool.patch;patch=1 \ file://disable-tooltips.patch;patch=1 \ file://gtklabel-resize-patch;patch=1 \ - file://gtktreeview-316689.patch;patch=1 \ - file://treeviewfix.patch;patch=1" + file://gtktreeview-316689.patch;patch=1" # file://menu-deactivate.patch;patch=1 \ # file://xsettings.patch;patch=1 \ # file://scroll-timings.patch;patch=1 \ -- 2.40.1