diff options
Diffstat (limited to 'x11-toolkits/gtk20')
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 3 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/distinfo | 4 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/files/patch-gtk_gtkimage.c | 41 |
3 files changed, 3 insertions, 45 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index b1173b409e7d..d5429e0b74b2 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gtk -PORTVERSION= 2.6.5 -PORTREVISION= 1 +PORTVERSION= 2.6.6 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.6,} \ ftp://ftp.gtk.org/pub/gtk/v2.6/ \ diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index bbc256d5ad2d..fbd24b6e4ff3 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gtk+-2.6.5.tar.bz2) = 3f52f64bdbd132eccfee2de5d2124190 -SIZE (gnome2/gtk+-2.6.5.tar.bz2) = 11440440 +MD5 (gnome2/gtk+-2.6.6.tar.bz2) = 6bf5a71a7ea6a02821fd0c9edab25904 +SIZE (gnome2/gtk+-2.6.6.tar.bz2) = 11039884 MD5 (gnome2/gtk+-2.4.0-menushadow.patch) = 5dde5c5af8f25d282c365663a7256b5c SIZE (gnome2/gtk+-2.4.0-menushadow.patch) = 15603 diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkimage.c b/x11-toolkits/gtk20/files/patch-gtk_gtkimage.c deleted file mode 100644 index 64317b2987ad..000000000000 --- a/x11-toolkits/gtk20/files/patch-gtk_gtkimage.c +++ /dev/null @@ -1,41 +0,0 @@ -Index: gtk/gtkimage.c -=================================================================== -RCS file: /cvs/gnome/gtk+/gtk/gtkimage.c,v -retrieving revision 1.54.2.5 -diff -p -u -r1.54.2.5 gtkimage.c ---- gtk/gtkimage.c 9 Apr 2005 02:51:02 -0000 1.54.2.5 -+++ gtk/gtkimage.c 9 Apr 2005 15:55:36 -0000 -@@ -1545,7 +1545,6 @@ gtk_image_expose (GtkWidget *widget - GdkBitmap *mask; - GdkPixbuf *pixbuf; - gboolean needs_state_transform; -- GtkStockItem item; - gchar *stock_id; - - -@@ -1655,7 +1654,7 @@ gtk_image_expose (GtkWidget *widget - break; - - case GTK_IMAGE_STOCK: -- if (gtk_stock_lookup (image->data.stock.stock_id, &item)) -+ if (gtk_style_lookup_icon_set (widget->style, image->data.stock.stock_id)) - stock_id = image->data.stock.stock_id; - else - stock_id = GTK_STOCK_MISSING_IMAGE; -@@ -1955,7 +1954,6 @@ gtk_image_calc_size (GtkImage *image) - { - GtkWidget *widget = GTK_WIDGET (image); - GdkPixbuf *pixbuf = NULL; -- GtkStockItem item; - gchar *stock_id; - - /* We update stock/icon set on every size request, because -@@ -1966,7 +1964,7 @@ gtk_image_calc_size (GtkImage *image) - switch (image->storage_type) - { - case GTK_IMAGE_STOCK: -- if (gtk_stock_lookup (image->data.stock.stock_id, &item)) -+ if (gtk_style_lookup_icon_set (widget->style, image->data.stock.stock_id)) - stock_id = image->data.stock.stock_id; - else - stock_id = GTK_STOCK_MISSING_IMAGE; |