rpms/goffice/F-11 goffice-0.6.6-backport-20090219.patch, NONE, 1.1 goffice-0.6.6-backport-20090306.patch, NONE, 1.1 goffice-0.6.6-backport-20090501.patch, NONE, 1.1 goffice.spec, 1.23, 1.24
Robert Scheck
robert at fedoraproject.org
Wed Oct 21 09:41:10 UTC 2009
- Previous message (by thread): rpms/goffice/F-10 goffice-0.6.6-backport-20090219.patch, NONE, 1.1 goffice-0.6.6-backport-20090306.patch, NONE, 1.1 goffice-0.6.6-backport-20090501.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 goffice.spec, 1.20, 1.21 sources, 1.9, 1.10
- Next message (by thread): rpms/goffice/F-12 goffice-0.6.6-backport-20090219.patch, NONE, 1.1 goffice-0.6.6-backport-20090306.patch, NONE, 1.1 goffice-0.6.6-backport-20090501.patch, NONE, 1.1 goffice.spec, 1.24, 1.25
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: robert
Update of /cvs/pkgs/rpms/goffice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12181/F-11
Modified Files:
goffice.spec
Added Files:
goffice-0.6.6-backport-20090219.patch
goffice-0.6.6-backport-20090306.patch
goffice-0.6.6-backport-20090501.patch
Log Message:
Applied 3 patches from the 0.6 branch (#503068, #505001)
goffice-0.6.6-backport-20090219.patch:
ChangeLog | 5 +++++
b/ChangeLog | 4 ++++
b/NEWS | 6 ++++++
b/plugins/plot_barcol/gog-1.5d.c | 2 --
4 files changed, 15 insertions(+), 2 deletions(-)
--- NEW FILE goffice-0.6.6-backport-20090219.patch ---
>From a368ebc219318c7154b4d2cfb6d1f4027a62016f Mon Sep 17 00:00:00 2001
From: Jean Brefort <jean.brefort at normalesup.org>
Date: Thu, 19 Feb 2009 19:27:25 +0000
Subject: don't set a value to an invalid length variable. [#572354]
2009-02-19 Jean Brefort <jean.brefort at normalesup.org>
* plugins/plot_barcol/gog-1.5d.c: (gog_plot1_5d_update): don't set
a value to an invalid length variable. [#572354]
svn path=/branches/goffice-0-6/; revision=2313
---
diff --git a/ChangeLog b/ChangeLog
index 8db2fe7..a102d3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2009-01-18 Jody Goldberg <jody at gnome.org>
+ * configure.in : post release bump
+
+2009-01-18 Jody Goldberg <jody at gnome.org>
+
* Release 0.6.6
2008-12-08 Morten Welinder <terra at gnome.org>
diff --git a/ChangeLog b/ChangeLog
index a102d3c..df71675 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-19 Jean Brefort <jean.brefort at normalesup.org>
+
+ * plugins/plot_barcol/gog-1.5d.c: (gog_plot1_5d_update): don't set
+ a value to an invalid length variable. [#572354]
+
2009-01-18 Jody Goldberg <jody at gnome.org>
* configure.in : post release bump
diff --git a/NEWS b/NEWS
index 01cff7f..4025058 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+goffice 0.6.7:
+
+Jean:
+ * Fixed crash when adding series to bar chart. [#572354]
+
+--------------------------------------------------------------------------
goffice 0.6.6:
Hib Eris:
diff --git a/plugins/plot_barcol/gog-1.5d.c b/plugins/plot_barcol/gog-1.5d.c
index 75f84d4..a2d26f0 100644
--- a/plugins/plot_barcol/gog-1.5d.c
+++ b/plugins/plot_barcol/gog-1.5d.c
@@ -235,7 +235,6 @@ gog_plot1_5d_update (GogObject *obj)
series = ptr->data;
/* we are guaranteed that at least 1 series is valid above */
if (!gog_series_is_valid (GOG_SERIES (series))) {
- lengths[i] = 0;
continue;
}
vals[i] = go_data_vector_get_values (
--
cgit v0.8.2
goffice-0.6.6-backport-20090306.patch:
ChangeLog | 7 +++++++
NEWS | 2 ++
plugins/plot_boxes/gog-histogram.c | 11 +----------
plugins/plot_pie/gog-pie.c | 7 +++++--
4 files changed, 15 insertions(+), 12 deletions(-)
--- NEW FILE goffice-0.6.6-backport-20090306.patch ---
>From 2128a2e4549e8fdd9988c952f87a5c38e28efe82 Mon Sep 17 00:00:00 2001
From: Jean Brefort <jean.brefort at normalesup.org>
Date: Fri, 06 Mar 2009 09:51:21 +0000
Subject: don't show a marker in the legend. [#574340] skip points when the datum is
2009-03-06 Jean Brefort <jean.brefort at normalesup.org>
* plugins/plot_distrib/gog-histogram.c: don't show a marker in the
legend. [#574340]
* plugins/plot_pie/gog-pie.c: (gog_pie_view_render): skip points when
the datum is skipped. [#574348]
svn path=/branches/goffice-0-6/; revision=2325
---
diff --git a/ChangeLog b/ChangeLog
index df71675..02e99eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-06 Jean Brefort <jean.brefort at normalesup.org>
+
+ * plugins/plot_distrib/gog-histogram.c: don't show a marker in the
+ legend. [#574340]
+ * plugins/plot_pie/gog-pie.c: (gog_pie_view_render): skip points when
+ the datum is skipped. [#574348]
+
2009-02-19 Jean Brefort <jean.brefort at normalesup.org>
* plugins/plot_barcol/gog-1.5d.c: (gog_plot1_5d_update): don't set
diff --git a/NEWS b/NEWS
index 4025058..58110e2 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ goffice 0.6.7:
Jean:
* Fixed crash when adding series to bar chart. [#572354]
+ * Don't display markers in histogram legend. [#574340]
+ * Skip points corresponding to invalid valies in pie charts. [#574348]
--------------------------------------------------------------------------
goffice 0.6.6:
diff --git a/plugins/plot_boxes/gog-histogram.c b/plugins/plot_boxes/gog-histogram.c
index 2dd8dbe..8ddd005 100644
--- a/plugins/plot_boxes/gog-histogram.c
+++ b/plugins/plot_boxes/gog-histogram.c
@@ -193,7 +193,7 @@ gog_histogram_plot_class_init (GogPlotClass *gog_plot_klass)
plot_klass->desc.num_series_max = 1;
plot_klass->series_type = gog_histogram_plot_series_get_type ();
plot_klass->axis_set = GOG_AXIS_SET_XY;
- plot_klass->desc.series.style_fields = GOG_STYLE_LINE | GOG_STYLE_FILL;
+ plot_klass->desc.series.style_fields = GOG_STYLE_OUTLINE | GOG_STYLE_FILL;
plot_klass->axis_get_bounds = gog_histogram_plot_axis_get_bounds;
}
@@ -452,14 +452,6 @@ gog_histogram_plot_series_update (GogObject *obj)
}
static void
-gog_histogram_plot_series_init_style (GogStyledObject *gso, GogStyle *style)
-{
- ((GogStyledObjectClass*) gog_histogram_plot_series_parent_klass)->init_style (gso, style);
-
- style->outline.dash_type = GO_LINE_NONE;
-}
-
-static void
gog_histogram_plot_series_finalize (GObject *obj)
{
GogHistogramPlotSeries *series = GOG_HISTOGRAM_PLOT_SERIES (obj);
@@ -507,7 +499,6 @@ gog_histogram_plot_series_class_init (GogObjectClass *obj_klass)
gog_histogram_plot_series_parent_klass = g_type_class_peek_parent (obj_klass);
obj_klass->update = gog_histogram_plot_series_update;
gog_klass->view_type = gog_histogram_series_view_get_type ();
- gso_klass->init_style = gog_histogram_plot_series_init_style;
gog_object_register_roles (gog_klass, roles, G_N_ELEMENTS (roles));
diff --git a/plugins/plot_pie/gog-pie.c b/plugins/plot_pie/gog-pie.c
index a106f09..50f34ef 100644
--- a/plugins/plot_pie/gog-pie.c
+++ b/plugins/plot_pie/gog-pie.c
@@ -728,8 +728,12 @@ gog_pie_view_render (GogView *view, GogViewAllocation const *bbox)
overrides = gog_series_get_overrides (GOG_SERIES (series));
for (k = 0 ; k < series->base.num_elements; k++) {
len = fabs (vals[k]) * scale;
- if (!go_finite (len) || len < 1e-3)
+ if (!go_finite (len) || len < 1e-3) {
+ if ((overrides != NULL) &&
+ (GOG_SERIES_ELEMENT (overrides->data)->index == k))
+ overrides = overrides->next;
continue;
+ }
gpse = NULL;
if ((overrides != NULL) &&
--
cgit v0.8.2
goffice-0.6.6-backport-20090501.patch:
ChangeLog | 5 +++++
NEWS | 5 ++++-
goffice/cut-n-paste/foocanvas/foo-canvas.c | 4 ++--
3 files changed, 11 insertions(+), 3 deletions(-)
--- NEW FILE goffice-0.6.6-backport-20090501.patch ---
>From bfcd25ce71fce582af48f834c14a956249dc3ea6 Mon Sep 17 00:00:00 2001
From: Jody Goldberg <jody at gnome.org>
Date: Fri, 01 May 2009 10:36:42 +0000
Subject: * Patch foocanvas to work around behaviour change in gtk 2.14. [#566652]
---
diff --git a/ChangeLog b/ChangeLog
index 02e99eb..dd3fdc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-08 Jody Goldberg <jody at gnome.org>
+
+ * goffice/cut-n-paste/foocanvas/foo-canvas.c (foo_canvas_crossing) :
+ simplistic patch to repair gtk-2.14 related breakage.
+
2009-03-06 Jean Brefort <jean.brefort at normalesup.org>
* plugins/plot_distrib/gog-histogram.c: don't show a marker in the
diff --git a/NEWS b/NEWS
index 58110e2..0954ebd 100644
--- a/NEWS
+++ b/NEWS
@@ -3,8 +3,11 @@ goffice 0.6.7:
Jean:
* Fixed crash when adding series to bar chart. [#572354]
* Don't display markers in histogram legend. [#574340]
- * Skip points corresponding to invalid valies in pie charts. [#574348]
+ * Skip points corresponding to invalid values in pie charts. [#574348]
+Jody:
+ * Patch foocanvas to work around behaviour change in gtk 2.14. [#566652]
+
--------------------------------------------------------------------------
goffice 0.6.6:
diff --git a/goffice/cut-n-paste/foocanvas/foo-canvas.c b/goffice/cut-n-paste/foocanvas/foo-canvas.c
index f5c4ceb..45a014c 100644
--- a/goffice/cut-n-paste/foocanvas/foo-canvas.c
+++ b/goffice/cut-n-paste/foocanvas/foo-canvas.c
@@ -2813,7 +2813,8 @@ foo_canvas_crossing (GtkWidget *widget, GdkEventCrossing *event)
canvas = FOO_CANVAS (widget);
- if (event->window != canvas->layout.bin_window)
+ if (event->window != canvas->layout.bin_window ||
+ NULL != canvas->grabbed_item)
return FALSE;
canvas->state = event->state;
--
cgit v0.8.2
Index: goffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/F-11/goffice.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- goffice.spec 25 Feb 2009 00:16:31 -0000 1.23
+++ goffice.spec 21 Oct 2009 09:41:10 -0000 1.24
@@ -1,6 +1,6 @@
Name: goffice
Version: 0.6.6
-Release: 2%{?dist}
+Release: 4%{?dist}
Summary: Goffice support libraries
Group: System Environment/Libraries
# bug filed upstream about this being GPL v2 only:
@@ -8,6 +8,9 @@ Group: System Environment/Libra
License: GPLv2
URL: http://freshmeat.net/projects/goffice/
Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.6/%{name}-%{version}.tar.bz2
+Patch0: goffice-0.6.6-backport-20090219.patch
+Patch1: goffice-0.6.6-backport-20090306.patch
+Patch2: goffice-0.6.6-backport-20090501.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libgsf-gnome-devel >= 1.13.3
BuildRequires: libgnomeui-devel >= 2.0.0
@@ -35,6 +38,9 @@ Development libraries for goffice
%prep
%setup -q
+%patch0 -p1 -b .backport-20090219
+%patch1 -p1 -b .backport-20090306
+%patch2 -p1 -b .backport-20090501
%build
@@ -77,6 +83,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Oct 21 2009 Robert Scheck <robert at fedoraproject.org> - 0.6.6-4
+- Applied 3 patches from the 0.6 branch (#503068, #505001)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
- Previous message (by thread): rpms/goffice/F-10 goffice-0.6.6-backport-20090219.patch, NONE, 1.1 goffice-0.6.6-backport-20090306.patch, NONE, 1.1 goffice-0.6.6-backport-20090501.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 goffice.spec, 1.20, 1.21 sources, 1.9, 1.10
- Next message (by thread): rpms/goffice/F-12 goffice-0.6.6-backport-20090219.patch, NONE, 1.1 goffice-0.6.6-backport-20090306.patch, NONE, 1.1 goffice-0.6.6-backport-20090501.patch, NONE, 1.1 goffice.spec, 1.24, 1.25
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list