diff options
| -rw-r--r-- | debian/patches/kfreebsd_support.patch | 22 | ||||
| -rw-r--r-- | debian/patches/not-usr-local.patch | 26 | ||||
| -rw-r--r-- | debian/patches/ppc64_short_int.patch | 6 | ||||
| -rw-r--r-- | debian/patches/scm-manpage-chapter.patch | 14 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/texinfo5_fixes.patch | 236 |
6 files changed, 35 insertions, 270 deletions
diff --git a/debian/patches/kfreebsd_support.patch b/debian/patches/kfreebsd_support.patch index 07166a0..370f3b4 100644 --- a/debian/patches/kfreebsd_support.patch +++ b/debian/patches/kfreebsd_support.patch @@ -1,5 +1,5 @@ ---- scm-5e5.orig/time.c -+++ scm-5e5/time.c +--- a/time.c ++++ b/time.c @@ -73,7 +73,7 @@ /* Define this if your system lacks times(). */ /* #define LACK_TIMES */ @@ -9,11 +9,9 @@ # include <sys/types.h> # include <sys/time.h> # include <sys/timeb.h> -only in patch2: -unchanged: ---- scm-5e5.orig/scmfig.h -+++ scm-5e5/scmfig.h -@@ -310,7 +310,7 @@ +--- a/scmfig.h ++++ b/scmfig.h +@@ -310,7 +310,7 @@ rgx.c init_rgx(); regcomp and regexec. * # define STDC_HEADERS #endif @@ -22,7 +20,7 @@ unchanged: # define HAVE_SELECT # define HAVE_SYS_TIME_H # define STDC_HEADERS -@@ -755,7 +755,7 @@ +@@ -765,7 +765,7 @@ typedef SCM *SCMPTR; # include <unistd.h> #endif @@ -31,11 +29,9 @@ unchanged: # include <unistd.h> #endif -only in patch2: -unchanged: ---- scm-5e5.orig/findexec.c -+++ scm-5e5/findexec.c -@@ -51,7 +51,7 @@ +--- a/findexec.c ++++ b/findexec.c +@@ -52,7 +52,7 @@ Wed Feb 21 23:06:35 1996 Aubrey Jaffer # include <sys/file.h> # include <sys/param.h> # endif diff --git a/debian/patches/not-usr-local.patch b/debian/patches/not-usr-local.patch index f669b5c..908d36e 100644 --- a/debian/patches/not-usr-local.patch +++ b/debian/patches/not-usr-local.patch @@ -1,11 +1,9 @@ Description: Reference Debian install locations Forwarded: not-needed Author: Bryan Newbold <bnewbold@robocracy.org> -Index: scm/scm.info -=================================================================== ---- scm.orig/scm.info -+++ scm/scm.info -@@ -2583,11 +2583,11 @@ file has (different) meanings to SCM and +--- a/scm.info ++++ b/scm.info +@@ -2721,11 +2721,11 @@ file has (different) meanings to SCM and This combination of interpretatons allows SCM source files to be used as POSIX shell-scripts if the first line is: @@ -19,11 +17,9 @@ Index: scm/scm.info - !# (define (fact.script args) -Index: scm/scm.texi -=================================================================== ---- scm.orig/scm.texi -+++ scm/scm.texi -@@ -2284,14 +2284,14 @@ This combination of interpretatons allow +--- a/scm.texi ++++ b/scm.texi +@@ -2368,14 +2368,14 @@ This combination of interpretatons allow POSIX shell-scripts if the first line is: @example @@ -40,13 +36,3 @@ Index: scm/scm.texi - !# (define (fact.script args) -Index: scm/xgen.scm -=================================================================== ---- scm.orig/xgen.scm -+++ scm/xgen.scm -@@ -1,4 +1,4 @@ --#! /usr/local/bin/scm \ %0 %* -+#! /usr/bin/scm \ %0 %* - - !# - ;;;; "xgen.scm", Convert C Event structs to xevent.h and xevent.scm. - ;; Copyright (C) 1991-2000 Free Software Foundation, Inc. diff --git a/debian/patches/ppc64_short_int.patch b/debian/patches/ppc64_short_int.patch index aca3ce2..1106d8a 100644 --- a/debian/patches/ppc64_short_int.patch +++ b/debian/patches/ppc64_short_int.patch @@ -3,7 +3,7 @@ Author: Fernando Seiti Furusato <ferseiti@br.ibm.com>, Andreas Jochens <aj@andac Forwarded: no --- a/scmfig.h +++ b/scmfig.h -@@ -264,6 +264,10 @@ +@@ -264,6 +264,10 @@ rgx.c init_rgx(); regcomp and regexec. * # define SHORT_INT # define CDR_DOUBLES #endif @@ -14,7 +14,7 @@ Forwarded: no #ifdef MSDOS /* Microsoft C 5.10 and 6.00A */ # ifndef GO32 # define SHORT_INT -@@ -393,14 +397,10 @@ +@@ -393,14 +397,10 @@ rgx.c init_rgx(); regcomp and regexec. * # define WHITE_SPACES ' ':case '\t':case '\r':case '\f' #endif @@ -30,4 +30,4 @@ Forwarded: no +# define PTR2INT(x) ((int)(x)) #endif - /* Define BIGDIG to an integer type whose size is smaller than long if + #ifndef __builtin_expect diff --git a/debian/patches/scm-manpage-chapter.patch b/debian/patches/scm-manpage-chapter.patch deleted file mode 100644 index d1f153b..0000000 --- a/debian/patches/scm-manpage-chapter.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Fixes manpage chapter formatting. Fixed upstream in later version. -Forwarded: not-needed -Author: Bryan Newbold <bnewbold@robocracy.org> -Index: scm/scm.1 -=================================================================== ---- scm.orig/scm.1 -+++ scm/scm.1 -@@ -1,5 +1,5 @@ - .\" dummy line --.TH SCM "April 2006" -+.TH SCM 1 "April 2006" - .UC 4 - .SH NAME - scm \- a Scheme Language Interpreter diff --git a/debian/patches/series b/debian/patches/series index cd31c27..cf3a15e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ not-usr-local.patch -scm-manpage-chapter.patch kfreebsd_support.patch texinfo5_fixes.patch ppc64_short_int.patch diff --git a/debian/patches/texinfo5_fixes.patch b/debian/patches/texinfo5_fixes.patch index d1237da..3a6bd77 100644 --- a/debian/patches/texinfo5_fixes.patch +++ b/debian/patches/texinfo5_fixes.patch @@ -1,8 +1,6 @@ -Index: scm/Xlibscm.texi -=================================================================== ---- scm.orig/Xlibscm.texi 2013-11-23 13:14:37.672671849 +0100 -+++ scm/Xlibscm.texi 2013-11-23 13:14:55.696761226 +0100 -@@ -257,8 +257,9 @@ +--- a/Xlibscm.texi ++++ b/Xlibscm.texi +@@ -257,8 +257,9 @@ used. Returns the root window for the specified @var{screen-number}. Use @code{x:root-window} for functions that need a drawable of a particular screen or for creating top-level windows. @@ -13,7 +11,7 @@ Index: scm/Xlibscm.texi Returns the root window for the specified @var{window}'s screen. @end defun -@@ -345,7 +346,9 @@ +@@ -345,7 +346,9 @@ Returns the number of entries in the def @defun x:screen-depth display screen-number Returns the depth of the root window of the specified screen. @@ -24,7 +22,7 @@ Index: scm/Xlibscm.texi @defunx x:screen-depth window @defunx x:screen-depth visual Returns the depth of argument. -@@ -420,8 +423,9 @@ +@@ -420,8 +423,9 @@ and the @var{visual} must be one support The returned window will have the attributes specified by @var{field-name}s and @var{value}. @@ -35,7 +33,7 @@ Index: scm/Xlibscm.texi The returned window inherits its depth, class, and visual from its parent. All other window attributes, except @var{background} and @var{border}, have their default values. -@@ -909,7 +913,9 @@ +@@ -909,7 +913,9 @@ those for @code{x:window-set!}: @defun x:get-window-property window property Returns the (string or list of numbers) value of @var{property} of @var{window}. @@ -46,7 +44,7 @@ Index: scm/Xlibscm.texi Removes and returns the (string or list of numbers) value of @var{property} of @var{window}. @end defun -@@ -1392,8 +1398,9 @@ +@@ -1392,8 +1398,9 @@ The hotspot comes from the information s initial colors of a cursor are a black foreground and a white background (see X:Recolor-Cursor). The names of all cursor shapes are defined with the prefix XC: in @file{x11.scm}. @@ -57,7 +55,7 @@ Index: scm/Xlibscm.texi Creates a cursor from the source and mask bitmaps obtained from the specified font glyphs. The integer @var{source-char} must be a defined glyph in @var{source-font}. The integer @var{mask-char} must be a -@@ -1402,12 +1409,14 @@ +@@ -1402,12 +1409,14 @@ and @var{mask-char} glyphs are positione hotspot. The @var{source-char} and @var{mask-char} need not have the same bounding box metrics, and there is no restriction on the placement of the hotspot relative to the bounding boxes. @@ -74,7 +72,7 @@ Index: scm/Xlibscm.texi @var{mask-pixmap} must be the same size as the pixmap defined by the @var{source-pixmap} argument. The foreground and background RGB values must be specified using @var{foreground-color} and -@@ -1422,8 +1431,9 @@ +@@ -1422,8 +1431,9 @@ source and mask must have depth one but @var{mask-pixmap} defines the shape of the cursor. The pixels set to 1 in @var{mask-pixmap} define which source pixels are displayed, and the pixels set to 0 define which pixels are ignored. @@ -85,7 +83,7 @@ Index: scm/Xlibscm.texi If @var{mask-pixmap} is #f, all pixels of the source are displayed. @end defun -@@ -1539,8 +1549,9 @@ +@@ -1539,8 +1549,9 @@ The RGB values of the allocated entries succeeded or #f if it failed. The first array has the pixels allocated and the second has the plane-masks. @@ -96,7 +94,7 @@ Index: scm/Xlibscm.texi @defunx x:alloc-colormap-cells colormap ncolors rgb contiguous? The specified @var{ncolors} must be positive; and @var{rgb} a list or -@@ -1596,8 +1607,9 @@ +@@ -1596,8 +1607,9 @@ is in error, the one that gets reported @var{rgb} is a list or vector of 3 integers, describing the red, green, and blue intensities respectively; or an integer @samp{#x@i{rrggbb}}, packing red, green and blue intensities in the range 0 - 255. @@ -107,7 +105,7 @@ Index: scm/Xlibscm.texi The case-insensitive string @var{color_name} specifies the name of a color (for example, @file{red}) -@@ -1630,8 +1642,9 @@ +@@ -1630,8 +1642,9 @@ The integer @var{pixel} must be a valid @var{rgb} is a list or vector of 3 integers, describing the red, green, and blue intensities respectively; or an integer @samp{#x@i{rrggbb}}, packing red, green and blue intensities in the range 0 - 255. @@ -118,7 +116,7 @@ Index: scm/Xlibscm.texi The case-insensitive string @var{color_name} specifies the name of a color (for example, @file{red}) -@@ -1671,8 +1684,9 @@ +@@ -1671,8 +1684,9 @@ Flushes the output buffer. Some client function because the output buffer is automatically flushed as needed by calls to X:Pending, X:Next-Event, and X:Window-Event. Events generated by the server may be enqueued into the library's event queue. @@ -129,7 +127,7 @@ Index: scm/Xlibscm.texi Forces sending of GC component changes. Xlib usually defers sending changes to the components of a GC to the -@@ -1726,12 +1740,14 @@ +@@ -1726,12 +1740,14 @@ results. @defun x:draw-points drawable gc position @dots{} @var{Position} @dots{} specifies coordinates of the point to be drawn. @@ -146,7 +144,7 @@ Index: scm/Xlibscm.texi @var{point-array} is a uniform short array of rank 2, whose rightmost index spans a range of 2. -@@ -1748,12 +1764,14 @@ +@@ -1748,12 +1764,14 @@ clip-mask. @defun x:draw-segments drawable gc pos1 pos2 @dots{} @var{Pos1}, @var{pos2}, @dots{} specify coordinates to be connected by segments. @@ -163,7 +161,7 @@ Index: scm/Xlibscm.texi @var{point-array} is a uniform short array of rank 2, whose rightmost index spans a range of 2. -@@ -1779,12 +1797,14 @@ +@@ -1779,12 +1797,14 @@ dash-offset, and dash-list. @defun x:draw-lines drawable gc pos1 pos2 @dots{} @var{Pos1}, @var{pos2}, @dots{} specify coordinates to be connected by lines. @@ -180,7 +178,7 @@ Index: scm/Xlibscm.texi @var{point-array} is a uniform short array of rank 2, whose rightmost index spans a range of 2. -@@ -1810,12 +1830,14 @@ +@@ -1810,12 +1830,14 @@ dash-offset, and dash-list. @defun x:fill-polygon drawable gc pos1 pos2 @dots{} @var{Pos1}, @var{pos2}, @dots{} specify coordinates of the border path. @@ -197,203 +195,3 @@ Index: scm/Xlibscm.texi @var{point-array} is a uniform short array of rank 2, whose rightmost index spans a range of 2. -Index: scm/scm.texi -=================================================================== ---- scm.orig/scm.texi 2013-11-23 13:14:37.684671909 +0100 -+++ scm/scm.texi 2013-11-23 13:14:55.708761285 +0100 -@@ -1644,11 +1644,11 @@ - @section Editing Scheme Code - - @defun ed arg1 @dots{} -+@defunx ed filename - The value of the environment variable @code{EDITOR} (or just @code{ed} - if it isn't defined) is invoked as a command with arguments @var{arg1} - @dots{}. - --@defunx ed filename - If SCM is compiled under VMS @code{ed} will invoke the editor with a - single the single argument @var{filename}. - @end defun -@@ -1733,16 +1733,18 @@ - loads the appropriate module from SLIB if they are invoked. - - @defmac trace proc1 @dots{} --Traces the top-level named procedures given as arguments. - @defmacx trace -+Traces the top-level named procedures given as arguments. -+ - With no arguments, makes sure that all the currently traced identifiers - are traced (even if those identifiers have been redefined) and returns a - list of the traced identifiers. - @end defmac - - @defmac untrace proc1 @dots{} --Turns tracing off for its arguments. - @defmacx untrace -+Turns tracing off for its arguments. -+ - With no arguments, untraces all currently traced identifiers and returns - a list of these formerly traced identifiers. - @end defmac -@@ -2206,8 +2208,9 @@ - Returns the path (string) which SCM uses to find the executable file - whose invocation the currently running session is, or #f if the path is - not set. -+@end defun - --@defunx execpath #f -+@defun execpath #f - @defunx execpath newpath - Sets the path to @code{#f} or @var{newpath}, respectively. The old path - is returned. -@@ -2521,10 +2524,10 @@ - @itemx @code{exact->inexact} - @itemx @code{inexact->exact} - @xref{Numerical operations, , , r5rs, Revised(5) Scheme}. --@itemx @code{with-input-from-file} -+@item @code{with-input-from-file} - @itemx @code{with-output-to-file} - @xref{Ports, , , r5rs, Revised(5) Scheme}. --@itemx @code{load} -+@item @code{load} - @itemx @code{transcript-on} - @itemx @code{transcript-off} - @xref{System interface, , , r5rs, Revised(5) Scheme}. -@@ -2930,8 +2933,9 @@ - Returns the current position of the character in @var{port} which will - next be read or written. If @var{port} is open to a non-file then - @code{#f} is returned. -+@end defun - --@defunx file-position port k -+@defun file-position port k - Sets the current position in @var{port} which will next be read or - written. If successful, @code{#f} is returned. If @var{port} is open - to a non-file, then @code{file-position} returns @code{#f}. -@@ -3321,8 +3325,9 @@ - @defun comment string1 @dots{} - Appends @var{string1} @dots{} to the strings given as arguments to - previous calls @code{comment}. -+@end defun - --@defunx comment -+@defun comment - Returns the (appended) strings given as arguments to previous calls - @code{comment} and empties the current string collection. - @end defun -@@ -3345,8 +3350,9 @@ - @code{#<unspecified>} in which case the expression will be treated as - whitespace. @code{#<unspecified>} is the value returned by the - expression @code{(if #f #f)}. -+@end deffn - --@deffnx {Callback procedure} load:sharp c port -+@deffn {Callback procedure} load:sharp c port - Dispatches like @code{read:sharp}, but only during @code{load}s. The - read-syntaxes handled by @code{load:sharp} are a superset of those - handled by @code{read:sharp}. @code{load:sharp} calls -@@ -4718,12 +4724,14 @@ - each file in @var{directory}. The dynamic order in which @var{proc} is - applied to the filenames is unspecified. The value returned by - @samp{directory-for-each} is unspecified. -+@end defun - --@defunx directory-for-each proc directory pred -+@defun directory-for-each proc directory pred - Applies @var{proc} only to those filenames for which the procedure - @var{pred} returns a non-false value. -+@end defun - --@defunx directory-for-each proc directory match -+@defun directory-for-each proc directory match - Applies @var{proc} only to those filenames for which - @code{(filename:match?? @var{match})} would return a non-false value - (@pxref{Filenames, , , slib, SLIB}). -@@ -4843,8 +4851,9 @@ - - If successful, this procedure does not return. Otherwise an error - message is printed and the integer @code{errno} is returned. -+@end defun - --@defunx execv command arglist -+@defun execv command arglist - @defunx execvp command arglist - Like @code{execl} and @code{execlp} except that the set of arguments to - @var{command} is @var{arglist}. -@@ -5123,8 +5132,9 @@ - - @defun setpwent #t - Rewinds the pw entry table back to the begining. -+@end defun - --@defunx setpwent #f -+@defun setpwent #f - @defunx setpwent - Closes the pw table. - @end defun -@@ -5151,8 +5161,9 @@ - - @defun setgrent #t - Rewinds the group entry table back to the begining. -+@end defun - --@defunx setgrent #f -+@defun setgrent #f - @defunx setgrent - Closes the group table. - @end defun -@@ -5435,8 +5446,9 @@ - - @defun line-editing - Returns the current edited line port or @code{#f}. -+@end defun - --@defunx line-editing bool -+@defun line-editing bool - If @var{bool} is false, exits line-editing mode and returns the previous - value of @code{(line-editing)}. If @var{bool} is true, sets the current - input and output ports to an edited line port and returns the previous -@@ -6434,8 +6446,9 @@ - @code{letrec}, @code{or}, @code{quote}, @code{set!}, @code{#f}, - @code{#t}, @code{#<undefined>}, @code{#<eof>}, @code{()}, and - @code{#<unspecified>}. -+@end deftp - --@deftpx {CAR Immediate} ispcsym -+@deftp {CAR Immediate} ispcsym - special symbols: syntax-checked versions of first 14 isyms - @end deftp - -@@ -6561,8 +6574,9 @@ - - @deftp Header tc7_ssymbol - static scheme symbol (part of initial system) -+@end deftp - --@deftpx Header tc7_msymbol -+@deftp Header tc7_msymbol - @code{malloc}ed scheme symbol (can be GCed) - - @defmac SYMBOLP x -@@ -7262,8 +7276,9 @@ - @code{deferred_proc} is set to non-zero, one of the global variables - @code{SIGINT_deferred} or @code{SIGALRM_deferred} is set to 1, and the - handler returns. -+@end defmac - --@defmacx ALLOW_INTS -+@defmac ALLOW_INTS - Checks the deferred variables and if set the appropriate handler is - called. - -@@ -8011,8 +8026,9 @@ - - @code{scm_addr} is useful for performing C operations on strings or - other uniform arrays (@pxref{Uniform Array}). -+@end deftypefun - --@deftypefunx unsigned long scm_base_addr(SCM @var{ra}, char *@var{s_name}) -+@deftypefun unsigned long scm_base_addr(SCM @var{ra}, char *@var{s_name}) - Returns a pointer (cast to an @code{unsigned long}) to the beginning - of storage of array @var{ra}. Note that if @var{ra} is a - shared-array, the strorage accessed this way may be much larger than |