Hello community, here is the log from the commit of package nbtk for openSUSE:Factory checked in at Fri Mar 26 02:28:12 CET 2010. -------- --- nbtk/nbtk.changes 2010-03-16 21:07:36.000000000 +0100 +++ nbtk/nbtk.changes 2010-03-22 22:33:04.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 22 21:18:30 UTC 2010 - dimstar@opensuse.org + +- Add nbtk-gtk2.19.7.patch to fix build with gtk 2.19.7. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- nbtk-gtk2.19.7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nbtk.spec ++++++ --- /var/tmp/diff_new_pack.fWwdnS/_old 2010-03-26 02:28:02.000000000 +0100 +++ /var/tmp/diff_new_pack.fWwdnS/_new 2010-03-26 02:28:02.000000000 +0100 @@ -19,7 +19,7 @@ Name: nbtk Version: 1.2.0 -Release: 1 +Release: 2 License: LGPLv2.1+ Summary: Experiemental toolkit for the moblin-netbook Url: http://www.moblin.org @@ -29,6 +29,8 @@ Patch2: remove-oboselete-jp-po-file.patch # PATCH-FIX-UPSTREAM nbtk-update-translations.patch glin@novell.com - update translations from upstream Patch3: nbtk-update-translations.patch +# PATCH-FIX-UPSTREAM nbtk-gtk2.19.7.patch dimstar@opensuse.org -- Fix build with gtk 2.19.7 +Patch4: nbtk-gtk2.19.7.patch BuildRequires: Mesa-devel BuildRequires: cairo-devel BuildRequires: ccss-devel @@ -85,6 +87,9 @@ %setup -q %patch2 -p1 %patch3 -p1 +%if 0%{suse_version} > 1120 +%patch4 -p1 +%endif %build ./autogen.sh ++++++ nbtk-gtk2.19.7.patch ++++++ Index: nbtk-1.2.0/nbtk/nbtk-gtk-expander.c =================================================================== --- nbtk-1.2.0.orig/nbtk/nbtk-gtk-expander.c +++ nbtk-1.2.0/nbtk/nbtk-gtk-expander.c @@ -62,7 +62,7 @@ static gboolean nbtk_gtk_expander_expose_event (GtkWidget *widget, GdkEventExpose *event) { - if (GTK_WIDGET_DRAWABLE (widget)) + if (gtk_widget_is_drawable (widget)) { NbtkGtkExpanderPrivate *priv = NBTK_GTK_EXPANDER (widget)->priv; GtkContainer *container = GTK_CONTAINER (widget); @@ -180,7 +180,7 @@ nbtk_gtk_expander_size_allocate (GtkWidg child = gtk_bin_get_child ((GtkBin*) widget); label = ((NbtkGtkExpander *) widget)->priv->label; - if (label && GTK_WIDGET_VISIBLE (label)) + if (label && gtk_widget_get_visible (label)) { gtk_widget_size_request (label, &label_req); @@ -202,7 +202,7 @@ nbtk_gtk_expander_size_allocate (GtkWidg else label_h = priv->indicator_size; - if (priv->is_open && child && GTK_WIDGET_VISIBLE (child)) + if (priv->is_open && child && gtk_widget_get_visible (child)) { gtk_widget_size_request (child, &child_req); @@ -239,7 +239,7 @@ nbtk_gtk_expander_size_request (GtkWidge requisition->width = widget->style->xthickness * 2; requisition->height = widget->style->ythickness * 2; - if (label && GTK_WIDGET_VISIBLE (label)) + if (label && gtk_widget_get_visible (label)) { gtk_widget_size_request (label, &req); @@ -251,7 +251,7 @@ nbtk_gtk_expander_size_request (GtkWidge priv->indicator_size + widget->style->ythickness * 2); - if (priv->is_open && child && GTK_WIDGET_VISIBLE (child)) + if (priv->is_open && child && gtk_widget_get_visible (child)) { gtk_widget_size_request (child, &req); Index: nbtk-1.2.0/nbtk/nbtk-gtk-frame.c =================================================================== --- nbtk-1.2.0.orig/nbtk/nbtk-gtk-frame.c +++ nbtk-1.2.0/nbtk/nbtk-gtk-frame.c @@ -147,7 +147,7 @@ nbtk_gtk_frame_paint (GtkWidget *widget, cairo_clip (cairo); /* initialise the background */ - gdk_cairo_set_source_color (cairo, &style->bg[GTK_WIDGET_STATE (widget)]); + gdk_cairo_set_source_color (cairo, &style->bg[gtk_widget_get_state (widget)]); cairo_rectangle (cairo, widget->allocation.x, widget->allocation.y, widget->allocation.width, widget->allocation.height); cairo_fill (cairo); @@ -177,7 +177,7 @@ nbtk_gtk_frame_expose (GtkWidget *widget { GtkWidgetClass *grand_parent; - if (GTK_WIDGET_DRAWABLE (widget)) + if (gtk_widget_is_drawable (widget)) { nbtk_gtk_frame_paint (widget, &event->area); @@ -252,7 +252,7 @@ nbtk_gtk_frame_size_allocate (GtkWidget child_allocation.width = allocation->width - 2 * xmargin; child_allocation.height = allocation->height - 2 * ymargin - title_allocation.height; - if (GTK_WIDGET_MAPPED (widget) && + if (gtk_widget_get_mapped (widget) && (child_allocation.x != frame->child_allocation.x || child_allocation.y != frame->child_allocation.y || child_allocation.width != frame->child_allocation.width || @@ -261,7 +261,7 @@ nbtk_gtk_frame_size_allocate (GtkWidget gdk_window_invalidate_rect (widget->window, &widget->allocation, FALSE); } - if (bin->child && GTK_WIDGET_VISIBLE (bin->child)) + if (bin->child && gtk_widget_get_visible (bin->child)) { gtk_widget_size_allocate (bin->child, &child_allocation); } Index: nbtk-1.2.0/nbtk/nbtk-gtk-light-switch.c =================================================================== --- nbtk-1.2.0.orig/nbtk/nbtk-gtk-light-switch.c +++ nbtk-1.2.0/nbtk/nbtk-gtk-light-switch.c @@ -147,7 +147,7 @@ draw (GtkWidget *lightswitch, priv = NBTK_GTK_LIGHT_SWITCH_GET_PRIVATE (lightswitch); style = lightswitch->style; - state_type = GTK_WIDGET_STATE (lightswitch); + state_type = gtk_widget_get_state (lightswitch); on_label_x = (priv->trough_width / 5) * 0.75; off_label_x = (priv->trough_width / 8) * 5; @@ -230,7 +230,7 @@ draw (GtkWidget *lightswitch, /* draw the switch itself */ gtk_paint_box (style, lightswitch->window, - GTK_WIDGET_STATE (lightswitch), + gtk_widget_get_state (lightswitch), GTK_SHADOW_OUT, NULL, NULL, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org