rpms/nbtk/devel nbtk-1.2.3-gtk.patch,NONE,1.1 nbtk.spec,1.38,1.39

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/nbtk/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27293

Modified Files:
	nbtk.spec 
Added Files:
	nbtk-1.2.3-gtk.patch 
Log Message:
* Mon Jul 12 2010 Dan Horák <dan[at]danny.cz> 1.2.3-4
- drop BR: gir-repository-devel
- fix FTBFS #599883 (patch from Debian, further updated)


nbtk-1.2.3-gtk.patch:
 nbtk-gtk-expander.c     |   12 ++++++------
 nbtk-gtk-frame.c        |    8 ++++----
 nbtk-gtk-light-switch.c |    4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE nbtk-1.2.3-gtk.patch ---
diff -up nbtk-1.2.3/nbtk/nbtk-gtk-expander.c.gtk nbtk-1.2.3/nbtk/nbtk-gtk-expander.c
--- nbtk-1.2.3/nbtk/nbtk-gtk-expander.c.gtk	2009-11-09 12:50:14.000000000 +0100
+++ nbtk-1.2.3/nbtk/nbtk-gtk-expander.c	2010-07-12 16:28:40.000000000 +0200
@@ -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_is_drawable (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);
 
@@ -523,7 +523,7 @@ nbtk_gtk_expander_init (NbtkGtkExpander 
                                             NBTK_TYPE_GTK_EXPANDER,
                                             NbtkGtkExpanderPrivate);
 
-  GTK_WIDGET_SET_FLAGS (self, GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus (GTK_WIDGET(self), TRUE);
 
   priv = self->priv;
 
diff -up nbtk-1.2.3/nbtk/nbtk-gtk-frame.c.gtk nbtk-1.2.3/nbtk/nbtk-gtk-frame.c
--- nbtk-1.2.3/nbtk/nbtk-gtk-frame.c.gtk	2009-11-09 12:50:14.000000000 +0100
+++ nbtk-1.2.3/nbtk/nbtk-gtk-frame.c	2010-07-12 16:28:12.000000000 +0200
@@ -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);
     }
diff -up nbtk-1.2.3/nbtk/nbtk-gtk-light-switch.c.gtk nbtk-1.2.3/nbtk/nbtk-gtk-light-switch.c
--- nbtk-1.2.3/nbtk/nbtk-gtk-light-switch.c.gtk	2009-11-26 16:15:56.000000000 +0100
+++ nbtk-1.2.3/nbtk/nbtk-gtk-light-switch.c	2010-07-12 16:28:12.000000000 +0200
@@ -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;
@@ -231,7 +231,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,


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- nbtk.spec	10 Jan 2010 18:12:26 -0000	1.38
+++ nbtk.spec	12 Jul 2010 14:40:22 -0000	1.39
@@ -1,18 +1,18 @@
 Name:           nbtk
 Version:        1.2.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://moblin.org/projects/netbook-toolkit-nbtk
 Source0:        http://download.moblin.org/sources/%{name}/1.2/%{name}-%{version}.tar.bz2
+Patch0:         %{name}-1.2.3-gtk.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clutter-devel >= 1.0.0
 BuildRequires: clutter-imcontext-devel
 BuildRequires: gobject-introspection-devel
-BuildRequires: gir-repository-devel
 BuildRequires: gtk2-devel
 BuildRequires: libccss-devel
 BuildRequires: intltool
@@ -39,6 +39,7 @@ Files for development with %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .gtk
 
 %build
 %configure --enable-gtk-doc --disable-static
@@ -77,6 +78,10 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Jul 12 2010 Dan Horák <dan[at]danny.cz> 1.2.3-4
+- drop BR: gir-repository-devel
+- fix FTBFS #599883 (patch from Debian, further updated)
+
 * Sun Jan 10 2010 Peter Robinson <pbrobinson at gmail.com> 1.2.3-3
 - Fix source URL, Bump release