rpms/gtkdatabox/F-13 gtkdatabox-0.9.1.1-gtk-2.20.patch, NONE, 1.1 gtkdatabox.spec, 1.19, 1.20
Eric Work
ework at fedoraproject.org
Thu Jul 8 07:47:22 UTC 2010
Author: ework
Update of /cvs/pkgs/rpms/gtkdatabox/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23655
Modified Files:
gtkdatabox.spec
Added Files:
gtkdatabox-0.9.1.1-gtk-2.20.patch
Log Message:
Make it so gtkdatabox will actually compile on F-13 since gtk2 was updated
gtkdatabox-0.9.1.1-gtk-2.20.patch:
.gtkdatabox.c.swp |binary
.gtkdatabox_ruler.c.swp |binary
gtkdatabox.c | 8 ++++----
gtkdatabox_ruler.c | 22 +++++++++++-----------
4 files changed, 15 insertions(+), 15 deletions(-)
--- NEW FILE gtkdatabox-0.9.1.1-gtk-2.20.patch ---
diff -urN gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox.c gtkdatabox-0.9.1.1/gtk/gtkdatabox.c
--- gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox.c 2010-05-19 22:12:40.535625342 -0700
+++ gtkdatabox-0.9.1.1/gtk/gtkdatabox.c 2010-05-19 22:30:15.848690202 -0700
@@ -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)
Binary files gtkdatabox-0.9.1.1.orig/gtk/.gtkdatabox.c.swp and gtkdatabox-0.9.1.1/gtk/.gtkdatabox.c.swp differ
diff -urN gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_ruler.c gtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c
--- gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_ruler.c 2010-05-19 22:12:40.536624613 -0700
+++ gtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c 2010-05-19 22:33:24.068636544 -0700
@@ -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);
Binary files gtkdatabox-0.9.1.1.orig/gtk/.gtkdatabox_ruler.c.swp and gtkdatabox-0.9.1.1/gtk/.gtkdatabox_ruler.c.swp differ
Index: gtkdatabox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkdatabox/F-13/gtkdatabox.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gtkdatabox.spec 10 Feb 2010 08:38:34 -0000 1.19
+++ gtkdatabox.spec 8 Jul 2010 07:47:22 -0000 1.20
@@ -1,12 +1,13 @@
Name: gtkdatabox
Version: 0.9.1.1
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: GTK+ widget for fast data display
Group: System Environment/Libraries
License: LGPLv2+
URL: http://sourceforge.net/projects/gtkdatabox
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0: gtkdatabox-0.8.2.0-userpmoptflags.patch
+Patch1: gtkdatabox-0.9.1.1-gtk-2.20.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel, pkgconfig
BuildRequires: libglade2-devel, glade3-libgladeui-devel
@@ -44,6 +45,7 @@ The %{name}-glade package contains suppo
%prep
%setup -q
%patch0 -p1 -b .optflags
+%patch1 -p1 -b .gtk220
%build
%configure --disable-static --disable-rpath \
@@ -89,6 +91,12 @@ rm -rf %{buildroot}
%{_datadir}/glade3/catalogs/gtkdatabox.xml
%changelog
+* Thu May 20 2010 Eric Work <work.eric at gmail.com> 0.9.1.1-3
+- fix deprecated GTK 2.20 features
+
+* Thu May 20 2010 Rakesh Pandit <rakesh at fedoraproject.org> - 0.9.1.1-2
+- Updated to consume new libgladeui-1.so.9
+
* Tue Feb 09 2010 Eric Work <work.eric at gmail.com> 0.9.1.1-1
- new upstream version
- enable glade support
More information about the scm-commits
mailing list