Maintenance update to 1.2.9.

This commit is contained in:
marcm 2004-04-12 01:30:25 +00:00
parent 089d427a18
commit 18117f2d2e
6 changed files with 43 additions and 32 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2004/01/28 19:56:50 marcm Exp $
# $OpenBSD: Makefile,v 1.6 2004/04/12 01:30:25 marcm Exp $
COMMENT= "spreadsheet application for GNOME"
VERSION= 1.2.5
VERSION= 1.2.9
DISTNAME= gnumeric-${VERSION}
CATEGORIES= math x11/gnome
@ -20,10 +20,10 @@ MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnumeric/1.2/}
MODULES= gettext
BUILD_DEPENDS= :pkgconfig->=0.14.0p1:devel/pkgconfig \
:scrollkeeper->=0.3.11:textproc/scrollkeeper \
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig \
:scrollkeeper-*:textproc/scrollkeeper \
:p5-XML-Parser-*:textproc/p5-XML-Parser
RUN_DEPENDS= :scrollkeeper->=0.3.11:textproc/scrollkeeper
RUN_DEPENDS= :scrollkeeper-*:textproc/scrollkeeper
LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui \
gnomeprintui-2-2::x11/gnome/libgnomeprintui \
gsf-1.9.2,gsf-gnome-1.9.2::devel/libgsf,-gnome

View File

@ -1,3 +1,3 @@
MD5 (gnumeric-1.2.5.tar.gz) = 0e0f6509825191a4c4b9d477f8d14e1a
RMD160 (gnumeric-1.2.5.tar.gz) = d2d9c181c9a5609c9408934c0552c2143422e887
SHA1 (gnumeric-1.2.5.tar.gz) = b5973ffdc024ab330b47b5edf37ad1a50846e0ef
MD5 (gnumeric-1.2.9.tar.gz) = 669fe09313ab0cb4e1b8b2b6e6d5a5aa
RMD160 (gnumeric-1.2.9.tar.gz) = f3d1a5df85d820360290e933b1b40772258d75f4
SHA1 (gnumeric-1.2.9.tar.gz) = 91f50ae123105657c3f6b071416fda63b316eff5

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2004/01/28 16:10:33 marcm Exp $
--- configure.orig 2004-01-18 12:49:33.000000000 -0800
+++ configure 2004-01-25 10:32:15.000000000 -0800
@@ -8523,7 +8523,7 @@ nto-qnx*)
$OpenBSD: patch-configure,v 1.3 2004/04/12 01:30:26 marcm Exp $
--- configure.orig 2004-04-07 22:24:49.000000000 -0700
+++ configure 2004-04-11 09:39:00.000000000 -0700
@@ -8517,7 +8517,7 @@ nto-qnx*)
openbsd*)
version_type=sunos
need_lib_prefix=no
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.2 2004/01/28 16:10:33 marcm Exp $
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
@@ -22491,7 +22491,7 @@ if test $ac_cv_func_bind_textdomain_code
@@ -22470,7 +22470,7 @@ if test $ac_cv_func_bind_textdomain_code
DATADIRNAME=share
else
CATOBJEXT=.mo

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ltmain_sh,v 1.2 2004/01/28 16:10:33 marcm Exp $
--- ltmain.sh.orig 2004-01-03 07:02:12.000000000 -0800
+++ ltmain.sh 2004-01-24 20:14:33.000000000 -0800
@@ -1355,6 +1355,17 @@ EOF
$OpenBSD: patch-ltmain_sh,v 1.3 2004/04/12 01:30:26 marcm Exp $
--- ltmain.sh.orig 2004-04-03 12:58:01.000000000 -0800
+++ ltmain.sh 2004-04-11 09:40:58.000000000 -0700
@@ -1371,6 +1371,17 @@ EOF
continue
;;
@ -19,19 +19,29 @@ $OpenBSD: patch-ltmain_sh,v 1.2 2004/01/28 16:10:33 marcm Exp $
-module)
module=yes
continue
@@ -2000,6 +2011,9 @@ EOF
@@ -2024,6 +2035,19 @@ EOF
fi
continue
;;
+ -pthread)
+ case $linkmode in
+ lib)
+ deplibs="$deplib $deplibs"
+ newdependency_libs="$deplib $newdependency_libs"
+ ;;
+ prog)
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ ;;
+ esac
+ continue
+ ;;
%DEPLIBS%)
alldeplibs=yes
continue
@@ -5763,40 +5777,6 @@ relink_command=\"$relink_command\""
@@ -5827,40 +5851,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit 0
test "$show" = : && exit $EXIT_SUCCESS
- $echo "----------------------------------------------------------------------"
- $echo "Libraries have been installed in:"
@ -67,6 +77,6 @@ $OpenBSD: patch-ltmain_sh,v 1.2 2004/01/28 16:10:33 marcm Exp $
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
exit 0
exit $EXIT_SUCCESS
;;

View File

@ -1,16 +1,18 @@
$OpenBSD: patch-src_cut-n-paste-code_goffice_graph_plugins_plot_xy_gog-xy_c,v 1.1 2004/01/28 16:10:33 marcm Exp $
--- src/cut-n-paste-code/goffice/graph/plugins/plot_xy/gog-xy.c.orig 2004-01-24 20:50:53.000000000 -0800
+++ src/cut-n-paste-code/goffice/graph/plugins/plot_xy/gog-xy.c 2004-01-24 20:51:19.000000000 -0800
@@ -358,10 +358,11 @@ static void
gog_bubble_plot_class_init (GogPlotClass *plot_klass)
$OpenBSD: patch-src_cut-n-paste-code_goffice_graph_plugins_plot_xy_gog-xy_c,v 1.2 2004/04/12 01:30:26 marcm Exp $
--- src/cut-n-paste-code/goffice/graph/plugins/plot_xy/gog-xy.c.orig 2004-04-11 11:28:57.000000000 -0700
+++ src/cut-n-paste-code/goffice/graph/plugins/plot_xy/gog-xy.c 2004-04-11 11:30:51.000000000 -0700
@@ -430,13 +430,12 @@ gog_bubble_plot_class_init (GogPlotClass
{
GObjectClass *gobject_klass = (GObjectClass *) plot_klass;
GogObjectClass *gog_klass = (GogObjectClass *) plot_klass;
+ Gog2DPlotClass *gog_2d_plot_klass;
+ Gog2DPlotClass *gog_2d_plot_klass = (Gog2DPlotClass*) plot_klass;
bubble_parent_klass = g_type_class_peek_parent (plot_klass);
gobject_klass->set_property = gog_bubble_plot_set_property;
gobject_klass->get_property = gog_bubble_plot_get_property;
- Gog2DPlotClass *gog_2d_plot_klass = (Gog2DPlotClass*) plot_klass;
+ gog_2d_plot_klass = (Gog2DPlotClass*) plot_klass;
-
gog_2d_plot_klass->adjust_bounds = gog_bubble_plot_adjust_bounds;
gog_klass->type_name = gog_bubble_plot_type_name;
gog_klass->editor = gog_bubble_plot_editor;

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2004/01/28 16:10:33 marcm Exp $
@comment $OpenBSD: PLIST,v 1.5 2004/04/12 01:30:26 marcm Exp $
bin/gnumeric
bin/ssconvert
lib/bonobo/servers/GNOME_Gnumeric.server
@ -85,6 +85,7 @@ lib/gnumeric/${VERSION}-bonobo/plugins/plot_pie/pie.la
lib/gnumeric/${VERSION}-bonobo/plugins/plot_pie/pie.so
lib/gnumeric/${VERSION}-bonobo/plugins/plot_pie/plot-types.xml
lib/gnumeric/${VERSION}-bonobo/plugins/plot_pie/plugin.xml
lib/gnumeric/${VERSION}-bonobo/plugins/plot_xy/gog-bubble-prefs.glade
lib/gnumeric/${VERSION}-bonobo/plugins/plot_xy/plot-types.xml
lib/gnumeric/${VERSION}-bonobo/plugins/plot_xy/plugin.xml
lib/gnumeric/${VERSION}-bonobo/plugins/plot_xy/xy.la
@ -701,8 +702,6 @@ share/schemas/gnumeric/gnumeric-plugins.schemas
@dirrm share/omf/gnumeric
@dirrm share/mc/templates
@dirrm share/mc
@dirrm share/locale/en_CA/LC_MESSAGES
@dirrm share/locale/en_CA
@dirrm share/gnumeric/${VERSION}-bonobo/templates
@dirrm share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures
@dirrm share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C