Update to 1.9.10.

This commit is contained in:
Joe Marcus Clarke 2009-08-16 23:00:41 +00:00
parent 3a310cbf9a
commit e55577d95a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=239682
4 changed files with 16 additions and 78 deletions

View File

@ -7,8 +7,7 @@
#
PORTNAME= gnumeric
PORTVERSION= 1.9.9
PORTREVISION= 2
PORTVERSION= 1.9.10
CATEGORIES= math gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2

View File

@ -1,3 +1,3 @@
MD5 (gnome2/gnumeric-1.9.9.tar.bz2) = 5ba74b67b0667b165719f9dfa1588519
SHA256 (gnome2/gnumeric-1.9.9.tar.bz2) = 042fac3bb233d900d837ecd41f683954911330a2b1984a082f259a8423ebe20a
SIZE (gnome2/gnumeric-1.9.9.tar.bz2) = 16028397
MD5 (gnome2/gnumeric-1.9.10.tar.bz2) = 33f1c30056c7ce6402bc3ccca3981e1d
SHA256 (gnome2/gnumeric-1.9.10.tar.bz2) = ebe0b2ab52f2a90eedcb3b070e77d97bfb5eb7379b8ca871706f224705fb2cf2
SIZE (gnome2/gnumeric-1.9.10.tar.bz2) = 16765251

View File

@ -1,69 +0,0 @@
From f4d534730632873339ad0a16419edc835b9c771a Mon Sep 17 00:00:00 2001
From: Andreas J. Guelzow <aguelzow@pyrshep.ca>
Date: Mon, 22 Jun 2009 23:54:08 +0000
Subject: Fix printing crash. [#586672]
2009-06-22 Andreas J. Guelzow <aguelzow@pyrshep.ca>
* src/print-info.c (gnm_page_breaks_clean): we can't and don't need
to clean a non-existing breaks array.
* src/print.c (compute_sheet_pages): fix sense of test anc combine
code
---
--- src/print-info.c
+++ src/print-info.c
@@ -1441,6 +1441,10 @@ void
gnm_page_breaks_clean (GnmPageBreaks *breaks)
{
guint i;
+
+ if (breaks == NULL)
+ return;
+
for (i = 0; i < breaks->details->len; i++) {
GnmPageBreak *pbreak = &g_array_index (breaks->details,
GnmPageBreak, i);
diff --git a/src/print.c b/src/print.c
index 2c0afd4..5fb815a 100644
--- src/print.c
+++ src/print.c
@@ -953,9 +953,18 @@ compute_sheet_pages (GtkPrintContext *context,
repeat_left_start = repeat_left_use ? r.start.col : 0;
repeat_left_end = repeat_left_use ? r.end.col : 0;
- if (pi->ignore_pb) {
- gnm_page_breaks_clean (pinfo->page_breaks.h);
- gnm_page_breaks_clean (pinfo->page_breaks.v);
+ if (!pi->ignore_pb) {
+ if (pinfo->page_breaks.h == NULL)
+ print_info_set_breaks (pinfo,
+ gnm_page_breaks_new (FALSE));
+ else
+ gnm_page_breaks_clean (pinfo->page_breaks.h);
+ if (pinfo->page_breaks.v == NULL)
+ print_info_set_breaks (pinfo,
+ gnm_page_breaks_new (TRUE));
+ else
+ gnm_page_breaks_clean (pinfo->page_breaks.v);
+
}
if (pinfo->scaling.type == PRINT_SCALE_FIT_PAGES) {
@@ -995,15 +1004,6 @@ compute_sheet_pages (GtkPrintContext *context,
usable_x = page_width / px;
usable_y = page_height / py;
- if (!pi->ignore_pb) {
- if (pinfo->page_breaks.h == NULL)
- print_info_set_breaks (pinfo,
- gnm_page_breaks_new (FALSE));
- if (pinfo->page_breaks.v == NULL)
- print_info_set_breaks (pinfo,
- gnm_page_breaks_new (TRUE));
- }
-
paginate (&column_pagination, sheet, r.start.col, r.end.col,
usable_x - row_header_width,
repeat_left_use, repeat_left_start, repeat_left_end,
--
cgit v0.8.2

View File

@ -29,11 +29,13 @@ include/libspreadsheet-1.10/spreadsheet/func-builtin.h
include/libspreadsheet-1.10/spreadsheet/func.h
include/libspreadsheet-1.10/spreadsheet/gnm-command-impl.h
include/libspreadsheet-1.10/spreadsheet/gnm-commands-slicer.h
include/libspreadsheet-1.10/spreadsheet/gnm-data-cache-source.h
include/libspreadsheet-1.10/spreadsheet/gnm-datetime.h
include/libspreadsheet-1.10/spreadsheet/gnm-format.h
include/libspreadsheet-1.10/spreadsheet/gnm-graph-window.h
include/libspreadsheet-1.10/spreadsheet/gnm-pane.h
include/libspreadsheet-1.10/spreadsheet/gnm-plugin.h
include/libspreadsheet-1.10/spreadsheet/gnm-sheet-slicer.h
include/libspreadsheet-1.10/spreadsheet/gnm-so-filled.h
include/libspreadsheet-1.10/spreadsheet/gnm-so-line.h
include/libspreadsheet-1.10/spreadsheet/gnm-so-polygon.h
@ -41,6 +43,12 @@ include/libspreadsheet-1.10/spreadsheet/gnm-style-impl.h
include/libspreadsheet-1.10/spreadsheet/gnumeric-gconf.h
include/libspreadsheet-1.10/spreadsheet/gnumeric-simple-canvas.h
include/libspreadsheet-1.10/spreadsheet/gnumeric.h
include/libspreadsheet-1.10/spreadsheet/go-data-cache-field.h
include/libspreadsheet-1.10/spreadsheet/go-data-cache-source.h
include/libspreadsheet-1.10/spreadsheet/go-data-cache.h
include/libspreadsheet-1.10/spreadsheet/go-data-slicer-field.h
include/libspreadsheet-1.10/spreadsheet/go-data-slicer.h
include/libspreadsheet-1.10/spreadsheet/go-val.h
include/libspreadsheet-1.10/spreadsheet/graph.h
include/libspreadsheet-1.10/spreadsheet/gui-clipboard.h
include/libspreadsheet-1.10/spreadsheet/gui-file.h
@ -245,9 +253,9 @@ lib/gnumeric/%%VERSION%%/plugins/uihello/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/xbase/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/xbase/xbase.la
lib/gnumeric/%%VERSION%%/plugins/xbase/xbase.so
lib/goffice/0.7.8/plugins/gnumeric/gnumeric.la
lib/goffice/0.7.8/plugins/gnumeric/gnumeric.so
lib/goffice/0.7.8/plugins/gnumeric/plugin.xml
lib/goffice/0.7.9/plugins/gnumeric/gnumeric.la
lib/goffice/0.7.9/plugins/gnumeric/gnumeric.so
lib/goffice/0.7.9/plugins/gnumeric/plugin.xml
lib/libspreadsheet-%%VERSION%%.so
lib/libspreadsheet.la
lib/libspreadsheet.so
@ -939,7 +947,7 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
@dirrm share/gnumeric/%%VERSION%%/autoformat-templates
@dirrm share/gnumeric/%%VERSION%%
@dirrm share/gnumeric
@dirrm lib/goffice/0.7.8/plugins/gnumeric
@dirrm lib/goffice/0.7.9/plugins/gnumeric
@dirrm lib/gnumeric/%%VERSION%%/plugins/xbase
@dirrm lib/gnumeric/%%VERSION%%/plugins/uihello
@dirrm lib/gnumeric/%%VERSION%%/plugins/sylk