* New upstream bugfix release:

+ debian/patches/070_mandatory-relibtoolize.patch: - Updated for the new version. + debian/patches/091_dont-omit-gtk-icon-size-dialog.patch, debian/patches/092_gtk-image-size-allocation.patch: - Dropped, merged upstream.
2009-12-01 06:47:35 +00:00
parent fef9aed635
commit 585f1689b9
4 changed files with 11 additions and 109 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,14 @@
+gtk+2.0 (2.18.4-1) unstable; urgency=low
+
+  * New upstream bugfix release:
+    + debian/patches/070_mandatory-relibtoolize.patch:
+      - Updated for the new version.
+    + debian/patches/091_dont-omit-gtk-icon-size-dialog.patch,
+      debian/patches/092_gtk-image-size-allocation.patch:
+      - Dropped, merged upstream.
+
+ -- Sebastian Dröge <slomo@debian.org>  Tue, 01 Dec 2009 07:46:18 +0100
+
 gtk+2.0 (2.18.3-1) unstable; urgency=low

  * New upstream bugfix release:
--- a/debian/patches/091_dont-omit-gtk-icon-size-dialog.patch
+++ b/debian/patches/091_dont-omit-gtk-icon-size-dialog.patch
@ -1,21 +0,0 @@
-From ff765f478d151403c9265e0db13bc0ff18a2c50d Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sun, 18 Oct 2009 06:07:58 +0000
-Subject: Don't omit GTK_ICON_SIZE_DIALOG
-
---
-diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
-index 1cdb0c1..74c52ae 100644
--- a/gtk/gtkstatusicon.c
-+++ b/gtk/gtkstatusicon.c
-@@ -1352,7 +1352,7 @@ find_icon_size (GtkWidget *widget,
-   dist = G_MAXINT;
-   size = GTK_ICON_SIZE_MENU;
- 
-  for (s = GTK_ICON_SIZE_MENU; s < GTK_ICON_SIZE_DIALOG; s++)
-+  for (s = GTK_ICON_SIZE_MENU; s <= GTK_ICON_SIZE_DIALOG; s++)
-     {
-       if (gtk_icon_size_lookup_for_settings (settings, s, &w, &h) &&
- 	  w <= pixel_size && h <= pixel_size)
--
-cgit v0.8.2
--- a/debian/patches/092_gtk-image-size-allocation.patch
+++ b/debian/patches/092_gtk-image-size-allocation.patch
@ -1,86 +0,0 @@
-From a30b59229fe5f26d3bf8955b110bdbfbb0ce205a Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sun, 18 Oct 2009 05:36:14 +0000
-Subject: Fix a problem in GtkImage size allocation
-
-When GtkMisc padding is set on an image, the optimization for only
-recalculating size after a clear() breaks, since the requisition is
-not (0, 0). We need a separate 'need_calc' flag.
---
-diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
-index 036560f..4d80267 100644
--- a/gtk/gtkimage.c
-+++ b/gtk/gtkimage.c
-@@ -45,6 +45,7 @@ struct _GtkImagePrivate
-   gchar *filename;
- 
-   gint pixel_size;
-+  guint need_calc_size : 1;
- };
- 
- #define GTK_IMAGE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_IMAGE, GtkImagePrivate))
-@@ -1710,6 +1711,7 @@ gtk_image_expose (GtkWidget      *widget,
-     {
-       GtkImage *image;
-       GtkMisc *misc;
-+      GtkImagePrivate *priv;
-       GdkRectangle area, image_bound;
-       gfloat xalign;
-       gint x, y, mask_x, mask_y;
-@@ -1719,6 +1721,7 @@ gtk_image_expose (GtkWidget      *widget,
- 
-       image = GTK_IMAGE (widget);
-       misc = GTK_MISC (widget);
-+      priv = GTK_IMAGE_GET_PRIVATE (image);
- 
-       area = event->area;
- 
-@@ -1727,7 +1730,7 @@ gtk_image_expose (GtkWidget      *widget,
-        * and size_request() if something explicitely forces
-        * a redraw.
-        */
-      if (widget->requisition.width == 0 && widget->requisition.height == 0)
-+      if (priv->need_calc_size)
- 	gtk_image_calc_size (image);
-       
-       if (!gdk_rectangle_intersect (&area, &widget->allocation, &area))
-@@ -1737,7 +1740,7 @@ gtk_image_expose (GtkWidget      *widget,
- 	xalign = misc->xalign;
-       else
- 	xalign = 1.0 - misc->xalign;
-  
-+
-       x = floor (widget->allocation.x + misc->xpad
- 		 + ((widget->allocation.width - widget->requisition.width) * xalign));
-       y = floor (widget->allocation.y + misc->ypad 
-@@ -2149,8 +2152,13 @@ gtk_image_reset (GtkImage *image)
- void
- gtk_image_clear (GtkImage *image)
- {
-  gtk_image_reset (image);
-+  GtkImagePrivate *priv;
-+
-+  priv = GTK_IMAGE_GET_PRIVATE (image);
-+
-+  priv->need_calc_size = 1;
- 
-+  gtk_image_reset (image);
-   gtk_image_update_size (image, 0, 0);
- }
- 
-@@ -2159,7 +2167,12 @@ gtk_image_calc_size (GtkImage *image)
- {
-   GtkWidget *widget = GTK_WIDGET (image);
-   GdkPixbuf *pixbuf = NULL;
-  
-+  GtkImagePrivate *priv;
-+
-+  priv = GTK_IMAGE_GET_PRIVATE (image);
-+
-+  priv->need_calc_size = 0;
-+
-   /* We update stock/icon set on every size request, because
-    * the theme could have affected the size; for other kinds of
-    * image, we just update the requisition when the image data
--
-cgit v0.8.2
--- a/debian/patches/series
+++ b/debian/patches/series
@ -14,5 +14,3 @@
 060_ignore-random-icons.patch
 061_use_pdf_as_default_printing_standard.patch
 070_mandatory-relibtoolize.patch
-091_dont-omit-gtk-icon-size-dialog.patch
-092_gtk-image-size-allocation.patch