[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] /srv/bzr/gsrc/trunk r1626: fix oleo build
|
From: |
Brandon Invergo |
|
Subject: |
[Gsrc-commit] /srv/bzr/gsrc/trunk r1626: fix oleo build |
|
Date: |
Sun, 20 Jan 2013 15:33:58 +0100 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 1626
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2013-01-20 15:33:58 +0100
message:
fix oleo build
added:
gnu/oleo/files/
gnu/oleo/files/oleo-1.99.16-debian-patches.diff
modified:
TODO
gnu/oleo/Makefile
gnu/oleo/config.mk
gnu/oleo/sha256sums
=== modified file 'TODO'
--- a/TODO 2013-01-17 22:47:14 +0000
+++ b/TODO 2013-01-20 14:33:58 +0000
@@ -71,7 +71,7 @@
**** TODO gar.master.mk
*** TODO clean out unnecessary sites from gar.master.mk
*** TODO (maybe) clean out unnecessary rules from gar.lib.mk
-* GNU packages [375/453] [82%]
+* GNU packages [376/453] [83%]
** IGNORE 3dkit
*** decommissioned
** DONE 3dldf
@@ -784,8 +784,8 @@
CLOSED: [2012-12-16 Sun 20:12]
** DONE octave
CLOSED: [2012-12-16 Sun 20:12]
-** BROKEN oleo
-*** hangs during configure
+** DONE oleo
+ CLOSED: [2013-01-20 Sun 15:33]
** BROKEN orgodoc
*** Eiffel hell
** DONE osip
=== modified file 'gnu/oleo/Makefile'
--- a/gnu/oleo/Makefile 2012-12-17 18:49:55 +0000
+++ b/gnu/oleo/Makefile 2013-01-20 14:33:58 +0000
@@ -10,9 +10,11 @@
MASTER_SUBDIR = $(GARNAME)/
DISTFILES = $(DISTNAME).tar.gz
SIGFILES =
+PATCHFILES = $(DISTNAME)-debian-patches.diff
+
BUILDDEPS =
-LIBDEPS =
+LIBDEPS = ncurses gettext libc
######################################################################
=== modified file 'gnu/oleo/config.mk'
--- a/gnu/oleo/config.mk 2012-11-18 13:38:24 +0000
+++ b/gnu/oleo/config.mk 2013-01-20 14:33:58 +0000
@@ -1,4 +1,4 @@
## Configuration options for oleo ##
-CONFIGURE_OPTS ?= --with-x --without-motif
+CONFIGURE_OPTS ?= --without-x --without-motif --without-xbae
BUILD_OPTS ?=
=== added directory 'gnu/oleo/files'
=== added file 'gnu/oleo/files/oleo-1.99.16-debian-patches.diff'
--- a/gnu/oleo/files/oleo-1.99.16-debian-patches.diff 1970-01-01 00:00:00
+0000
+++ b/gnu/oleo/files/oleo-1.99.16-debian-patches.diff 2013-01-20 14:33:58
+0000
@@ -0,0 +1,927 @@
+--- work/oleo-1.99.16/configure
++++ work/oleo-1.99.16/configure
+@@ -6445,7 +6445,7 @@
+ mktime_test ((time_t) 60 * 60);
+ mktime_test ((time_t) 60 * 60 * 24);
+
+- for (j = 1; 0 < j; j *= 2)
++ for (j = 1; 0 < j; j <<= 1)
+ bigtime_test (j);
+ bigtime_test (j - 1);
+ }
+--- work/oleo-1.99.16/doc/oleo.info-1
++++ work/oleo-1.99.16/doc/oleo.info-1
+@@ -1,4 +1,4 @@
+-This is oleo.info, produced by makeinfo version 4.0 from oleo.texi.
++This is oleo.info, produced by makeinfo version 4.3 from oleo.texi.
+
+ This file documents Oleo, the GNU spreadsheet.
+
+@@ -98,7 +98,7 @@
+ * Getting Help:: Getting help
+ * Saving and reading:: Saving and reading Spreadsheets
+ * Command Line Options:: Command Line Options
+-* .oleorc file:: The initialization file
++* ~/.oleorc file:: The initialization file
+ * Expressions:: Types of expressions
+
+ ---------- Footnotes ----------
+@@ -275,7 +275,7 @@
+
+ M-x set-option <RET> input -1
+
+- This can be made the default. (*note .oleorc file::)
++ This can be made the default. (*note ~/.oleorc file::)
+
+
+ File: oleo.info, Node: Status Line, Next: Work Area, Prev: Minibuffer,
Up: The Screen
+@@ -714,7 +714,7 @@
+ (2) what is the default
+
+
+-File: oleo.info, Node: Command Line Options, Next: .oleorc file, Prev:
Saving and reading, Up: Basics
++File: oleo.info, Node: Command Line Options, Next: ~/.oleorc file, Prev:
Saving and reading, Up: Basics
+
+ Command Line Options
+ ====================
+@@ -767,7 +767,7 @@
+ (1) But what does this really do?
+
+
+-File: oleo.info, Node: .oleorc file, Next: Expressions, Prev: Command Line
Options, Up: Basics
++File: oleo.info, Node: ~/.oleorc file, Next: Expressions, Prev: Command
Line Options, Up: Basics
+
+ The `.oleorc' file
+ ==================
+@@ -786,7 +786,7 @@
+ (1) what else can go here? can I set the default font here?
+
+
+-File: oleo.info, Node: Expressions, Prev: .oleorc file, Up: Basics
++File: oleo.info, Node: Expressions, Prev: ~/.oleorc file, Up: Basics
+
+ Expressions
+ ===========
+--- work/oleo-1.99.16/doc/oleo.info-2
++++ work/oleo-1.99.16/doc/oleo.info-2
+@@ -1,4 +1,4 @@
+-This is oleo.info, produced by makeinfo version 4.0 from oleo.texi.
++This is oleo.info, produced by makeinfo version 4.3 from oleo.texi.
+
+ This file documents Oleo, the GNU spreadsheet.
+
+--- work/oleo-1.99.16/doc/oleo.info-3
++++ work/oleo-1.99.16/doc/oleo.info-3
+@@ -1,4 +1,4 @@
+-This is oleo.info, produced by makeinfo version 4.0 from oleo.texi.
++This is oleo.info, produced by makeinfo version 4.3 from oleo.texi.
+
+ This file documents Oleo, the GNU spreadsheet.
+
+--- work/oleo-1.99.16/doc/oleo.info-4
++++ work/oleo-1.99.16/doc/oleo.info-4
+@@ -1,4 +1,4 @@
+-This is oleo.info, produced by makeinfo version 4.0 from oleo.texi.
++This is oleo.info, produced by makeinfo version 4.3 from oleo.texi.
+
+ This file documents Oleo, the GNU spreadsheet.
+
+@@ -28,7 +28,7 @@
+
+ * Menu:
+
+-* .oleorc: .oleorc file.
++* .oleorc: ~/.oleorc file.
+ * a0 mode: a0 mode.
+ * Absolute references: Cell referencing.
+ * Addressing cells: Cell referencing.
+--- work/oleo-1.99.16/doc/expressions.texi
++++ work/oleo-1.99.16/doc/expressions.texi
+@@ -1,4 +1,4 @@
address@hidden Expressions, , .oleorc file, Basics
address@hidden Expressions, , ~/.oleorc file, Basics
+ @section Expressions
+ @cindex Expressions
+
+--- work/oleo-1.99.16/doc/oleo.info
++++ work/oleo-1.99.16/doc/oleo.info
+@@ -1,4 +1,4 @@
+-This is oleo.info, produced by makeinfo version 4.0 from oleo.texi.
++This is oleo.info, produced by makeinfo version 4.3 from oleo.texi.
+
+ This file documents Oleo, the GNU spreadsheet.
+
+@@ -23,9 +23,9 @@
+
+ Indirect:
+ oleo.info-1: 888
+-oleo.info-2: 50331
+-oleo.info-3: 99293
+-oleo.info-4: 148190
++oleo.info-2: 50339
++oleo.info-3: 99301
++oleo.info-4: 148198
+
+ Tag Table:
+ (Indirect)
+@@ -39,142 +39,142 @@
+ Node: Comparison8414
+ Node: The Screen8882
+ Node: Minibuffer9268
+-Node: Status Line9727
+-Ref: Status Line-Footnote-110778
+-Node: Work Area10958
+-Node: Cursor and Mark11553
+-Node: Recalculation12630
+-Node: Movement13557
+-Node: Single Cell Movement14000
+-Node: Scanning14680
+-Ref: Scanning-Footnote-115646
+-Node: Large Scale Movement15773
+-Ref: Large Scale Movement-Footnote-116907
+-Ref: Large Scale Movement-Footnote-217007
+-Node: Movement examples17023
+-Node: Screen Moving18543
+-Node: Mouse19287
+-Ref: Mouse-Footnote-119901
+-Node: Regions and Variables19976
+-Node: Getting Help20973
+-Node: Saving and reading22872
+-Ref: Saving and reading-Footnote-124051
+-Ref: Saving and reading-Footnote-224090
+-Node: Command Line Options24118
+-Ref: Command Line Options-Footnote-125114
+-Node: .oleorc file25152
+-Ref: .oleorc file-Footnote-125686
+-Node: Expressions25750
+-Node: Infix expressions26103
+-Node: Examples27761
+-Node: Error values28720
+-Node: How to enter data30483
+-Node: Oleo values30823
+-Node: Entering31759
+-Node: Input Editing32314
+-Ref: Input Editing-Footnote-134612
+-Node: Cell Motion34657
+-Node: Making changes35834
+-Node: Copying36171
+-Node: Moving38610
+-Ref: Moving-Footnote-139966
+-Node: Deleting40025
+-Node: Insertion40858
+-Node: Style41439
+-Node: Alignment42228
+-Node: Formats for numbers42923
+-Ref: Formats for numbers-Footnote-147773
+-Ref: Formats for numbers-Footnote-247796
+-Ref: Formats for numbers-Footnote-347843
+-Node: Cell Height47916
+-Ref: Cell Height-Footnote-148657
+-Node: Width of Cells48692
+-Ref: Width of Cells-Footnote-149391
+-Node: Hidden Rows and Columns49406
+-Node: Protection50331
+-Node: Fonts (in X11)51310
+-Node: Multiple Windows52912
+-Node: Windows53519
+-Node: Split Window54233
+-Node: Other Window54973
+-Node: Change Window56041
+-Node: Options56765
+-Node: Appearance57228
+-Ref: Appearance-Footnote-158600
+-Node: Window Options58650
+-Node: Other Options60324
+-Ref: Other Options-Footnote-162446
+-Ref: Other Options-Footnote-262461
+-Ref: Other Options-Footnote-362493
+-Node: Printing and Plotting62530
+-Node: Writing Files62804
+-Ref: Writing Files-Footnote-167475
+-Node: Graphing67552
+-Node: Clearing Plots69144
+-Node: Data sets69574
+-Ref: Data sets-Footnote-171558
+-Node: The axes71590
+-Ref: The axes-Footnote-172365
+-Ref: The axes-Footnote-272379
+-Node: Viewing Choices72396
+-Node: Output Type73225
+-Node: Style Options74270
+-Ref: Style Options-Footnote-174991
+-Node: Name Options75044
+-Ref: Name Options-Footnote-175640
+-Node: Macros75674
+-Node: Keyboard Macros75849
+-Ref: Keyboard Macros-Footnote-177584
+-Node: Basic Kbd Macro77616
+-Ref: Basic Kbd Macro-Footnote-179083
+-Ref: Basic Kbd Macro-Footnote-279111
+-Node: Save Kbd Macro79136
+-Ref: Save Kbd Macro-Footnote-179632
+-Node: Programs79658
+-Node: One Line Programs79996
+-Node: Long One Liners80940
+-Node: Writing programs81299
+-Ref: Writing programs-Footnote-183026
+-Node: Commands in Programs83082
+-Node: Keymaps83404
+-Node: Functions87048
+-Node: Boolean functions87869
+-Node: Math functions88900
+-Node: General math functions89270
+-Ref: General math functions-Footnote-191230
+-Node: Trigonometric functions91275
+-Node: Statistical functions92329
+-Node: String functions95420
+-Ref: String functions-Footnote-197475
+-Ref: String functions-Footnote-297551
+-Node: Structural functions97679
+-Node: Search functions99293
+-Ref: Search functions-Footnote-1101667
+-Node: Business functions101834
+-Node: Date functions106123
+-Node: Gsl functions112039
+-Node: Extending Oleo113571
+-Node: New at functions113783
+-Node: Reporting Bugs118229
+-Node: Motif119592
+-Node: Motif Introduction119983
+-Node: LessTif120361
+-Node: Advantages120995
+-Node: What you need121358
+-Node: Alternatives122116
+-Node: Using the mouse122422
+-Node: Using the keyboard shortcuts123448
+-Node: Using Help124264
+-Node: Fallback124391
+-Node: Motif Buttons in a Spreadsheet Cell124900
+-Node: Database Access125498
+-Node: Database Access Introduction125669
+-Node: MySQL126294
+-Node: Xbase126565
+-Node: Key Index126647
+-Node: Command Index131982
+-Node: Function Index138818
+-Node: Options Index145616
+-Node: Concept Index148190
++Node: Status Line9729
++Ref: Status Line-Footnote-110780
++Node: Work Area10960
++Node: Cursor and Mark11555
++Node: Recalculation12632
++Node: Movement13559
++Node: Single Cell Movement14002
++Node: Scanning14682
++Ref: Scanning-Footnote-115648
++Node: Large Scale Movement15775
++Ref: Large Scale Movement-Footnote-116909
++Ref: Large Scale Movement-Footnote-217009
++Node: Movement examples17025
++Node: Screen Moving18545
++Node: Mouse19289
++Ref: Mouse-Footnote-119903
++Node: Regions and Variables19978
++Node: Getting Help20975
++Node: Saving and reading22874
++Ref: Saving and reading-Footnote-124053
++Ref: Saving and reading-Footnote-224092
++Node: Command Line Options24120
++Ref: Command Line Options-Footnote-125118
++Node: ~/.oleorc file25156
++Ref: ~/.oleorc file-Footnote-125692
++Node: Expressions25756
++Node: Infix expressions26111
++Node: Examples27769
++Node: Error values28728
++Node: How to enter data30491
++Node: Oleo values30831
++Node: Entering31767
++Node: Input Editing32322
++Ref: Input Editing-Footnote-134620
++Node: Cell Motion34665
++Node: Making changes35842
++Node: Copying36179
++Node: Moving38618
++Ref: Moving-Footnote-139974
++Node: Deleting40033
++Node: Insertion40866
++Node: Style41447
++Node: Alignment42236
++Node: Formats for numbers42931
++Ref: Formats for numbers-Footnote-147781
++Ref: Formats for numbers-Footnote-247804
++Ref: Formats for numbers-Footnote-347851
++Node: Cell Height47924
++Ref: Cell Height-Footnote-148665
++Node: Width of Cells48700
++Ref: Width of Cells-Footnote-149399
++Node: Hidden Rows and Columns49414
++Node: Protection50339
++Node: Fonts (in X11)51318
++Node: Multiple Windows52920
++Node: Windows53527
++Node: Split Window54241
++Node: Other Window54981
++Node: Change Window56049
++Node: Options56773
++Node: Appearance57236
++Ref: Appearance-Footnote-158608
++Node: Window Options58658
++Node: Other Options60332
++Ref: Other Options-Footnote-162454
++Ref: Other Options-Footnote-262469
++Ref: Other Options-Footnote-362501
++Node: Printing and Plotting62538
++Node: Writing Files62812
++Ref: Writing Files-Footnote-167483
++Node: Graphing67560
++Node: Clearing Plots69152
++Node: Data sets69582
++Ref: Data sets-Footnote-171566
++Node: The axes71598
++Ref: The axes-Footnote-172373
++Ref: The axes-Footnote-272387
++Node: Viewing Choices72404
++Node: Output Type73233
++Node: Style Options74278
++Ref: Style Options-Footnote-174999
++Node: Name Options75052
++Ref: Name Options-Footnote-175648
++Node: Macros75682
++Node: Keyboard Macros75857
++Ref: Keyboard Macros-Footnote-177592
++Node: Basic Kbd Macro77624
++Ref: Basic Kbd Macro-Footnote-179091
++Ref: Basic Kbd Macro-Footnote-279119
++Node: Save Kbd Macro79144
++Ref: Save Kbd Macro-Footnote-179640
++Node: Programs79666
++Node: One Line Programs80004
++Node: Long One Liners80948
++Node: Writing programs81307
++Ref: Writing programs-Footnote-183034
++Node: Commands in Programs83090
++Node: Keymaps83412
++Node: Functions87056
++Node: Boolean functions87877
++Node: Math functions88908
++Node: General math functions89278
++Ref: General math functions-Footnote-191238
++Node: Trigonometric functions91283
++Node: Statistical functions92337
++Node: String functions95428
++Ref: String functions-Footnote-197483
++Ref: String functions-Footnote-297559
++Node: Structural functions97687
++Node: Search functions99301
++Ref: Search functions-Footnote-1101675
++Node: Business functions101842
++Node: Date functions106131
++Node: Gsl functions112047
++Node: Extending Oleo113579
++Node: New at functions113791
++Node: Reporting Bugs118237
++Node: Motif119600
++Node: Motif Introduction119991
++Node: LessTif120369
++Node: Advantages121003
++Node: What you need121366
++Node: Alternatives122124
++Node: Using the mouse122430
++Node: Using the keyboard shortcuts123456
++Node: Using Help124272
++Node: Fallback124399
++Node: Motif Buttons in a Spreadsheet Cell124908
++Node: Database Access125506
++Node: Database Access Introduction125677
++Node: MySQL126302
++Node: Xbase126573
++Node: Key Index126655
++Node: Command Index131990
++Node: Function Index138826
++Node: Options Index145624
++Node: Concept Index148198
+
+ End Tag Table
+--- work/oleo-1.99.16/doc/basics.texi
++++ work/oleo-1.99.16/doc/basics.texi
+@@ -46,7 +46,7 @@
+ * Getting Help:: Getting help
+ * Saving and reading:: Saving and reading Spreadsheets
+ * Command Line Options:: Command Line Options
+-* .oleorc file:: The initialization file
++* ~/.oleorc file:: The initialization file
+ * Expressions:: Types of expressions
+ @end menu
+
+@@ -109,7 +109,7 @@
+ M-x set-option @key{RET} input -1
+ @end example
+
+-This can be made the default. (@pxref{.oleorc file})
++This can be made the default. (@pxref{~/.oleorc file})
+
+ @node Status Line , Work Area, Minibuffer, The Screen
+ @unnumberedsubsec The status line
+@@ -638,7 +638,7 @@
+
+
+
address@hidden Command Line Options, .oleorc file, Saving and reading, Basics
address@hidden Command Line Options, ~/.oleorc file, Saving and reading, Basics
+ @section Command Line Options
+ @comment node-name, next, previous, up
+ @cindex Command Line Options
+@@ -683,8 +683,8 @@
+ @end table
+
+
address@hidden .oleorc file, Expressions, Command Line Options, Basics
address@hidden The @file{.oleorc} file
address@hidden ~/.oleorc file, Expressions, Command Line Options, Basics
address@hidden The @file{~/.oleorc} file
+ @cindex .oleorc
+ @comment node-name, next, previous, up
+
+--- work/oleo-1.99.16/Xresources/Makefile.am
++++ work/oleo-1.99.16/Xresources/Makefile.am
+@@ -17,9 +17,9 @@
+ endir = $(xdefaultsdir)
+
+ install-data-hook:
+- $(mkinstalldirs) $(nldir) $(frdir) $(endir)
+- $(INSTALL_DATA) $(srcdir)/Oleo.nl $(nldir)/Oleo
+- $(INSTALL_DATA) $(srcdir)/Oleo.fr $(frdir)/Oleo
+- $(INSTALL_DATA) $(srcdir)/Oleo.en $(endir)/Oleo
++ $(mkinstalldirs) $(DESTDIR)$(nldir) $(DESTDIR)$(frdir)
$(DESTDIR)$(endir)
++ $(INSTALL_DATA) $(srcdir)/Oleo.nl $(DESTDIR)$(nldir)/Oleo
++ $(INSTALL_DATA) $(srcdir)/Oleo.fr $(DESTDIR)$(frdir)/Oleo
++ $(INSTALL_DATA) $(srcdir)/Oleo.en $(DESTDIR)$(endir)/Oleo
+
+ MAINTAINERCLEANFILES = Makefile.in
+--- work/oleo-1.99.16/Xresources/Makefile.in
++++ work/oleo-1.99.16/Xresources/Makefile.in
+@@ -235,10 +235,10 @@
+
+
+ install-data-hook:
+- $(mkinstalldirs) $(nldir) $(frdir) $(endir)
+- $(INSTALL_DATA) $(srcdir)/Oleo.nl $(nldir)/Oleo
+- $(INSTALL_DATA) $(srcdir)/Oleo.fr $(frdir)/Oleo
+- $(INSTALL_DATA) $(srcdir)/Oleo.en $(endir)/Oleo
++ $(mkinstalldirs) $(DESTDIR)$(nldir) $(DESTDIR)$(frdir)
$(DESTDIR)$(endir)
++ $(INSTALL_DATA) $(srcdir)/Oleo.nl $(DESTDIR)$(nldir)/Oleo
++ $(INSTALL_DATA) $(srcdir)/Oleo.fr $(DESTDIR)$(frdir)/Oleo
++ $(INSTALL_DATA) $(srcdir)/Oleo.en $(DESTDIR)$(endir)/Oleo
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- work/oleo-1.99.16/src/plotter.c
++++ work/oleo-1.99.16/src/plotter.c
+@@ -2639,8 +2639,6 @@
+ case SP_PLOT_PIE:
+ sp_pie_plot_point(mg, point);
+ break;
+- default:
+- /* ?? */
+ }
+ }
+
+@@ -2770,8 +2768,6 @@
+ case SP_PLOT_PIE:
+ sp_pie_begin_graph(mg, scale, trans_x, trans_y);
+ break;
+- default:
+- /* ??? */
+ }
+
+ sp_first_dataset(mg);
+@@ -2790,8 +2786,6 @@
+ case SP_PLOT_PIE:
+ sp_pie_end_graph(mg);
+ break;
+- default:
+- /* ??? */
+ }
+ }
+
+--- work/oleo-1.99.16/src/global.h
++++ work/oleo-1.99.16/src/global.h
+@@ -208,7 +208,7 @@
+ extern char nname[];
+
+ extern VOIDSTAR parse_hash;
+-extern double __plinf, __neinf, __nan;
++extern double __plinf, __neinf, oleo__nan;
+
+ /* These have two uses. During parsing, these contain the
+ * base address of all relative references. During evaluation,
+@@ -231,7 +231,7 @@
+
+ extern unsigned short current_cycle;
+ extern int ioerror;
+-extern int errno;
++#include <errno.h>
+ extern const char oleo_version_string[];
+
+ extern double astof (char **);
+--- work/oleo-1.99.16/src/ref.c
++++ work/oleo-1.99.16/src/ref.c
+@@ -263,7 +263,7 @@
+ read_new_value (CELLREF row, CELLREF col, char *form, char *val)
+ {
+ unsigned char *new_bytes;
+- extern double __plinf, __neinf, __nan;
++ extern double __plinf, __neinf, oleo__nan;
+
+ cur_row = row;
+ cur_col = col;
+@@ -348,7 +348,7 @@
+ else if (!stricmp (nname, val))
+ {
+ SET_TYP (my_cell, TYP_FLT);
+- my_cell->cell_flt = __nan;
++ my_cell->cell_flt = oleo__nan;
+ }
+ else
+ {
+--- work/oleo-1.99.16/src/eval.c
++++ work/oleo-1.99.16/src/eval.c
+@@ -565,7 +565,7 @@
+ case CONST_NINF:
+ case CONST_NAN:
+ p->type = TYP_FLT;
+- p->Float = (byte == CONST_INF) ? __plinf : ((byte == CONST_NINF) ?
__neinf : __nan);
++ p->Float = (byte == CONST_INF) ? __plinf : ((byte == CONST_NINF) ?
__neinf : oleo__nan);
+ break;
+
+ case VAR:
+--- work/oleo-1.99.16/src/posixtm.y
++++ work/oleo-1.99.16/src/posixtm.y
+@@ -85,6 +85,7 @@
+ YYABORT;
+ }
+ }
++ ;
+
+ year : digitpair {
+ t.tm_year = $1;
+--- work/oleo-1.99.16/src/io-term.h
++++ work/oleo-1.99.16/src/io-term.h
+@@ -44,8 +44,6 @@
+ extern int default_lock;
+
+
+-extern struct cmd_func cmd_funcs[];
+-
+ /* When printing ascii output, this controls page width. */
+ extern int modified;
+
+--- work/oleo-1.99.16/src/sysdef.h
++++ work/oleo-1.99.16/src/sysdef.h
+@@ -119,8 +119,6 @@
+
+ #endif /* !defined(__STDC__) */
+
+-extern char *getenv ();
+-
+ #ifndef RETSIGTYPE
+ #define RETSIGTYPE void
+ #endif /* RETSIGTYPE */
+--- work/oleo-1.99.16/src/basic.h
++++ work/oleo-1.99.16/src/basic.h
+@@ -36,9 +36,6 @@
+
+ extern const int colmagic[9];
+ extern const int rowmagic[9];
+-extern char * motion_name[9];
+-extern enum motion_magic complementary_motion[9];
+-extern enum motion_magic opposite_motion[9];
+
+ extern int run_load_hooks;
+
+--- work/oleo-1.99.16/src/io-utils.c
++++ work/oleo-1.99.16/src/io-utils.c
+@@ -71,7 +71,7 @@
+
+ double __plinf;
+ double __neinf;
+-double __nan;
++double oleo__nan;
+
+ char nname[] = "#NOT_A_NUMBER";
+ char iname[] = "#INFINITY";
+@@ -125,7 +125,7 @@
+ __neinf = divide (-1., 0.);
+ (void) signal (SIGFPE, ignore_sig);
+ #endif
+- __nan = __plinf + __neinf;
++ oleo__nan = __plinf + __neinf;
+ }
+
+
+--- work/oleo-1.99.16/src/io-term.c
++++ work/oleo-1.99.16/src/io-term.c
+@@ -234,7 +234,7 @@
+
+ if (Preferences[i].copynext) {
+ ptr += strlen(Preferences[i].name) + 1;
+- ((char *)Preferences[i].var) = strdup(ptr);
++ Preferences[i].var = strdup(ptr);
+ } else if (Preferences[i].var)
+ *((int *)Preferences[i].var) = Preferences[i].value;
+
+@@ -770,6 +770,8 @@
+ }
+ }
+
++extern struct cmd_func cmd_funcs[];
++
+ static void
+ init_maps (void)
+ {
+@@ -1023,7 +1025,7 @@
+ case 'v':
+ case 'V':
+ printf(_("%s %s\n"), GNU_PACKAGE, VERSION);
+- printf(_("Copyright ? 1992-2000 Free Software Foundation,
Inc.\n"));
++ printf(_("Copyright (C) 1992-2000 Free Software Foundation,
Inc.\n"));
+ printf(_("%s comes with ABSOLUTELY NO WARRANTY.\n"), GNU_PACKAGE);
+ printf(_("You may redistribute copies of %s\n"), PACKAGE);
+ printf(_("under the terms of the GNU General Public License.\n"));
+--- work/oleo-1.99.16/po/oleo.pot
++++ work/oleo-1.99.16/po/oleo.pot
+@@ -1,32 +1,35 @@
+ # SOME DESCRIPTIVE TITLE.
+-# Copyright (C) YEAR Free Software Foundation, Inc.
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the PACKAGE package.
+ # FIRST AUTHOR <address@hidden>, YEAR.
+ #
+ #, fuzzy
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+-"POT-Creation-Date: 2001-03-10 15:32+0100\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2005-09-04 15:52+0200\n"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <address@hidden>\n"
+ "Language-Team: LANGUAGE <address@hidden>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=CHARSET\n"
+-"Content-Transfer-Encoding: ENCODING\n"
++"Content-Transfer-Encoding: 8bit\n"
+
+-#: src/io-term.c:815
++#: src/io-term.c:817
+ #, c-format
+ msgid ""
+ "This is %s %s\n"
+ "\n"
+ msgstr ""
+
+-#: src/io-term.c:817
++#: src/io-term.c:819
+ #, c-format
+ msgid "Usage: %s [OPTION]... [FILE]...\n"
+ msgstr ""
+
+-#: src/io-term.c:820
++#: src/io-term.c:822
++#, c-format
+ msgid ""
+ "\n"
+ " -h, --help display this help and exit\n"
+@@ -43,56 +46,74 @@
+ "Report bugs to <address@hidden>.\n"
+ msgstr ""
+
+-#: src/io-term.c:1025
++#: src/io-term.c:1027
+ #, c-format
+ msgid "%s %s\n"
+ msgstr ""
+
+-#: src/io-term.c:1026
+-msgid "Copyright ? 1992-2000 Free Software Foundation, Inc.\n"
++#: src/io-term.c:1028
++#, c-format
++msgid "Copyright (C) 1992-2000 Free Software Foundation, Inc.\n"
+ msgstr ""
+
+-#: src/io-term.c:1027
++#: src/io-term.c:1029
+ #, c-format
+ msgid "%s comes with ABSOLUTELY NO WARRANTY.\n"
+ msgstr ""
+
+-#: src/io-term.c:1028
++#: src/io-term.c:1030
+ #, c-format
+ msgid "You may redistribute copies of %s\n"
+ msgstr ""
+
+-#: src/io-term.c:1029
++#: src/io-term.c:1031
++#, c-format
+ msgid "under the terms of the GNU General Public License.\n"
+ msgstr ""
+
+-#: src/io-term.c:1030
++#: src/io-term.c:1032
++#, c-format
+ msgid "For more information about these matters, "
+ msgstr ""
+
+-#: src/io-term.c:1031
++#: src/io-term.c:1033
++#, c-format
+ msgid "see the files named COPYING.\n"
+ msgstr ""
+
+-#: src/io-term.c:1174
++#: src/io-term.c:1176
++#, c-format
+ msgid "Error in the builtin init scripts (a bug!).\n"
+ msgstr ""
+
+-#: src/io-term.c:1194 src/io-term.c:1196
++#: src/io-term.c:1196 src/io-term.c:1198
+ #, c-format
+ msgid " error occured in init file %s near line %d."
+ msgstr ""
+
+-#: src/io-term.c:1215 src/io-term.c:1216
++#: src/io-term.c:1217 src/io-term.c:1218
+ #, c-format
+ msgid ", error occured reading '%s'\n"
+ msgstr ""
+
+-#: src/io-term.c:1223 src/io-term.c:1224
++#: src/io-term.c:1225 src/io-term.c:1226
+ #, c-format
+ msgid "Can't open %s: %s\n"
+ msgstr ""
+
++#.
++#. * This is used in two places.
++#.
++#: src/io-motif.c:150
++msgid ""
++"\n"
++"GNU Oleo is free software, you are welcome to\n"
++"distribute copies of it. See the file COPYING for the\n"
++"conditions.\n"
++"\n"
++"GNU Oleo comes with ABSOLUTELY NO WARRANTY."
++msgstr ""
++
+ #: src/io-motif.c:722
+ msgid "Fit Print Area"
+ msgstr ""
+@@ -330,5 +351,6 @@
+ msgstr ""
+
+ #: src/io-motif.c:4791 src/io-motif.c:5906
++#, c-format
+ msgid "XmProcessTraversal failed\n"
+ msgstr ""
+--- work/oleo-1.99.16/po/cat-id-tbl.c
++++ work/oleo-1.99.16/po/cat-id-tbl.c
+@@ -27,7 +27,7 @@
+ \n\
+ Report bugs to <address@hidden>.\n", 4},
+ {"%s %s\n", 5},
+- {"Copyright ? 1992-2000 Free Software Foundation, Inc.\n", 6},
++ {"Copyright (C) 1992-2000 Free Software Foundation, Inc.\n", 6},
+ {"%s comes with ABSOLUTELY NO WARRANTY.\n", 7},
+ {"You may redistribute copies of %s\n", 8},
+ {"under the terms of the GNU General Public License.\n", 9},
+@@ -37,64 +37,71 @@
+ {" error occured in init file %s near line %d.", 13},
+ {", error occured reading '%s'\n", 14},
+ {"Can't open %s: %s\n", 15},
+- {"Fit Print Area", 16},
+- {"Conversion error: cannot convert '%s' to a %s\n", 17},
+- {"Cannot find XmNuserData\n", 18},
+- {"range", 19},
+- {"Plotter Type", 20},
+- {"*.oleo", 21},
+- {"X Axis Tick Label Type", 22},
+- {"Y Axis Tick Label Type", 23},
+- {"Internal error: can't find what to print to\n", 24},
+- {"*.out", 25},
+ {"\
+-Value of defaultPrintTo resource is invalid, should be one of %s, %s, or
%s\n", 26},
+- {"Select Printer", 27},
+- {"Paper Format", 28},
+- {"Printer Language", 29},
+- {"File Format", 30},
+- {"[Oleo: %s]", 31},
+- {"Read file '%s'\n", 32},
+- {"Choose a file to load", 33},
++\n\
++GNU Oleo is free software, you are welcome to\n\
++distribute copies of it. See the file COPYING for the\n\
++conditions.\n\
++\n\
++GNU Oleo comes with ABSOLUTELY NO WARRANTY.", 16},
++ {"Fit Print Area", 17},
++ {"Conversion error: cannot convert '%s' to a %s\n", 18},
++ {"Cannot find XmNuserData\n", 19},
++ {"range", 20},
++ {"Plotter Type", 21},
++ {"*.oleo", 22},
++ {"X Axis Tick Label Type", 23},
++ {"Y Axis Tick Label Type", 24},
++ {"Internal error: can't find what to print to\n", 25},
++ {"*.out", 26},
++ {"\
++Value of defaultPrintTo resource is invalid, should be one of %s, %s, or
%s\n", 27},
++ {"Select Printer", 28},
++ {"Paper Format", 29},
++ {"Printer Language", 30},
++ {"File Format", 31},
++ {"[Oleo: %s]", 32},
++ {"Read file '%s'\n", 33},
++ {"Choose a file to load", 34},
+ {"\
+ There are unsaved changes.\n\
+-Do you want to quit anyway ?", 34},
+- {"OleoOpenForWrite: can't move %s to %s", 35},
+- {"OleoOpenForWrite: couldn't open file '%s' for write", 36},
+- {"ReallySaveCB(%s): couldn't open file for writing", 37},
+- {"ReallySaveCB: file close failed", 38},
+- {"Saved file '%s'\n", 39},
+- {"ReallySaveCB: couldn't figure out file to save into", 40},
+- {"Choose a file to save in", 41},
++Do you want to quit anyway ?", 35},
++ {"OleoOpenForWrite: can't move %s to %s", 36},
++ {"OleoOpenForWrite: couldn't open file '%s' for write", 37},
++ {"ReallySaveCB(%s): couldn't open file for writing", 38},
++ {"ReallySaveCB: file close failed", 39},
++ {"Saved file '%s'\n", 40},
++ {"ReallySaveCB: couldn't figure out file to save into", 41},
++ {"Choose a file to save in", 42},
+ {"\
+ <html><body>Can't find the requested help file\n\
+-</body></html>", 42},
+- {"Help requested on '%s'", 43},
+- {"Help requested on using Oleo", 44},
+- {"OK", 45},
+- {"Cancel", 46},
+- {"Copy a region", 47},
+- {"Copy Values", 48},
+- {"Move", 49},
+- {"Formats :", 50},
+- {"Default", 51},
+- {"Hidden", 52},
+- {"Graph", 53},
+- {"General", 54},
+- {"Dollar", 55},
+- {"Comma", 56},
+- {"Percent", 57},
+- {"Integer", 58},
+- {"Decimal", 59},
+- {"Fixed", 60},
+- {"Exponent", 61},
+- {"Date", 62},
+- {"User-1", 63},
+- {"User-2", 64},
+- {"User-3", 65},
+- {"User-4", 66},
+- {"Date Format", 67},
+- {"XmProcessTraversal failed\n", 68},
++</body></html>", 43},
++ {"Help requested on '%s'", 44},
++ {"Help requested on using Oleo", 45},
++ {"OK", 46},
++ {"Cancel", 47},
++ {"Copy a region", 48},
++ {"Copy Values", 49},
++ {"Move", 50},
++ {"Formats :", 51},
++ {"Default", 52},
++ {"Hidden", 53},
++ {"Graph", 54},
++ {"General", 55},
++ {"Dollar", 56},
++ {"Comma", 57},
++ {"Percent", 58},
++ {"Integer", 59},
++ {"Decimal", 60},
++ {"Fixed", 61},
++ {"Exponent", 62},
++ {"Date", 63},
++ {"User-1", 64},
++ {"User-2", 65},
++ {"User-3", 66},
++ {"User-4", 67},
++ {"Date Format", 68},
++ {"XmProcessTraversal failed\n", 69},
+ };
+
+-int _msg_tbl_length = 68;
++int _msg_tbl_length = 69;
=== modified file 'gnu/oleo/sha256sums'
--- a/gnu/oleo/sha256sums 2012-11-18 13:38:24 +0000
+++ b/gnu/oleo/sha256sums 2013-01-20 14:33:58 +0000
@@ -1,2 +1,2 @@
6598df85d06ff2534ec08ed0657508f17dbbc58dd02d419160989de7c487bc86
download/oleo-1.99.16.tar.gz
-a09a2be73f86e8ffb7fbb54f40fe4994e29b67450adc5f7a5f896a9499141077
download/oleo-1.99.16-fix-autotools.diff
+413ea7ab0aa86256f60cc05f9bfef515af185605f73a23e29377221ab96b8718
download/oleo-1.99.16-debian-patches.diff
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] /srv/bzr/gsrc/trunk r1626: fix oleo build,
Brandon Invergo <=