r36481 - in /packages/libgtkdatabox/trunk/debian: changelog patches/02_deprecated_GTK.patch patches/series
tille at users.alioth.debian.org
tille at users.alioth.debian.org
Mon May 17 10:08:36 UTC 2010
Author: tille
Date: Mon May 17 10:08:30 2010
New Revision: 36481
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36481
Log:
Applied patch from Luca Falavigna <dktrkranz at debian.org> to replace some outdated GTK macros (closes #577384).
Added:
packages/libgtkdatabox/trunk/debian/patches/02_deprecated_GTK.patch
Modified:
packages/libgtkdatabox/trunk/debian/changelog
packages/libgtkdatabox/trunk/debian/patches/series
Modified: packages/libgtkdatabox/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/changelog?rev=36481&op=diff
==============================================================================
--- packages/libgtkdatabox/trunk/debian/changelog (original)
+++ packages/libgtkdatabox/trunk/debian/changelog Mon May 17 10:08:30 2010
@@ -1,3 +1,11 @@
+libgtkdatabox (1:0.9.1.1-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches/02_deprecated_GTK.patch:
+ - Replace deprecated GTK macro with related function (Closes: #577384).
+
+ -- Luca Falavigna <dktrkranz at debian.org> Sat, 08 May 2010 14:19:31 +0200
+
libgtkdatabox (1:0.9.1.1-3) unstable; urgency=low
* debian/control: added conflicts to older versions not
Added: packages/libgtkdatabox/trunk/debian/patches/02_deprecated_GTK.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/patches/02_deprecated_GTK.patch?rev=36481&op=file
==============================================================================
--- packages/libgtkdatabox/trunk/debian/patches/02_deprecated_GTK.patch (added)
+++ packages/libgtkdatabox/trunk/debian/patches/02_deprecated_GTK.patch Mon May 17 10:08:30 2010
@@ -1,0 +1,141 @@
+Index: libgtkdatabox-0.9.1.1/gtk/gtkdatabox.c
+===================================================================
+--- libgtkdatabox-0.9.1.1.orig/gtk/gtkdatabox.c 2010-05-08 14:18:44.719930631 +0200
++++ libgtkdatabox-0.9.1.1/gtk/gtkdatabox.c 2010-05-08 14:18:27.159915281 +0200
+@@ -1104,7 +1104,7 @@
+
+ widget->allocation = *allocation;
+
+- if (GTK_WIDGET_REALIZED (widget))
++ if (gtk_widget_get_realized (widget))
+ {
+ gdk_window_move_resize (widget->window,
+ allocation->x, allocation->y,
+@@ -1154,7 +1154,7 @@
+ }
+
+ gdk_draw_drawable (widget->window,
+- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
++ widget->style->fg_gc[gtk_widget_get_state (widget)],
+ box->priv->backing_pixmap,
+ event->area.x, event->area.y,
+ event->area.x, event->area.y,
+@@ -1443,7 +1443,7 @@
+ /* Copy a part of the backing_pixmap to the screen */
+ if (pixmapCopyRect)
+ gdk_draw_drawable (widget->window,
+- widget->style->fg_gc[GTK_WIDGET_STATE (box)],
++ widget->style->fg_gc[gtk_widget_get_state (box)],
+ box->priv->backing_pixmap,
+ pixmapCopyRect->x,
+ pixmapCopyRect->y,
+@@ -1771,7 +1771,7 @@
+ static void
+ gtk_databox_calculate_visible_limits (GtkDatabox * box)
+ {
+- if (!GTK_WIDGET_VISIBLE (box))
++ if (!gtk_widget_get_visible (box))
+ return;
+
+ if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LINEAR)
+Index: libgtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c
+===================================================================
+--- libgtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_ruler.c 2010-05-08 14:18:45.071934115 +0200
++++ libgtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c 2010-05-08 14:18:41.527924716 +0200
+@@ -323,7 +323,7 @@
+ }
+ g_object_thaw_notify (G_OBJECT (ruler));
+
+- if (GTK_WIDGET_DRAWABLE (ruler))
++ if (gtk_widget_is_drawable (ruler))
+ gtk_widget_queue_draw (GTK_WIDGET (ruler));
+ }
+
+@@ -354,7 +354,7 @@
+ }
+ g_object_thaw_notify (G_OBJECT (ruler));
+
+- if (GTK_WIDGET_DRAWABLE (ruler))
++ if (gtk_widget_is_drawable (ruler))
+ gtk_widget_queue_draw (GTK_WIDGET (ruler));
+ }
+
+@@ -378,7 +378,7 @@
+ /* g_object_notify (G_OBJECT (ruler), "scale-type"); */
+ }
+
+- if (GTK_WIDGET_DRAWABLE (ruler))
++ if (gtk_widget_is_drawable (ruler))
+ gtk_widget_queue_draw (GTK_WIDGET (ruler));
+ }
+
+@@ -414,7 +414,7 @@
+ widget->requisition.width = widget->style->xthickness * 2 + RULER_SIZE;
+ }
+
+- if (GTK_WIDGET_DRAWABLE (ruler))
++ if (gtk_widget_is_drawable (ruler))
+ gtk_widget_queue_draw (GTK_WIDGET (ruler));
+ }
+
+@@ -529,7 +529,7 @@
+ g_sprintf (format_string, "%%-%dg", ruler->priv->max_length - 1);
+
+
+- if (!GTK_WIDGET_DRAWABLE (ruler))
++ if (!gtk_widget_is_drawable (ruler))
+ return;
+
+ widget = GTK_WIDGET (ruler);
+@@ -682,14 +682,14 @@
+ if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ gtk_paint_layout (widget->style,
+ ruler->priv->backing_pixmap,
+- GTK_WIDGET_STATE (widget),
++ gtk_widget_get_state (widget),
+ FALSE,
+ NULL,
+ widget, "ruler", pos + 2, ythickness - 1, layout);
+ else
+ gtk_paint_layout (widget->style,
+ ruler->priv->backing_pixmap,
+- GTK_WIDGET_STATE (widget),
++ gtk_widget_get_state (widget),
+ FALSE,
+ NULL,
+ widget,
+@@ -761,7 +761,7 @@
+ gint ythickness;
+ gdouble increment;
+
+- if (GTK_WIDGET_DRAWABLE (ruler))
++ if (gtk_widget_is_drawable (ruler))
+ {
+ xthickness = widget->style->xthickness;
+ ythickness = widget->style->ythickness;
+@@ -893,7 +893,7 @@
+
+ widget->allocation = *allocation;
+
+- if (GTK_WIDGET_REALIZED (widget))
++ if (gtk_widget_get_realized (widget))
+ {
+ gdk_window_move_resize (widget->window,
+ allocation->x, allocation->y,
+@@ -908,14 +908,14 @@
+ {
+ GtkDataboxRuler *ruler;
+
+- if (GTK_WIDGET_DRAWABLE (widget))
++ if (gtk_widget_is_drawable (widget))
+ {
+ ruler = GTK_DATABOX_RULER (widget);
+
+ gtk_databox_ruler_draw_ticks (ruler);
+
+ gdk_draw_drawable (widget->window,
+- widget->style->fg_gc[GTK_WIDGET_STATE (ruler)],
++ widget->style->fg_gc[gtk_widget_get_state (ruler)],
+ ruler->priv->backing_pixmap,
+ 0, 0, 0, 0,
+ widget->allocation.width, widget->allocation.height);
Modified: packages/libgtkdatabox/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/patches/series?rev=36481&op=diff
==============================================================================
--- packages/libgtkdatabox/trunk/debian/patches/series (original)
+++ packages/libgtkdatabox/trunk/debian/patches/series Mon May 17 10:08:30 2010
@@ -1,1 +1,2 @@
01_libglage_example.patch
+02_deprecated_GTK.patch
More information about the debian-science-commits
mailing list