rpms/sugar-artwork/devel sugar-artwork-gtkdep.patch, NONE, 1.1 sugar-artwork.spec, 1.35, 1.36

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/sugar-artwork/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31994

Modified Files:
	sugar-artwork.spec 
Added Files:
	sugar-artwork-gtkdep.patch 
Log Message:
- Add patch for deprecated gtk functions to fix borked suga

sugar-artwork-gtkdep.patch:
 sugar-info.c  |    2 +-
 sugar-style.c |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE sugar-artwork-gtkdep.patch ---
--- sugar-artwork-0.88.0/gtk/engine/sugar-info.c.orig	2010-04-13 23:21:56.000000000 +0100
+++ sugar-artwork-0.88.0/gtk/engine/sugar-info.c	2010-04-13 23:22:33.000000000 +0100
@@ -71,7 +71,7 @@
     gdouble line_width = info->rc_style->line_width;
 
     if (info->widget) {
-        range_info->focused = GTK_WIDGET_HAS_FOCUS (info->widget);
+        range_info->focused = gtk_widget_has_focus (info->widget);
     } else {
         /* Fall back to unfocused and orientation from the width/height. */
         range_info->focused = FALSE;
--- sugar-artwork-0.88.0/gtk/engine/sugar-style.c.orig	2010-04-13 23:22:24.000000000 +0100
+++ sugar-artwork-0.88.0/gtk/engine/sugar-style.c	2010-04-13 23:22:33.000000000 +0100
@@ -415,7 +415,7 @@
         sugar_draw_button (cr, &info);
 
         /* Spinbutton focus hack. */
-        if (widget && GTK_WIDGET_HAS_FOCUS (widget)) {
+        if (widget && gtk_widget_has_focus (widget)) {
             /* Draw a focus for the spinbutton */
             sugar_style_draw_focus (style, window, GTK_STATE_NORMAL, area, widget, detail, x, y, width, height);
         }
@@ -444,7 +444,7 @@
 
             sugar_fill_generic_info (&info, style, state_type, shadow_type, widget, detail, x, y, width, height);
             
-            if (widget && !GTK_WIDGET_IS_SENSITIVE (widget))
+            if (widget && !gtk_widget_is_sensitive (widget))
                 info.state = GTK_STATE_INSENSITIVE;
 
             /* Needed because the trough and bar are cached in a buffer inside GtkProgress. */
@@ -458,7 +458,7 @@
 
             sugar_fill_generic_info (&info, style, state_type, shadow_type, widget, detail, x, y, width, height);
             
-            if (widget && !GTK_WIDGET_IS_SENSITIVE (widget))
+            if (widget && !gtk_widget_is_sensitive (widget))
                 info.state = GTK_STATE_INSENSITIVE;
             
             if (widget && GTK_IS_PROGRESS_BAR (widget)) {
@@ -585,7 +585,7 @@
 {
     /* Hack to change the entries background when it has the focus. */
     if (DETAIL ("entry_bg")) {
-        if (widget && GTK_WIDGET_HAS_FOCUS (widget)) {
+        if (widget && gtk_widget_has_focus (widget)) {
             state_type = GTK_STATE_ACTIVE;
         }
     } else if (DETAIL ("radiobutton") || DETAIL ("checkbutton")) {
@@ -638,10 +638,10 @@
         /* XXX: This fakes an ACTIVE state for the focused entry.
          *      Getting this changed in GTK+ with a style property would be cleaner
          *      as that also works for the font colors. (see also draw_flat_box) */
-        if (widget && GTK_WIDGET_HAS_FOCUS (widget)) {
+        if (widget && gtk_widget_has_focus (widget)) {
             info.state = GTK_STATE_ACTIVE;
         }
-        if (widget && !GTK_WIDGET_IS_SENSITIVE (widget)) {
+        if (widget && !gtk_widget_is_sensitive (widget)) {
             info.state = GTK_STATE_INSENSITIVE;
         }
 


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sugar-artwork.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sugar-artwork.spec	30 Mar 2010 08:07:49 -0000	1.35
+++ sugar-artwork.spec	13 Apr 2010 22:37:42 -0000	1.36
@@ -1,11 +1,12 @@
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
 Version: 0.88.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://sugarlabs.org
-Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2 
 Group: User Interface/Desktops
 License: LGPLv2+
+Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2 
+Patch0: sugar-artwork-gtkdep.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel >= 2.9.0
@@ -23,6 +24,7 @@ look and feel.
 
 %prep
 %setup -q
+%patch0 -p1 -b .gtkdep
 
 %build
 %configure
@@ -55,6 +57,9 @@ touch --no-create %{_datadir}/icons/suga
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Tue Apr 13 2010 Peter Robinson <pbrobinson at gmail.com> - 0.88.0-2
+- Add patch for deprecated gtk functions to fix borked sugar
+
 * Tue Mar 20 2010 Peter Robinson <pbrobinson at gmail.com> - 0.88.0-1
 - New upstream stable 0.88.0 release