From cb259d0756cf45a4fc5899ed1162510724e6baa1 Mon Sep 17 00:00:00 2001 From: Eric Work Date: Mar 25 2013 02:39:53 +0000 Subject: Updated gtkdatabox to 0.9.2.0 --- diff --git a/.gitignore b/.gitignore index 3ee55e2..4e2529e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -gtkdatabox-0.9.1.1.tar.gz +/gtkdatabox-0.9.2.0.tar.gz diff --git a/gtkdatabox-0.9.1.1-gdk-deprecated.patch b/gtkdatabox-0.9.1.1-gdk-deprecated.patch deleted file mode 100644 index 9df23d5..0000000 --- a/gtkdatabox-0.9.1.1-gdk-deprecated.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff -urN gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_bars.c gtkdatabox-0.9.1.1/gtk/gtkdatabox_bars.c ---- gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_bars.c 2011-06-25 21:24:24.168596670 -0700 -+++ gtkdatabox-0.9.1.1/gtk/gtkdatabox_bars.c 2011-06-25 21:33:48.302358825 -0700 -@@ -17,6 +17,9 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+/* FIXME: need porting to cairo */ -+#undef GDK_DISABLE_DEPRECATED -+ - #include - - static void gtk_databox_bars_real_draw (GtkDataboxGraph * bars, -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 2011-06-25 21:24:24.172596770 -0700 -+++ gtkdatabox-0.9.1.1/gtk/gtkdatabox.c 2011-06-25 21:33:39.488359126 -0700 -@@ -17,6 +17,9 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+/* FIXME: need porting to cairo */ -+#undef GDK_DISABLE_DEPRECATED -+ - #include - #include - #include -diff -urN gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_graph.c gtkdatabox-0.9.1.1/gtk/gtkdatabox_graph.c ---- gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_graph.c 2011-06-25 21:24:24.164596569 -0700 -+++ gtkdatabox-0.9.1.1/gtk/gtkdatabox_graph.c 2011-06-25 21:34:09.002353964 -0700 -@@ -17,6 +17,9 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+/* FIXME: need porting to cairo */ -+#undef GDK_DISABLE_DEPRECATED -+ - #include - #include - #include -diff -urN gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_grid.c gtkdatabox-0.9.1.1/gtk/gtkdatabox_grid.c ---- gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_grid.c 2011-06-25 21:24:24.167596645 -0700 -+++ gtkdatabox-0.9.1.1/gtk/gtkdatabox_grid.c 2011-06-25 21:35:26.135286035 -0700 -@@ -17,6 +17,9 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+/* FIXME: need porting to cairo */ -+#undef GDK_DISABLE_DEPRECATED -+ - #include - - static void gtk_databox_grid_real_draw (GtkDataboxGraph * grid, -diff -urN gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_lines.c gtkdatabox-0.9.1.1/gtk/gtkdatabox_lines.c ---- gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_lines.c 2011-06-25 21:24:24.171596745 -0700 -+++ gtkdatabox-0.9.1.1/gtk/gtkdatabox_lines.c 2011-06-25 21:36:28.252177144 -0700 -@@ -17,6 +17,9 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+/* FIXME: need porting to cairo */ -+#undef GDK_DISABLE_DEPRECATED -+ - #include - - static void gtk_databox_lines_real_draw (GtkDataboxGraph * lines, -diff -urN gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_markers.c gtkdatabox-0.9.1.1/gtk/gtkdatabox_markers.c ---- gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_markers.c 2011-06-25 21:24:24.172596770 -0700 -+++ gtkdatabox-0.9.1.1/gtk/gtkdatabox_markers.c 2011-06-25 21:36:35.574161250 -0700 -@@ -17,6 +17,9 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+/* FIXME: need porting to cairo */ -+#undef GDK_DISABLE_DEPRECATED -+ - #include - #include - -diff -urN gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_points.c gtkdatabox-0.9.1.1/gtk/gtkdatabox_points.c ---- gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_points.c 2011-06-25 21:24:24.170596720 -0700 -+++ gtkdatabox-0.9.1.1/gtk/gtkdatabox_points.c 2011-06-25 21:36:41.875147166 -0700 -@@ -17,6 +17,9 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+/* FIXME: need porting to cairo */ -+#undef GDK_DISABLE_DEPRECATED -+ - #include - - static void gtk_databox_points_real_draw (GtkDataboxGraph * points, -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 2011-06-25 21:24:24.165596595 -0700 -+++ gtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c 2011-06-25 21:36:57.220110723 -0700 -@@ -27,6 +27,9 @@ - - /* Modified by Roland Bock 2007, see ChangeLog */ - -+/* FIXME: need porting to cairo */ -+#undef GDK_DISABLE_DEPRECATED -+ - #include - - #include diff --git a/gtkdatabox-0.9.1.1-gtk-2.20.patch b/gtkdatabox-0.9.1.1-gtk-2.20.patch deleted file mode 100644 index 5c111a0..0000000 --- a/gtkdatabox-0.9.1.1-gtk-2.20.patch +++ /dev/null @@ -1,141 +0,0 @@ -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 diff --git a/gtkdatabox-0.9.1.1-gtk-2.22.patch b/gtkdatabox-0.9.1.1-gtk-2.22.patch deleted file mode 100644 index ceeaddd..0000000 --- a/gtkdatabox-0.9.1.1-gtk-2.22.patch +++ /dev/null @@ -1,169 +0,0 @@ -diff -up gtkdatabox-0.9.1.1/examples/addremove.c.gtk222 gtkdatabox-0.9.1.1/examples/addremove.c ---- gtkdatabox-0.9.1.1/examples/addremove.c.gtk222 2010-09-03 20:48:04.000000000 +0200 -+++ gtkdatabox-0.9.1.1/examples/addremove.c 2010-09-03 20:48:14.000000000 +0200 -@@ -203,7 +203,7 @@ create_addremove (void) - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, TRUE); - gtk_widget_grab_default (close_button); - - gtk_widget_show_all (window); -diff -up gtkdatabox-0.9.1.1/examples/basics2.c.gtk222 gtkdatabox-0.9.1.1/examples/basics2.c ---- gtkdatabox-0.9.1.1/examples/basics2.c.gtk222 2009-04-19 23:40:55.000000000 +0200 -+++ gtkdatabox-0.9.1.1/examples/basics2.c 2010-09-03 20:44:36.000000000 +0200 -@@ -225,7 +225,7 @@ create_basics (void) - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, TRUE); - gtk_widget_grab_default (close_button); - gtk_widget_grab_focus (close_button); - -diff -up gtkdatabox-0.9.1.1/examples/basics.c.gtk222 gtkdatabox-0.9.1.1/examples/basics.c ---- gtkdatabox-0.9.1.1/examples/basics.c.gtk222 2009-04-17 23:15:02.000000000 +0200 -+++ gtkdatabox-0.9.1.1/examples/basics.c 2010-09-03 20:44:36.000000000 +0200 -@@ -113,7 +113,7 @@ create_basics (void) - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, TRUE); - gtk_widget_grab_default (close_button); - gtk_widget_grab_focus (close_button); - -diff -up gtkdatabox-0.9.1.1/examples/colors.c.gtk222 gtkdatabox-0.9.1.1/examples/colors.c ---- gtkdatabox-0.9.1.1/examples/colors.c.gtk222 2009-04-17 23:15:02.000000000 +0200 -+++ gtkdatabox-0.9.1.1/examples/colors.c 2010-09-03 20:44:36.000000000 +0200 -@@ -194,7 +194,7 @@ create_colors (void) - g_signal_connect (G_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), (gpointer) NULL); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, TRUE); - gtk_widget_grab_default (close_button); - - -diff -up gtkdatabox-0.9.1.1/examples/enable_disable.c.gtk222 gtkdatabox-0.9.1.1/examples/enable_disable.c ---- gtkdatabox-0.9.1.1/examples/enable_disable.c.gtk222 2010-09-03 20:47:44.000000000 +0200 -+++ gtkdatabox-0.9.1.1/examples/enable_disable.c 2010-09-03 20:47:54.000000000 +0200 -@@ -145,7 +145,7 @@ create_show_hide (void) - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, TRUE); - for (i = 0; i < noEnableSets; ++i) - { - GtkWidget *vbox = gtk_vbox_new (FALSE, 10); -diff -up gtkdatabox-0.9.1.1/examples/grid_array.c.gtk222 gtkdatabox-0.9.1.1/examples/grid_array.c ---- gtkdatabox-0.9.1.1/examples/grid_array.c.gtk222 2010-09-03 20:47:00.000000000 +0200 -+++ gtkdatabox-0.9.1.1/examples/grid_array.c 2010-09-03 20:47:09.000000000 +0200 -@@ -134,7 +134,7 @@ create_grid (void) - G_CALLBACK (gtk_main_quit), - GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, TRUE); - gtk_widget_grab_default (close_button); - - gtk_widget_show_all (window); -diff -up gtkdatabox-0.9.1.1/examples/grid.c.gtk222 gtkdatabox-0.9.1.1/examples/grid.c ---- gtkdatabox-0.9.1.1/examples/grid.c.gtk222 2010-09-03 20:46:41.000000000 +0200 -+++ gtkdatabox-0.9.1.1/examples/grid.c 2010-09-03 20:46:49.000000000 +0200 -@@ -133,7 +133,7 @@ create_grid (void) - G_CALLBACK (gtk_main_quit), - GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, TRUE); - gtk_widget_grab_default (close_button); - - gtk_widget_show_all (window); -diff -up gtkdatabox-0.9.1.1/examples/keycontrol.c.gtk222 gtkdatabox-0.9.1.1/examples/keycontrol.c ---- gtkdatabox-0.9.1.1/examples/keycontrol.c.gtk222 2009-04-17 23:15:02.000000000 +0200 -+++ gtkdatabox-0.9.1.1/examples/keycontrol.c 2010-09-03 20:44:36.000000000 +0200 -@@ -133,7 +133,8 @@ create_basics (void) - gtk_databox_create_box_with_scrollbars_and_rulers (&box, &table, - TRUE, TRUE, TRUE, TRUE); - gtk_widget_add_events (box, GDK_KEY_PRESS_MASK); -- GTK_WIDGET_SET_FLAGS (box, GTK_CAN_FOCUS | GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(box, TRUE); -+ gtk_widget_set_can_focus(box, TRUE); - - gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE, 0); - -diff -up gtkdatabox-0.9.1.1/examples/lissajous.c.gtk222 gtkdatabox-0.9.1.1/examples/lissajous.c ---- gtkdatabox-0.9.1.1/examples/lissajous.c.gtk222 2010-09-03 20:47:22.000000000 +0200 -+++ gtkdatabox-0.9.1.1/examples/lissajous.c 2010-09-03 20:47:32.000000000 +0200 -@@ -154,7 +154,7 @@ create_lissajous (void) - G_CALLBACK (gtk_main_quit), G_OBJECT (box)); - - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, TRUE); - gtk_widget_grab_default (close_button); - lissajous_idle = g_idle_add ((GSourceFunc) lissajous_idle_func, box); - -diff -up gtkdatabox-0.9.1.1/examples/logarithmic.c.gtk222 gtkdatabox-0.9.1.1/examples/logarithmic.c ---- gtkdatabox-0.9.1.1/examples/logarithmic.c.gtk222 2009-04-19 19:58:21.000000000 +0200 -+++ gtkdatabox-0.9.1.1/examples/logarithmic.c 2010-09-03 20:44:36.000000000 +0200 -@@ -207,7 +207,7 @@ create_logarithmic (void) - g_signal_connect (GTK_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), NULL); - gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, TRUE); - gtk_widget_grab_default (close_button); - gtk_widget_grab_focus (close_button); - -diff -up gtkdatabox-0.9.1.1/examples/markers.c.gtk222 gtkdatabox-0.9.1.1/examples/markers.c ---- gtkdatabox-0.9.1.1/examples/markers.c.gtk222 2010-09-03 20:45:36.000000000 +0200 -+++ gtkdatabox-0.9.1.1/examples/markers.c 2010-09-03 20:46:02.000000000 +0200 -@@ -220,7 +220,7 @@ create_markerss (void) - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, TRUE); - gtk_widget_grab_default (close_button); - - gtk_widget_show_all (window); -diff -up gtkdatabox-0.9.1.1/examples/signals.c.gtk222 gtkdatabox-0.9.1.1/examples/signals.c ---- gtkdatabox-0.9.1.1/examples/signals.c.gtk222 2010-09-03 20:46:10.000000000 +0200 -+++ gtkdatabox-0.9.1.1/examples/signals.c 2010-09-03 20:46:28.000000000 +0200 -@@ -287,7 +287,7 @@ create_signals (void) - g_signal_connect_swapped (G_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), G_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, TRUE); - gtk_widget_grab_default (close_button); - - g_signal_connect (G_OBJECT (box), "zoomed", -diff -up gtkdatabox-0.9.1.1/gtk/gtkdatabox.c.gtk222 gtkdatabox-0.9.1.1/gtk/gtkdatabox.c ---- gtkdatabox-0.9.1.1/gtk/gtkdatabox.c.gtk222 2010-09-03 20:44:36.000000000 +0200 -+++ gtkdatabox-0.9.1.1/gtk/gtkdatabox.c 2010-09-03 20:44:36.000000000 +0200 -@@ -587,7 +587,7 @@ gtk_databox_realize (GtkWidget * widget) - gint attributes_mask; - - box = GTK_DATABOX (widget); -- GTK_WIDGET_SET_FLAGS (box, GTK_REALIZED); -+ gtk_widget_set_realized(box, TRUE); - - attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = widget->allocation.x; -diff -up gtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c.gtk222 gtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c ---- gtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c.gtk222 2010-09-03 20:44:36.000000000 +0200 -+++ gtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c 2010-09-03 20:44:36.000000000 +0200 -@@ -842,7 +842,7 @@ gtk_databox_ruler_realize (GtkWidget * w - gint attributes_mask; - - ruler = GTK_DATABOX_RULER (widget); -- GTK_WIDGET_SET_FLAGS (ruler, GTK_REALIZED); -+ gtk_widget_set_realized(ruler, TRUE); - - attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = widget->allocation.x; diff --git a/gtkdatabox.spec b/gtkdatabox.spec index c5136ad..a553a9c 100644 --- a/gtkdatabox.spec +++ b/gtkdatabox.spec @@ -1,15 +1,12 @@ Name: gtkdatabox -Version: 0.9.1.1 -Release: 10%{?dist} +Version: 0.9.2.0 +Release: 1%{?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 -Patch2: gtkdatabox-0.9.1.1-gtk-2.22.patch -Patch3: gtkdatabox-0.9.1.1-gdk-deprecated.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, pkgconfig BuildRequires: libglade2-devel @@ -39,12 +36,11 @@ The %{name}-libglade package contains support files for libglade. %prep %setup -q %patch0 -p1 -b .optflags -%patch1 -p1 -b .gtk220 -%patch2 -p1 -b .gtk222 -%patch3 -p1 -b .gdkdep %build -%configure --disable-static --disable-rpath --enable-libglade LIBS="-lm" +# need reconfig to support aarch64 +autoconf +%configure --disable-static --enable-libglade LIBS="-lm" # fix rpath libtool issues sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -74,13 +70,16 @@ rm -rf %{buildroot} %{_includedir}/gtkdatabox*.h %{_libdir}/libgtkdatabox.so %{_libdir}/pkgconfig/gtkdatabox.pc -%{_datadir}/gtk-doc/html/gtkdatabox %files libglade %defattr(-,root,root,-) %{_libdir}/libglade/2.0/libdatabox.so %changelog +* Sun Mar 24 2013 Eric Work - 0.9.2.0-1 +- new upstream version +- drop deprecated GTK feature patches + * Thu Feb 14 2013 Fedora Release Engineering - 0.9.1.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 6f5716c..95c3a6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -910921da2198ebd02ea8a7eb622916ce gtkdatabox-0.9.1.1.tar.gz +99c1fe9a918ee94e2b6f967cd22a6f5b gtkdatabox-0.9.2.0.tar.gz