[arch-commits] CVS update of extra/office/gnumeric (2 files)

Aaron Griffin aaron at archlinux.org
Mon Oct 22 05:01:37 UTC 2007


    Date: Monday, October 22, 2007 @ 01:01:37
  Author: aaron
    Path: /home/cvs-extra/extra/office/gnumeric

   Added: goffice-0.5-mathcompat.patch (1.1)
Modified: PKGBUILD (1.26 -> 1.27)

upgpkg: gnumeric 1.7.12-1
Upgrade with goffice 0.5.1 support


------------------------------+
 PKGBUILD                     |   13 +++--
 goffice-0.5-mathcompat.patch |  105 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+), 5 deletions(-)


Index: extra/office/gnumeric/PKGBUILD
diff -u extra/office/gnumeric/PKGBUILD:1.26 extra/office/gnumeric/PKGBUILD:1.27
--- extra/office/gnumeric/PKGBUILD:1.26	Sun Aug 12 01:06:10 2007
+++ extra/office/gnumeric/PKGBUILD	Mon Oct 22 01:01:37 2007
@@ -1,18 +1,20 @@
-# $Id: PKGBUILD,v 1.26 2007/08/12 05:06:10 aaron Exp $
+# $Id: PKGBUILD,v 1.27 2007/10/22 05:01:37 aaron Exp $
 # Maintainer: Aaron Griffin <aaron at archlinux.org>
 # Contributor: Kritoke <typeolinux at yahoo.com>
 
 pkgname=gnumeric
-pkgver=1.7.11
+pkgver=1.7.12
 pkgrel=1
 pkgdesc="A GNOME Spreadsheet Program"
 url="http://www.gnome.org/projects/gnumeric/"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('goffice>=0.4.2')
+depends=('goffice>=0.5.1')
 makedepends=('perlxml' 'pygtk' 'psiconv' 'pkgconfig')
 install=gnumeric.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.7/${pkgname}-${pkgver}.tar.bz2)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.7/${pkgname}-${pkgver}.tar.bz2
+        goffice-0.5-mathcompat.patch)
+md5sums=('d00a63bac78e29920e5ea2fce8cfa25e' '0b61ccf0bb7444e2d025bb6ce3a7a316')
 options=('libtool')
 
 build() {
@@ -24,6 +26,8 @@
   find plugins -name 'plugin.xml.in' -exec sed -i -e 's/\.la/.so/g' {} \;
   rm -f GNOME_Gnumeric.server.in
 
+  patch -up1 < ../goffice-0.5-mathcompat.patch
+
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --without-guile --with-bonobo --enable-ssindex
@@ -34,4 +38,3 @@
   gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
   rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }
-md5sums=('75e8c36afa8322c601a14cb5a35a8793')
Index: extra/office/gnumeric/goffice-0.5-mathcompat.patch
diff -u /dev/null extra/office/gnumeric/goffice-0.5-mathcompat.patch:1.1
--- /dev/null	Mon Oct 22 01:01:37 2007
+++ extra/office/gnumeric/goffice-0.5-mathcompat.patch	Mon Oct 22 01:01:37 2007
@@ -0,0 +1,105 @@
+diff -ur gnumeric-1.7.12/plugins/fn-tsa/functions.c gnumeric-new/plugins/fn-tsa/functions.c
+--- gnumeric-1.7.12/plugins/fn-tsa/functions.c	2007-09-01 20:07:39.000000000 -0500
++++ gnumeric-new/plugins/fn-tsa/functions.c	2007-10-21 23:36:39.000000000 -0500
+@@ -45,7 +45,7 @@
+ #include <expr-impl.h>
+ #include <func-builtin.h>
+ #include <gnm-i18n.h>
+-#include <goffice/utils/go-cspline.h>
++#include <goffice/math/go-cspline.h>
+ #include <gnm-plugin.h>
+ #include <tools/analysis-tools.h>
+ 
+diff -ur gnumeric-1.7.12/src/gnm-so-filled.c gnumeric-new/src/gnm-so-filled.c
+--- gnumeric-1.7.12/src/gnm-so-filled.c	2007-09-01 20:07:07.000000000 -0500
++++ gnumeric-new/src/gnm-so-filled.c	2007-10-21 23:22:29.000000000 -0500
+@@ -272,7 +272,7 @@
+ 		cairo_close_path (cairo);
+ 	}
+ 	/* Fill the shape */
+-	pat = gog_style_create_cairo_pattern (style, width, height, &obj);
++	pat = gog_style_create_cairo_pattern (style, cairo);
+ 	if (pat) {
+ 		cairo_set_source (cairo, pat);
+ 		cairo_fill_preserve (cairo);
+diff -ur gnumeric-1.7.12/src/graph.c gnumeric-new/src/graph.c
+--- gnumeric-1.7.12/src/graph.c	2007-09-01 20:07:07.000000000 -0500
++++ gnumeric-new/src/graph.c	2007-10-21 23:18:48.000000000 -0500
+@@ -36,7 +36,7 @@
+ #include "ranges.h"
+ #include "parse-util.h"
+ #include <goffice/data/go-data-impl.h>
+-#include <goffice/utils/go-math.h>
++#include <goffice/math/go-math.h>
+ 
+ #include <gsf/gsf-impl-utils.h>
+ #include <string.h>
+diff -ur gnumeric-1.7.12/src/mathfunc.c gnumeric-new/src/mathfunc.c
+--- gnumeric-1.7.12/src/mathfunc.c	2007-09-01 20:07:07.000000000 -0500
++++ gnumeric-new/src/mathfunc.c	2007-10-21 23:19:46.000000000 -0500
+@@ -62,7 +62,7 @@
+ #include <unistd.h>
+ #include <locale.h>
+ #include <string.h>
+-#include <goffice/utils/go-math.h>
++#include <goffice/math/go-math.h>
+ #include <glib/gstdio.h>
+ 
+ #if defined (HAVE_IEEEFP_H) || defined (HAVE_IEEE754_H)
+diff -ur gnumeric-1.7.12/src/numbers.h gnumeric-new/src/numbers.h
+--- gnumeric-1.7.12/src/numbers.h	2007-09-01 20:07:07.000000000 -0500
++++ gnumeric-new/src/numbers.h	2007-10-21 23:11:32.000000000 -0500
+@@ -2,7 +2,7 @@
+ #define GNUMERIC_NUMBERS_H
+ 
+ #include <gnumeric-config.h>
+-#include <goffice/utils/go-math.h>
++#include <goffice/math/go-math.h>
+ 
+ #ifdef HAVE_IEEEFP_H
+ #include <ieeefp.h>
+diff -ur gnumeric-1.7.12/src/rangefunc.h gnumeric-new/src/rangefunc.h
+--- gnumeric-1.7.12/src/rangefunc.h	2007-09-01 20:07:07.000000000 -0500
++++ gnumeric-new/src/rangefunc.h	2007-10-21 23:16:41.000000000 -0500
+@@ -2,7 +2,7 @@
+ #define GNUMERIC_RANGEFUNC_H
+ 
+ #include "numbers.h"
+-#include <goffice/utils/go-rangefunc.h>
++#include <goffice/math/go-rangefunc.h>
+ 
+ #ifdef WITH_LONG_DOUBLE
+ #	define gnm_range_sum go_range_suml
+diff -ur gnumeric-1.7.12/src/regression.h gnumeric-new/src/regression.h
+--- gnumeric-1.7.12/src/regression.h	2007-09-01 20:07:07.000000000 -0500
++++ gnumeric-new/src/regression.h	2007-10-21 23:12:50.000000000 -0500
+@@ -2,7 +2,7 @@
+ #define GNUMERIC_REGRESSION_H
+ 
+ #include "numbers.h"
+-#include <goffice/utils/go-regression.h>
++#include <goffice/math/go-regression.h>
+ 
+ #ifdef WITH_LONG_DOUBLE
+ #	define gnm_regression_stat_t go_regression_stat_tl
+diff -ur gnumeric-1.7.12/src/sheet-object-graph.c gnumeric-new/src/sheet-object-graph.c
+--- gnumeric-1.7.12/src/sheet-object-graph.c	2007-09-01 20:07:07.000000000 -0500
++++ gnumeric-new/src/sheet-object-graph.c	2007-10-21 23:32:21.000000000 -0500
+@@ -389,7 +389,7 @@
+ 			  double width, double height)
+ {
+ #ifdef GOFFICE_WITH_CAIRO
+-	gog_graph_render_to_cairo_vector
++	gog_graph_render_to_cairo
+ 		(SHEET_OBJECT_GRAPH (so)->graph, data, width, height);
+ #endif
+ }
+@@ -610,7 +610,7 @@
+ 	if (sog->renderer != NULL)
+ 		g_object_set (sog->renderer, "model", graph, NULL);
+ 	else
+-		sog->renderer = gog_renderer_new_for_pixbuf (sog->graph);
++		sog->renderer = gog_renderer_new (sog->graph);
+ }
+ 
+ static void




More information about the arch-commits mailing list