Update to goffice-0.10.2.

This commit is contained in:
ajacoutot 2013-04-27 11:31:51 +00:00
parent 7c8564f5ab
commit 44831a5b33
5 changed files with 7 additions and 79 deletions

View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.50 2013/04/16 13:17:00 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.51 2013/04/27 11:31:51 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= document centric objects and utilities
# XXX on GNOME_VERSION version change, update GOFFICE_API_VERSION and
# When GNOME_VERSION version change, update GOFFICE_API_VERSION and
# GOFFICE_VERSION in math/gnumeric then bump REVISION.
GNOME_PROJECT= goffice
GNOME_VERSION= 0.10.1
REVISION= 1
GNOME_VERSION= 0.10.2
SHARED_LIBS += goffice-0.10 0.0 # 10.0

View File

@ -1,2 +1,2 @@
SHA256 (goffice-0.10.1.tar.xz) = XDj06B6HTMjolIGwgPd8R8cr/W/iUm9Pwu+HwX+WytA=
SIZE (goffice-0.10.1.tar.xz) = 2120484
SHA256 (goffice-0.10.2.tar.xz) = fTh2mnr2VcDwNzc4x4YxhzRADXG2u8jRzmtt6Zu5VnQ=
SIZE (goffice-0.10.2.tar.xz) = 2164976

View File

@ -1,51 +0,0 @@
$OpenBSD: patch-goffice_math_go-cspline_c,v 1.1 2013/03/11 08:19:38 ajacoutot Exp $
From 01f93869b7e2e9b38bd62c94d9d71103dffa4f08 Mon Sep 17 00:00:00 2001
From: Morten Welinder <terra@gnome.org>
Date: Sun, 10 Mar 2013 20:18:01 +0000
Subject: Math: fix problems with cspline boxed type.
From 7a4c59faf5f7cb7a1419dc5b26d154f1a8007423 Mon Sep 17 00:00:00 2001
From: Morten Welinder <terra@gnome.org>
Date: Sun, 10 Mar 2013 20:56:37 +0000
Subject: Compilation: work around gtk-doc for --without-long-double builds.
--- goffice/math/go-cspline.c.orig Mon Mar 11 09:09:08 2013
+++ goffice/math/go-cspline.c Mon Mar 11 09:08:59 2013
@@ -50,6 +50,12 @@
#define DOUBLE long double
#define SUFFIX(_n) _n ## l
#define LONG_DOUBLE
+
+#else
+/* It appears that gtk-doc is too dumb to handle this file. Provide
+ a dummy type getter to make things work. */
+GType go_csplinel_get_type (void);
+GType go_csplinel_get_type (void) { return G_TYPE_NONE; }
#endif
#endif
@@ -229,9 +235,9 @@ SUFFIX(go_cspline_ref) (GOCSpline *sp)
GType
#ifdef LONG_DOUBLE
-go_cspline_get_type (void)
-#else
go_csplinel_get_type (void)
+#else
+go_cspline_get_type (void)
#endif
{
static GType t = 0;
@@ -239,9 +245,9 @@ go_csplinel_get_type (void)
if (t == 0) {
t = g_boxed_type_register_static (
#ifdef LONG_DOUBLE
- "GOCSpline",
-#else
"GOCSplinel",
+#else
+ "GOCSpline",
#endif
(GBoxedCopyFunc)SUFFIX(go_cspline_ref),
(GBoxedFreeFunc)SUFFIX(go_cspline_destroy));

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-goffice_math_go-regression_c,v 1.1 2013/03/11 08:19:38 ajacoutot Exp $
From 7a4c59faf5f7cb7a1419dc5b26d154f1a8007423 Mon Sep 17 00:00:00 2001
From: Morten Welinder <terra@gnome.org>
Date: Sun, 10 Mar 2013 20:56:37 +0000
Subject: Compilation: work around gtk-doc for --without-long-double builds.
--- goffice/math/go-regression.c.orig Sun Feb 24 00:20:13 2013
+++ goffice/math/go-regression.c Mon Mar 11 09:08:59 2013
@@ -128,6 +128,11 @@ general_linear_regressionl (long double *const *const
#define SUFFIX(_n) _n ## l
#define FORMAT_f "Lf"
#define FORMAT_g "Lg"
+#else
+/* It appears that gtk-doc is too dumb to handle this file. Provide
+ a dummy type getter to make things work. */
+GType go_regression_statl_get_type (void);
+GType go_regression_statl_get_type (void) { return G_TYPE_NONE; }
#endif
#endif

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.17 2013/03/14 09:00:44 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.18 2013/04/27 11:31:52 ajacoutot Exp $
include/libgoffice-${API_VERSION}/
include/libgoffice-${API_VERSION}/goffice/
include/libgoffice-${API_VERSION}/goffice/app/
@ -109,6 +109,7 @@ include/libgoffice-${API_VERSION}/goffice/gtk/go-color-selector.h
include/libgoffice-${API_VERSION}/goffice/gtk/go-combo-box.h
include/libgoffice-${API_VERSION}/goffice/gtk/go-combo-color.h
include/libgoffice-${API_VERSION}/goffice/gtk/go-combo-pixmaps.h
include/libgoffice-${API_VERSION}/goffice/gtk/go-font-sel-dialog.h
include/libgoffice-${API_VERSION}/goffice/gtk/go-font-sel.h
include/libgoffice-${API_VERSION}/goffice/gtk/go-format-sel.h
include/libgoffice-${API_VERSION}/goffice/gtk/go-gradient-selector.h