From a98c50597e6491a1be00c5495659d5cf7ca8a66d Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 31 Jul 2011 20:51:08 +0000 Subject: [PATCH] Bugfix update to gnumeric-1.10.17. * fixes a memleak and a crasher ok jasper@ landry@ --- math/gnumeric/Makefile | 8 +++--- math/gnumeric/distinfo | 10 +++---- .../patch-src_dialogs_dialog-preferences_c | 27 ------------------ math/gnumeric/patches/patch-src_sheet_c | 28 ------------------- math/gnumeric/pkg/PLIST | 4 ++- 5 files changed, 12 insertions(+), 65 deletions(-) delete mode 100644 math/gnumeric/patches/patch-src_dialogs_dialog-preferences_c delete mode 100644 math/gnumeric/patches/patch-src_sheet_c diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 407d6df6f32..620c2c01bbe 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -1,15 +1,15 @@ -# $OpenBSD: Makefile,v 1.65 2011/06/17 09:37:48 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.66 2011/07/31 20:51:08 ajacoutot Exp $ COMMENT= spreadsheet application for GNOME GNOME_PROJECT= gnumeric -GNOME_VERSION= 1.10.16 +GNOME_VERSION= 1.10.17 CATEGORIES= math HOMEPAGE= http://www.gnome.org/projects/gnumeric/ -API_VERSION= 0.8.16 # from devel/goffice +API_VERSION= 0.8.17 # from devel/goffice # GPLv2 # Some tools: LGPL @@ -31,7 +31,7 @@ MODULES= devel/gconf2 \ devel/gettext \ x11/gnome -LIB_DEPENDS= goffice->=0.8.16,<0.8.17:devel/goffice \ +LIB_DEPENDS= goffice->=0.8.17,<0.8.18:devel/goffice \ devel/libgsf \ x11/gtk+2 diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo index 01b4f52e6d3..972f157141d 100644 --- a/math/gnumeric/distinfo +++ b/math/gnumeric/distinfo @@ -1,5 +1,5 @@ -MD5 (gnumeric-1.10.16.tar.bz2) = x5p8S20ggNJJxjpQRbeK8w== -RMD160 (gnumeric-1.10.16.tar.bz2) = faUsLCN0qL/Cu3tSZs8Lj2rDE9E= -SHA1 (gnumeric-1.10.16.tar.bz2) = l1RZMybrHPr9Z5zXd+90bXKp6fg= -SHA256 (gnumeric-1.10.16.tar.bz2) = YAeHxrJkbhvseLNrdmW6zZ1I/ZnSHerjEAAuEagrvIY= -SIZE (gnumeric-1.10.16.tar.bz2) = 19015295 +MD5 (gnumeric-1.10.17.tar.bz2) = qswImSIsmPqc3YXEmmhAvg== +RMD160 (gnumeric-1.10.17.tar.bz2) = x2OS94g5sukq0KDsGnsYX9dkbaE= +SHA1 (gnumeric-1.10.17.tar.bz2) = ilmjab/iMsPxPwRnUTGC4ZDTZmE= +SHA256 (gnumeric-1.10.17.tar.bz2) = uyoTQkgR0TL+G+em6C1hFXoYxjD8kbdAlQPb1+9gDqU= +SIZE (gnumeric-1.10.17.tar.bz2) = 19010738 diff --git a/math/gnumeric/patches/patch-src_dialogs_dialog-preferences_c b/math/gnumeric/patches/patch-src_dialogs_dialog-preferences_c deleted file mode 100644 index 84f6050c51f..00000000000 --- a/math/gnumeric/patches/patch-src_dialogs_dialog-preferences_c +++ /dev/null @@ -1,27 +0,0 @@ -$OpenBSD: patch-src_dialogs_dialog-preferences_c,v 1.5 2011/06/26 06:01:57 ajacoutot Exp $ - -powerof2 is already defined in sys/param.h. - ---- src/dialogs/dialog-preferences.c.orig Wed Mar 9 13:29:36 2011 -+++ src/dialogs/dialog-preferences.c Fri Mar 25 07:56:08 2011 -@@ -378,7 +378,7 @@ int_pref_create_widget (GOConfNode *node, GtkWidget *t - } - - static gboolean --powerof2 (int i) -+powerof_2 (int i) - { - return i > 0 && (i & (i - 1)) == 0; - } -@@ -388,9 +388,9 @@ cb_power_of_2 (GtkAdjustment *adj) - { - int val = (int)gtk_adjustment_get_value (adj); - -- if (powerof2 (val - 1)) -+ if (powerof_2 (val - 1)) - gtk_adjustment_set_value (adj, (val - 1) * 2); -- else if (powerof2 (val + 1)) -+ else if (powerof_2 (val + 1)) - gtk_adjustment_set_value (adj, (val + 1) / 2); - } - diff --git a/math/gnumeric/patches/patch-src_sheet_c b/math/gnumeric/patches/patch-src_sheet_c deleted file mode 100644 index f68232010f6..00000000000 --- a/math/gnumeric/patches/patch-src_sheet_c +++ /dev/null @@ -1,28 +0,0 @@ -$OpenBSD: patch-src_sheet_c,v 1.6 2011/06/26 06:01:57 ajacoutot Exp $ - -powerof2 is already defined in sys/param.h. - ---- src/sheet.c.orig Sat Jun 4 03:38:56 2011 -+++ src/sheet.c Fri Jun 17 10:38:14 2011 -@@ -1078,7 +1078,7 @@ gnm_sheet_visibility_get_type (void) - /* ------------------------------------------------------------------------- */ - - static gboolean --powerof2 (int i) -+powerof_2 (int i) - { - return i > 0 && (i & (i - 1)) == 0; - } -@@ -1088,10 +1088,10 @@ gnm_sheet_valid_size (int cols, int rows) - { - return (cols >= GNM_MIN_COLS && - cols <= GNM_MAX_COLS && -- powerof2 (cols) && -+ powerof_2 (cols) && - rows >= GNM_MIN_ROWS && - rows <= GNM_MAX_ROWS && -- powerof2 (rows) -+ powerof_2 (rows) - #if 0 - && 0x80000000u / (unsigned)(cols / 2) >= (unsigned)rows - #endif diff --git a/math/gnumeric/pkg/PLIST b/math/gnumeric/pkg/PLIST index 27ca710f355..049171686fa 100644 --- a/math/gnumeric/pkg/PLIST +++ b/math/gnumeric/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.31 2011/06/17 09:37:48 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.32 2011/07/31 20:51:08 ajacoutot Exp $ %%SHARED%% bin/gnumeric @bin bin/gnumeric-${VERSION} @@ -712,6 +712,7 @@ share/gnome/help/gnumeric/C/figures/printing-preview.png share/gnome/help/gnumeric/C/figures/printing-setup-header-config.png share/gnome/help/gnumeric/C/figures/printing-setup-header.png share/gnome/help/gnumeric/C/figures/printing-setup-page.png +share/gnome/help/gnumeric/C/figures/printing-setup-printarea.png share/gnome/help/gnumeric/C/figures/printing-setup-sheet.png share/gnome/help/gnumeric/C/figures/selection-1.png share/gnome/help/gnumeric/C/figures/selection-10.png @@ -836,6 +837,7 @@ share/gnumeric/${VERSION}/ui/autofilter-top10.ui share/gnumeric/${VERSION}/ui/autoformat.ui share/gnumeric/${VERSION}/ui/autosave.ui share/gnumeric/${VERSION}/ui/cell-comment.ui +share/gnumeric/${VERSION}/ui/cell-format-cond.ui share/gnumeric/${VERSION}/ui/cell-format.ui share/gnumeric/${VERSION}/ui/cell-sort.ui share/gnumeric/${VERSION}/ui/chi-squared.ui