summaryrefslogtreecommitdiff
path: root/math/gnumeric
diff options
context:
space:
mode:
authorrh <rh@pkgsrc.org>2000-10-15 17:38:54 +0000
committerrh <rh@pkgsrc.org>2000-10-15 17:38:54 +0000
commitfc413e0ab54de29374d9290b098be78786f5597d (patch)
treeccdc2d722343b38184e6f6f89887d81197b952ce /math/gnumeric
parent3229d1026747d15d0361dda7b6a9e7c09a404d04 (diff)
downloadpkgsrc-fc413e0ab54de29374d9290b098be78786f5597d.tar.gz
Update gnumeric to 0.56nb1. Changes are bugfixes only.
Diffstat (limited to 'math/gnumeric')
-rw-r--r--math/gnumeric/Makefile5
-rw-r--r--math/gnumeric/files/patch-sum7
-rw-r--r--math/gnumeric/patches/patch-ac36
-rw-r--r--math/gnumeric/patches/patch-ad21
-rw-r--r--math/gnumeric/patches/patch-ae32
-rw-r--r--math/gnumeric/patches/patch-af22
-rw-r--r--math/gnumeric/patches/patch-ag17
7 files changed, 137 insertions, 3 deletions
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index daf639da37f..47849f67059 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2000/06/26 21:55:47 rh Exp $
+# $NetBSD: Makefile,v 1.21 2000/10/15 17:38:54 rh Exp $
#
DISTNAME= gnumeric-0.56
+PKGNAME= ${DISTNAME}nb1
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnumeric/}
@@ -10,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/gnumeric/
BUILD_DEPENDS+= ${LOCALBASE}/bin/python:../../lang/python
DEPENDS+= gnome-core-*:../../x11/gnome-core
-DEPENDS+= gnome-print>=0.20:../../print/gnome-print
+DEPENDS+= gnome-print>=0.23:../../print/gnome-print
DEPENDS+= libxml>=1.8.7:../../textproc/libxml
DEPENDS+= libglade>=0.13:../../devel/libglade
DEPENDS+= libole2>=0.1.5:../../devel/libole2
diff --git a/math/gnumeric/files/patch-sum b/math/gnumeric/files/patch-sum
index 136d2242ecb..67145c6aa41 100644
--- a/math/gnumeric/files/patch-sum
+++ b/math/gnumeric/files/patch-sum
@@ -1,4 +1,9 @@
-$NetBSD: patch-sum,v 1.10 2000/06/26 21:55:49 rh Exp $
+$NetBSD: patch-sum,v 1.11 2000/10/15 17:38:56 rh Exp $
MD5 (patch-aa) = 924fbac922c081d2956491fda9a21c03
MD5 (patch-ab) = 27dded2423bab4880f320794918b88ca
+MD5 (patch-ac) = 5371db7572d9d0e27d13ac9173f80f31
+MD5 (patch-ad) = dfdcbc5c44415738d2e4cf2cf4a31069
+MD5 (patch-ae) = be4ec7f4a9482464ac56868705114a7e
+MD5 (patch-af) = 7b61a3234a8c12463ff234eb4e46eb06
+MD5 (patch-ag) = 023bc5932503be38e9db95286e227b43
diff --git a/math/gnumeric/patches/patch-ac b/math/gnumeric/patches/patch-ac
new file mode 100644
index 00000000000..c91835c2ba2
--- /dev/null
+++ b/math/gnumeric/patches/patch-ac
@@ -0,0 +1,36 @@
+$NetBSD: patch-ac,v 1.3 2000/10/15 17:38:56 rh Exp $
+
+--- src/dialogs/dialog-cell-format.c.orig Wed Jun 14 01:07:21 2000
++++ src/dialogs/dialog-cell-format.c
+@@ -1158,17 +1158,20 @@
+ return;
+
+ if (state->enable_edit && font_sel->size >= 1.) {
+- GnomeFont const * const gnome_font = gnome_display_font->gnome_font;
+- char const * const family_name = gnome_font->fontmap_entry->familyname;
+-
+- mstyle_set_font_name (state->result, family_name);
+- mstyle_set_font_size (state->result, font_sel->size);
+- mstyle_set_font_bold (state->result,
+- gnome_font->fontmap_entry->weight_code >=
+- GNOME_FONT_BOLD);
+- mstyle_set_font_italic (state->result, gnome_font->fontmap_entry->italic);
+-
+- fmt_dialog_changed (state);
++ const GnomeFont *gnome_font =
++ gnome_display_font_get_font(gnome_display_font);
++ char const * const family_name =
++ gnome_font_get_family_name(gnome_font);
++
++ mstyle_set_font_name (state->result, family_name);
++ mstyle_set_font_size (state->result, font_sel->size);
++ mstyle_set_font_bold (state->result,
++ gnome_font_get_weight_code(gnome_font) >=
++ GNOME_FONT_BOLD);
++ mstyle_set_font_italic (state->result,
++ gnome_font_is_italic(gnome_font));
++
++ fmt_dialog_changed (state);
+ }
+ }
+
diff --git a/math/gnumeric/patches/patch-ad b/math/gnumeric/patches/patch-ad
new file mode 100644
index 00000000000..5056cedb8ec
--- /dev/null
+++ b/math/gnumeric/patches/patch-ad
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.3 2000/10/15 17:38:56 rh Exp $
+
+--- src/print.c.orig Thu Jan 2 04:24:05 1997
++++ src/print.c
+@@ -258,12 +258,14 @@
+ print_headers (PrintJobInfo *pj)
+ {
+ PrintMargins *pm = &pj->pi->margins;
+- double y;
++ double y = pj->height - pm->header.points -
++ gnome_font_get_size(pj->decoration_font);
+
+ gnome_print_setfont (pj->print_context, pj->decoration_font);
+ gnome_print_setrgbcolor (pj->print_context, 0, 0, 0);
+
+- y = pj->height - pm->header.points - pj->decoration_font->size;
++ y = pj->height - pm->header.points -
++ gnome_font_get_size(pj->decoration_font);
+ print_hf (pj, pj->pi->header->left_format, LEFT_HEADER, y);
+ print_hf (pj, pj->pi->header->middle_format, MIDDLE_HEADER, y);
+ print_hf (pj, pj->pi->header->right_format, RIGHT_HEADER, y);
diff --git a/math/gnumeric/patches/patch-ae b/math/gnumeric/patches/patch-ae
new file mode 100644
index 00000000000..021577c011d
--- /dev/null
+++ b/math/gnumeric/patches/patch-ae
@@ -0,0 +1,32 @@
+$NetBSD: patch-ae,v 1.3 2000/10/15 17:38:56 rh Exp $
+
+--- src/style.c.orig Sun Jun 18 15:48:08 2000
++++ src/style.c
+@@ -151,9 +151,6 @@
+ /*
+ * Worst case scenario
+ */
+- if (font->dfont->gdk_font == NULL)
+- font->dfont->gdk_font = gdk_font_load ("fixed");
+-
+ font->font = gnome_font_new_closest (
+ font_name,
+ bold ? GNOME_FONT_BOLD : GNOME_FONT_BOOK,
+@@ -223,7 +220,7 @@
+ {
+ g_return_val_if_fail (sf != NULL, NULL);
+
+- return sf->dfont->gdk_font;
++ return gnome_display_font_get_gdk_font(sf->dfont);
+ }
+
+ GnomeFont *
+@@ -231,7 +228,7 @@
+ {
+ g_return_val_if_fail (sf != NULL, NULL);
+
+- return sf->dfont->gnome_font;
++ return gnome_display_font_get_font(sf->dfont);
+ }
+
+ int
diff --git a/math/gnumeric/patches/patch-af b/math/gnumeric/patches/patch-af
new file mode 100644
index 00000000000..523b595865c
--- /dev/null
+++ b/math/gnumeric/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.3 2000/10/15 17:38:57 rh Exp $
+
+--- src/widgets/widget-font-selector.c.orig Wed May 10 21:28:10 2000
++++ src/widgets/widget-font-selector.c
+@@ -58,7 +58,7 @@
+ return;
+ }
+
+- if (!display_font->gdk_font) {
++ if (!gnome_display_font_get_gdk_font(display_font)) {
+ gtk_object_unref (GTK_OBJECT (gnome_font));
+ return;
+ }
+@@ -71,7 +71,7 @@
+
+ style = gtk_style_copy (fs->font_preview->style);
+ gdk_font_unref (style->font);
+- style->font = fs->display_font->gdk_font;
++ style->font = gnome_display_font_get_gdk_font(fs->display_font);
+ gdk_font_ref (style->font);
+
+ gtk_widget_set_style (fs->font_preview, style);
diff --git a/math/gnumeric/patches/patch-ag b/math/gnumeric/patches/patch-ag
new file mode 100644
index 00000000000..8745981fa1c
--- /dev/null
+++ b/math/gnumeric/patches/patch-ag
@@ -0,0 +1,17 @@
+$NetBSD: patch-ag,v 1.3 2000/10/15 17:38:57 rh Exp $
+
+--- src/global-gnome-font.c.orig Sat Sep 30 19:13:49 2000
++++ src/global-gnome-font.c
+@@ -23,11 +23,10 @@
+ void
+ global_gnome_font_init (void)
+ {
+- GnomeFontClass *gfc = gtk_type_class (gnome_font_get_type ());
+ int i;
+ GList *l, *ll;
+
+- l = gnome_font_family_list (gfc);
++ l = gnome_font_family_list ();
+
+ for (ll = l; ll; ll = ll->next){
+ gnumeric_font_family_list = g_list_insert_sorted (