tags 540981 + pending
tags 577298 + patch pending
thanks
Dear maintainer,
I've prepared an NMU for gentoo (versioned as 0.15.3-0.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
diff -u gentoo-0.15.3/debian/changelog gentoo-0.15.3/debian/changelog
--- gentoo-0.15.3/debian/changelog
+++ gentoo-0.15.3/debian/changelog
@@ -1,3 +1,13 @@
+gentoo (0.15.3-0.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * src/odmultibutton.c:
+ - Replace deprecated GTK macro with related function (Closes: #577298).
+ * src/mntent_wrap.c:
+ - Patch from Cyril Brulebois to fix FTBFS on kFreeBSD (Closes: #540981).
+
+ -- Luca Falavigna <dktrkr...@debian.org> Sat, 08 May 2010 15:24:50 +0200
+
gentoo (0.15.3-0.1) unstable; urgency=low
* Non-maintainer upload.
only in patch2:
unchanged:
--- gentoo-0.15.3.orig/src/odmultibutton.c
+++ gentoo-0.15.3/src/odmultibutton.c
@@ -73,8 +73,8 @@
}
if(p != NULL)
{
- if(GTK_WIDGET_STATE(widget) != GTK_WIDGET_STATE(p))
- gtk_widget_set_state(p, GTK_WIDGET_STATE(widget));
+ if(gtk_widget_get_state(widget) != gtk_widget_get_state(p))
+ gtk_widget_set_state(p, gtk_widget_get_state(widget));
gtk_widget_show(p);
if(gtk_widget_get_parent(p) != NULL)
gtk_widget_reparent(p, widget);
@@ -86,7 +86,7 @@
}
mb->last_index = index;
}
- if(GTK_WIDGET_DRAWABLE(widget))
+ if(gtk_widget_is_drawable(widget))
gtk_widget_queue_draw(widget);
}
@@ -144,9 +144,9 @@
{
GtkStateType state;
- state = GTK_WIDGET_STATE(widget);
+ state = gtk_widget_get_state(widget);
- if(GTK_WIDGET_DRAWABLE(widget) && state != GTK_STATE_ACTIVE)
+ if(gtk_widget_is_drawable(widget) && state != GTK_STATE_ACTIVE)
{
GtkStyle *style = gtk_widget_get_style(widget);
const guint EARSIZE = 5;
@@ -209,7 +209,7 @@
g_return_if_fail(area != NULL);
g_return_if_fail(OD_IS_MULTIBUTTON(widget));
- if(GTK_WIDGET_DRAWABLE(widget))
+ if(gtk_widget_is_drawable(widget))
{
ODMultiButton *mb = OD_MULTIBUTTON(widget);
@@ -449,7 +449,7 @@
od_multibutton_reset_label(mb, index, GTK_LABEL(w), text, bg, fg);
if(GTK_WIDGET(mb)->parent)
gtk_widget_queue_resize(GTK_WIDGET(mb));
- if(GTK_WIDGET_DRAWABLE(mb))
+ if(gtk_widget_is_drawable(mb))
gtk_widget_queue_draw(GTK_WIDGET(mb));
}
}
only in patch2:
unchanged:
--- gentoo-0.15.3.orig/src/mntent_wrap.c
+++ gentoo-0.15.3/src/mntent_wrap.c
@@ -24,7 +24,7 @@
/* ----------------------------------------------------------------------------------------- */
-#if defined __CYGWIN__ || defined __linux__ || defined __sgi /* Linux and IRIX implementation. */
+#if defined __CYGWIN__ || defined __linux__ || defined __sgi || defined __GLIBC__ /* Linux and IRIX implementation. */
#include <mntent.h>
