[arch-commits] Commit in gnumeric/trunk (5 files)

Eric Belanger eric at archlinux.org
Fri May 30 22:40:55 EDT 2008


    Date: Friday, May 30, 2008 @ 22:40:55
  Author: eric
Revision: 2297

upgpkg: gnumeric 1.8.3-1
    upstream update, added missing depends, updated .install script to use gconfpkg

Modified:
  gnumeric/trunk/PKGBUILD
  gnumeric/trunk/gnumeric.install
Deleted:
  gnumeric/trunk/goffice-0.5-mathcompat.patch
  gnumeric/trunk/help-file.patch
  gnumeric/trunk/line-pattern-unimplemented.patch

----------------------------------+
 PKGBUILD                         |    8 -
 gnumeric.install                 |   21 ----
 goffice-0.5-mathcompat.patch     |  105 --------------------
 help-file.patch                  |   24 ----
 line-pattern-unimplemented.patch |  193 -------------------------------------
 5 files changed, 6 insertions(+), 345 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-05-31 02:33:59 UTC (rev 2296)
+++ PKGBUILD	2008-05-31 02:40:55 UTC (rev 2297)
@@ -3,18 +3,18 @@
 # Contributor: Kritoke <typeolinux at yahoo.com>
 
 pkgname=gnumeric
-pkgver=1.8.2
+pkgver=1.8.3
 pkgrel=1
 pkgdesc="A GNOME Spreadsheet Program"
 url="http://www.gnome.org/projects/gnumeric/"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('goffice>=0.6.1')
+depends=('goffice>=0.6.1' 'gconf>=2.18.0.1-4' 'desktop-file-utils')
 makedepends=('perlxml' 'pygtk' 'psiconv' 'pkgconfig')
 install=gnumeric.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.8/${pkgname}-${pkgver}.tar.bz2)
 options=('libtool')
-md5sums=('f60edc6ca42daa2fb3717f3c90fa8a6e')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('3ce6ba6483ccd6fe9974cface582337a')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}

Modified: gnumeric.install
===================================================================
--- gnumeric.install	2008-05-31 02:33:59 UTC (rev 2296)
+++ gnumeric.install	2008-05-31 02:40:55 UTC (rev 2297)
@@ -1,9 +1,7 @@
 pkgname=gnumeric
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
-  scrollkeeper-update -q -p var/lib/scrollkeeper
+  usr/sbin/gconfpkg --install ${pkgname}
   update-desktop-database -q
 
   echo "==> Install 'python' to enable python plugin support"
@@ -19,24 +17,9 @@
 }
 
 pre_remove() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
-  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
-  else
-    schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  fi
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  
-  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
   update-desktop-database -q
-  scrollkeeper-update -q -p var/lib/scrollkeeper
 }
-
-op=$1
-shift
-
-$op $*

Deleted: goffice-0.5-mathcompat.patch
===================================================================
--- goffice-0.5-mathcompat.patch	2008-05-31 02:33:59 UTC (rev 2296)
+++ goffice-0.5-mathcompat.patch	2008-05-31 02:40:55 UTC (rev 2297)
@@ -1,105 +0,0 @@
-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

Deleted: help-file.patch
===================================================================
--- help-file.patch	2008-05-31 02:33:59 UTC (rev 2296)
+++ help-file.patch	2008-05-31 02:40:55 UTC (rev 2297)
@@ -1,24 +0,0 @@
---- gnumeric-1.6.1/src/wbcg-actions.c	2005-11-14 07:12:35.000000000 +0100
-+++ gnumeric-1.6.1/src/wbcg-actions.c.new	2006-01-13 19:23:17.000000000 +0100
-@@ -909,8 +909,10 @@
- #warning "handle translations when we generate them"
- #ifndef G_OS_WIN32
- 	argv[0] = (char *)"yelp";
--	argv[1] = g_build_filename (gnm_sys_data_dir (), "doc", "C",
--			"gnumeric.xml", NULL);
-+	/*argv[1] = g_build_filename (gnm_sys_data_dir (), "doc", "C",
-+			"gnumeric.xml", NULL);*/
-+	argv[1] = ("/usr/share/gnome/help/gnumeric/C/gnumeric.xml");
-+	
- #else
- 	argv[0] = (char *)"hh";
- 	argv[1] = g_build_filename (gnm_sys_data_dir (), "doc", "C",
-@@ -918,7 +920,7 @@
- #endif
- 	g_spawn_async (NULL, argv, NULL, G_SPAWN_SEARCH_PATH,
- 		NULL, NULL, NULL, &error);
--	g_free (argv[1]);
-+	/*g_free (argv[1]);*/
- }
- 
- static GNM_ACTION_DEF (cb_help_web)

Deleted: line-pattern-unimplemented.patch
===================================================================
--- line-pattern-unimplemented.patch	2008-05-31 02:33:59 UTC (rev 2296)
+++ line-pattern-unimplemented.patch	2008-05-31 02:40:55 UTC (rev 2297)
@@ -1,193 +0,0 @@
-diff -ur gnumeric-1.7.91/src/gnm-so-filled.c gnumeric-1.7.91-patched/src/gnm-so-filled.c
---- gnumeric-1.7.91/src/gnm-so-filled.c	2007-11-16 06:26:07.000000000 -0600
-+++ gnumeric-1.7.91-patched/src/gnm-so-filled.c	2008-01-12 15:54:36.000000000 -0600
-@@ -145,7 +145,6 @@
- 	res->interesting_fields = GOG_STYLE_OUTLINE | GOG_STYLE_FILL;
- 	res->outline.width = 0; /* hairline */
- 	res->outline.color = RGBA_BLACK;
--	res->outline.pattern = 1; /* anything but 0 */
- 	res->fill.type = GOG_FILL_STYLE_PATTERN;
- 	go_pattern_set_solid (&res->fill.pattern, RGBA_WHITE);
- 	return res;
-@@ -180,8 +179,7 @@
- 	GdkColor fill_buf, *fill_gdk = NULL;
- 
- 	if (style->outline.color != 0 &&
--	    style->outline.width >= 0 &&
--	    style->outline.pattern != 0)
-+	    style->outline.width >= 0)
- 		outline_gdk = go_color_to_gdk (style->outline.color, &outline_buf);
- 
- 	if (style->fill.type != GOG_FILL_STYLE_NONE)
-diff -ur gnumeric-1.7.91/src/gnm-so-line.c gnumeric-1.7.91-patched/src/gnm-so-line.c
---- gnumeric-1.7.91/src/gnm-so-line.c	2007-11-16 06:26:07.000000000 -0600
-+++ gnumeric-1.7.91-patched/src/gnm-so-line.c	2008-01-12 15:57:26.000000000 -0600
-@@ -98,7 +98,7 @@
- 	sheet_object_direction_set (so, coords);
- 
- 	if (visible &&
--	    style->color != 0 && style->width >= 0 && style->pattern != 0) {
-+	    style->color != 0 && style->width >= 0) {
- 		FooCanvasPoints *points = foo_canvas_points_new (2);
- 		points->coords[0] = coords[0];
- 		points->coords[1] = coords[1];
-@@ -139,7 +139,6 @@
- 	res->interesting_fields = GOG_STYLE_LINE;
- 	res->line.width   = 0; /* hairline */
- 	res->line.color   = RGBA_BLACK;
--	res->line.pattern = 1; /* anything but 0 */
- 	return res;
- }
- 
-@@ -166,7 +165,7 @@
- 	GogStyleLine const *style = &sol->style->line;
- 	GdkColor buf, *gdk = NULL;
- 
--	if (style->color != 0 && style->width >= 0 && style->pattern != 0)
-+	if (style->color != 0 && style->width >= 0)
- 		gdk = go_color_to_gdk (style->color, &buf);
- 
- 	if (style->width > 0.)	/* in pts */
-@@ -212,7 +211,7 @@
- 	GogStyleLine const *style = &sol->style->line;
- 	double x1, y1, x2, y2;
- 
--	if (style->color == 0 || style->width < 0 || style->pattern == 0)
-+	if (style->color == 0 || style->width < 0)
- 		return;
- 
- 	switch (so->anchor.base.direction) {
-diff -ur gnumeric-1.7.91/src/gnm-so-polygon.c gnumeric-1.7.91-patched/src/gnm-so-polygon.c
---- gnumeric-1.7.91/src/gnm-so-polygon.c	2007-11-16 06:26:07.000000000 -0600
-+++ gnumeric-1.7.91-patched/src/gnm-so-polygon.c	2008-01-12 15:57:49.000000000 -0600
-@@ -128,7 +128,6 @@
- 	res->interesting_fields = GOG_STYLE_OUTLINE | GOG_STYLE_FILL;
- 	res->outline.width = 0; /* hairline */
- 	res->outline.color = RGBA_BLACK;
--	res->outline.pattern = 1; /* anything but 0 */
- 	res->fill.type = GOG_FILL_STYLE_PATTERN;
- 	go_pattern_set_solid (&res->fill.pattern, RGBA_WHITE);
- 	return res;
-@@ -146,8 +145,7 @@
- 	GdkColor fill_buf, *fill_gdk = NULL;
- 
- 	if (style->outline.color != 0 &&
--	    style->outline.width >= 0 &&
--	    style->outline.pattern != 0)
-+	    style->outline.width >= 0)
- 		outline_gdk = go_color_to_gdk (style->outline.color, &outline_buf);
- 
- 	if (style->fill.type != GOG_FILL_STYLE_NONE)
-diff -ur gnumeric-1.7.91/plugins/excel/ms-chart.c gnumeric-1.7.91-patched/plugins/excel/ms-chart.c
---- gnumeric-1.7.91/plugins/excel/ms-chart.c	2007-11-29 20:03:56.000000000 -0600
-+++ gnumeric-1.7.91-patched/plugins/excel/ms-chart.c	2008-01-13 15:33:59.000000000 -0600
-@@ -1302,17 +1302,11 @@
- 	}
- 	s->style->line.color      = BC_R(color) (q->data, "LineColor");
- 	s->style->line.auto_color = s->style->line.auto_dash = (flags & 0x01) ? TRUE : FALSE;
--	s->style->line.pattern    = GSF_LE_GET_GUINT16 (q->data+4);
- 
- 	d (0, g_printerr ("flags == %hd.\n", flags););
- 	d (0, g_printerr ("Lines are %f pts wide.\n", s->style->line.width););
--	d (0, g_printerr ("Lines have a %s pattern.\n",
--		       ms_line_pattern [s->style->line.pattern]););
- 
--	if (s->style->line.pattern <= G_N_ELEMENTS (dash_map))
--		s->style->line.dash_type = dash_map [s->style->line.pattern];
--	else
--		s->style->line.dash_type = GO_LINE_SOLID;
-+    s->style->line.dash_type = GO_LINE_SOLID;
- 
- 	if (BC_R(ver)(s) >= MS_BIFF_V8 && s->currentSeries != NULL) {
- 		guint16 const fore = GSF_LE_GET_GUINT16 (q->data+10);
-@@ -3693,10 +3687,8 @@
- 
- 	if (lstyle != NULL) {
- 		color_index = chart_write_color (s, data, lstyle->color);
--		pat = patterns[lstyle->pattern];
- 		if (lstyle->width < 0.) {
- 			w = 0xffff;
--			pat = 5;	/* none */
- 		} else if (lstyle->width <= .5)
- 			w = 0xffff;	/* hairline */
- 		else if (lstyle->width <= 1.5)
-@@ -3710,10 +3702,8 @@
- 	} else {
- 		color_index = chart_write_color (s, data, 0);
- 		if (clear_lines_for_null) {
--			pat = 5;
- 			flags = 8;	/* docs only mention 1, but there is an 8 in there too */
- 		} else {
--			pat = 0;
- 			flags = 9;	/* docs only mention 1, but there is an 8 in there too */
- 		}
- 		w = 0xffff;
-@@ -3721,7 +3711,6 @@
- 	if (draw_ticks)
- 		flags |= 4;
- 
--	GSF_LE_SET_GUINT16 (data+4, pat);
- 	GSF_LE_SET_GUINT16 (data+6, w);
- 	GSF_LE_SET_GUINT16 (data+8, flags);
- 	if (s->bp->version >= MS_BIFF_V8)
-@@ -4664,7 +4653,6 @@
- 		line_style.auto_dash = FALSE;
- 		line_style.color = 0;
- 		line_style.auto_color = FALSE;
--		line_style.pattern = 5;
- 		chart_write_LINEFORMAT (s, NULL,
- 					FALSE, TRUE);
- 	}
-@@ -5290,7 +5278,6 @@
- 				/* FIXME: change this code when series lines are available ! */
- 				style->line.auto_dash = FALSE;
- 				style->line.auto_color = FALSE;
--				style->line.pattern = 5;
- 				style->marker.auto_shape = FALSE;
- 				go_marker_set_shape (style->marker.mark, GO_MARKER_NONE);
- 				style->marker.auto_fill_color = FALSE;
-@@ -5310,7 +5297,6 @@
- 				/* FIXME: change this code when series lines are available ! */
- 				style->line.auto_dash = FALSE;
- 				style->line.auto_color = FALSE;
--				style->line.pattern = 5;
- 				style->marker.auto_shape = FALSE;
- 				go_marker_set_shape (style->marker.mark, GO_MARKER_NONE);
- 				style->marker.auto_fill_color = FALSE;
-@@ -5365,7 +5351,6 @@
- 				/* FIXME: change this code when series lines are available ! */
- 				style->line.auto_dash = FALSE;
- 				style->line.auto_color = FALSE;
--				style->line.pattern = 5;
- 				style->marker.auto_shape = FALSE;
- 				go_marker_set_shape (style->marker.mark, GO_MARKER_NONE);
- 				style->marker.auto_fill_color = FALSE;
-@@ -5385,7 +5370,6 @@
- 				/* FIXME: change this code when series lines are available ! */
- 				style->line.auto_dash = FALSE;
- 				style->line.auto_color = FALSE;
--				style->line.pattern = 5;
- 				style->marker.auto_shape = FALSE;
- 				go_marker_set_shape (style->marker.mark, GO_MARKER_NONE);
- 				style->marker.auto_fill_color = FALSE;
-diff -ur gnumeric-1.7.91/plugins/excel/ms-excel-read.c gnumeric-1.7.91-patched/plugins/excel/ms-excel-read.c
---- gnumeric-1.7.91/plugins/excel/ms-excel-read.c	2007-11-16 06:26:07.000000000 -0600
-+++ gnumeric-1.7.91-patched/plugins/excel/ms-excel-read.c	2008-01-12 15:54:36.000000000 -0600
-@@ -435,8 +435,6 @@
- 			MS_OBJ_ATTR_OUTLINE_COLOR, RGBA_BLACK);
- 		style->line.width = ms_obj_attr_get_uint (obj->attrs,
- 			MS_OBJ_ATTR_OUTLINE_WIDTH, 0) / 256.;
--		style->line.pattern = ms_obj_attr_bag_lookup (obj->attrs, MS_OBJ_ATTR_OUTLINE_HIDE)
--			? 0 : ms_obj_attr_get_int (obj->attrs, MS_OBJ_ATTR_OUTLINE_STYLE, 1);
- 		g_object_set (G_OBJECT (so), "style", style, NULL);
- 		g_object_unref (style);
- 		break;
-@@ -456,8 +454,6 @@
- 			MS_OBJ_ATTR_OUTLINE_COLOR, RGBA_BLACK);
- 		style->outline.width = ms_obj_attr_get_uint (obj->attrs,
- 			MS_OBJ_ATTR_OUTLINE_WIDTH, 0) / 256.;
--		style->outline.pattern = ms_obj_attr_bag_lookup (obj->attrs, MS_OBJ_ATTR_OUTLINE_HIDE)
--			? 0 : ms_obj_attr_get_int (obj->attrs, MS_OBJ_ATTR_OUTLINE_STYLE, 1);
- 		style->fill.pattern.back = ms_sheet_map_color (esheet, obj,
- 			MS_OBJ_ATTR_FILL_COLOR, RGBA_WHITE);
- 		style->fill.pattern.fore = ms_sheet_map_color (esheet, obj,





More information about the arch-commits mailing list