[packages/scm] - updated to 5f3, slib 3b6 - removed obsolete texinfo,bigrecy patches
qboosh
qboosh at pld-linux.org
Fri Mar 27 21:43:58 CET 2020
commit dc517e98ebde183942280d2965d3bbc1764584b7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Mar 27 21:45:10 2020 +0100
- updated to 5f3, slib 3b6
- removed obsolete texinfo,bigrecy patches
scm-bigrecy.patch | 92 -------------------------
scm-texinfo.patch | 196 ------------------------------------------------------
scm.spec | 14 ++--
3 files changed, 5 insertions(+), 297 deletions(-)
---
diff --git a/scm.spec b/scm.spec
index c61bffc..2ed7d8a 100644
--- a/scm.spec
+++ b/scm.spec
@@ -1,20 +1,18 @@
-%define slib_ver 3b5
+%define slib_ver 3b6
Summary: Scheme implementation
Summary(pl.UTF-8): Implementacja Scheme
Name: scm
-Version: 5f2
-Release: 2
+Version: 5f3
+Release: 1
License: LGPL v3+
Group: Development/Languages/Scheme
Source0: http://groups.csail.mit.edu/mac/ftpdir/scm/%{name}-%{version}.zip
-# Source0-md5: ff83b43844b4fc2efeaa102d8eed8a4a
+# Source0-md5: 706f2da2585256ea0d78d502bef5a9e8
Source1: http://groups.csail.mit.edu/mac/ftpdir/scm/slib-%{slib_ver}.tar.gz
-# Source1-md5: e4a218f81a5c905a64c333a0bbc79347
+# Source1-md5: c895d74d769c5072c4c6d1b1700db83f
Patch0: %{name}-info.patch
Patch1: %{name}-install.patch
-Patch2: %{name}-texinfo.patch
Patch3: x32.patch
-Patch4: %{name}-bigrecy.patch
Patch5: %{name}-make.patch
URL: http://people.csail.mit.edu/jaffer/SCM
BuildRequires: sed >= 4.0
@@ -36,9 +34,7 @@ IEEE P1178.
%setup -q -c -a1
%patch0 -p0
%patch1 -p0
-%patch2 -p0
%patch3 -p0
-%patch4 -p0
%patch5 -p0
ln -s slib-%{slib_ver} slib
diff --git a/scm-bigrecy.patch b/scm-bigrecy.patch
deleted file mode 100644
index ac5c7a7..0000000
--- a/scm-bigrecy.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Fix (real or potential) bignum use-after-free issues.
-
---- scm/scl.c.orig 2016-07-27 18:26:05.090046558 +0200
-+++ scm/scl.c 2016-07-27 18:14:19.856721279 +0200
-@@ -166,33 +166,34 @@
- /* try first with starved precision */
- {
- num = scm_ash(mant, MAKINUM(e2 - point));
-- bigrecy(mant);
-+ if (num != mant) bigrecy(mant);
- quo = scm_round_quotient(num, VELTS(pows5)[(long) point]);
- if (pmantexp2dbl(quo, point) != f) {
-- bigrecy(quo); quo = num;
-+ if (quo != num) { bigrecy(quo); quo = num; }
- num = scm_ash(quo, MAKINUM(1L));
-- bigrecy(quo);
-+ if (num != quo) bigrecy(quo);
- quo = scm_round_quotient(num, VELTS(pows5)[(long) --point]);
- }
-+ if (num != quo) bigrecy(num);
- }
- } else { /* e2 <= 0 */
- /* try first with starved precision */
- {
- SCM den = scm_ash(MAKINUM(1L), MAKINUM(point - e2));
- num = product(mant, VELTS(pows5)[- (long) point]);
-- bigrecy(mant);
-+ if (num != mant) { bigrecy(mant); if (mant != MAKINUM(1)) mant = INUM0; }
- quo = scm_round_quotient(num, den);
- if (pmantexp2dbl(quo, point) != f) {
-- bigrecy(quo); quo = num;
-+ if (quo != num) { bigrecy(quo); quo = num; }
- point--;
- num = product(quo, MAKINUM(10));
- if (mant != MAKINUM(1)) bigrecy(quo);
- quo = scm_round_quotient(num, den);
-- }
-+ if (quo != num) bigrecy(num);
-+ } else if ((mant != MAKINUM(1)) && (quo != num)) bigrecy(num);
- bigrecy(den);
- }
- }
-- bigrecy(num);
- a[ch++] = '.';
- /* if (sizeof(UBIGLONG)>=sizeof(double)) /\* Is ulong larger than mantissa? *\/ */
- /* ch += iulong2str(num2ulong(quo, (char *)ARG1, s_number2string), 10, &a[ch]); */
-@@ -680,7 +682,7 @@
- ans = ldexp(ans, bex + point);
- }
- if (num != quo) bigrecy(quo);
-- if (bmant != MAKINUM(1L)) bigrecy(num);
-+ if ((num != bmant) && (bmant != MAKINUM(1L))) bigrecy(num);
- return ans;
- } else {
- int maxpow = LENGTH(pows5) - 1;
-@@ -696,7 +697,7 @@
- quo = scm_round_quotient(num, scm_ash(scl, MAKINUM(1L)));
- }
- if (-point > maxpow) bigrecy(scl);
-- bigrecy(num);
-+ if (num != quo) bigrecy(num);
- ans = ldexp(int2dbl(quo), bex + point);
- bigrecy(quo);
- return ans;
-@@ -2478,7 +2479,7 @@
- tmp = acc;
- acc = product(tmp, tz1);
- #ifdef BIGDIG
-- bigrecy(tmp);
-+ if (acc != tmp) bigrecy(tmp);
- #endif
- break;
- }
-@@ -2486,7 +2487,7 @@
- tmp = acc;
- acc = product(tmp, tz1);
- #ifdef BIGDIG
-- bigrecy(tmp);
-+ if (acc != tmp) bigrecy(tmp);
- #endif
- }
- tmp = tz1;
-@@ -2841,8 +2842,8 @@
- bex += j * BITSPERDIG;
- if (bex > 0) ans = ldexp(ans, bex);
- }
-+ if (quo != num) bigrecy(quo);
- if (num != b) bigrecy(num);
-- if (quo != b) bigrecy(quo);
- if (tc16_bigneg==TYP16(b)) return -ans;
- return ans;
- }
diff --git a/scm-texinfo.patch b/scm-texinfo.patch
deleted file mode 100644
index 621824b..0000000
--- a/scm-texinfo.patch
+++ /dev/null
@@ -1,196 +0,0 @@
---- scm/Xlibscm.texi.orig 2014-04-20 09:17:36.657789313 +0200
-+++ scm/Xlibscm.texi 2014-04-20 09:44:30.514422341 +0200
-@@ -257,8 +257,9 @@
- 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.
-+ at end defun
-
-- at defunx x:root-window window
-+ at defun x:root-window window
- Returns the root window for the specified @var{window}'s screen.
- @end defun
-
-@@ -345,7 +346,8 @@
-
- @defun x:screen-depth display screen-number
- Returns the depth of the root window of the specified screen.
-- at defunx x:screen-depth display
-+ at end defun
-+ at defun x:screen-depth display
- @defunx x:screen-depth window
- @defunx x:screen-depth visual
- Returns the depth of argument.
-@@ -420,8 +422,9 @@
-
- The returned window will have the attributes specified by
- @var{field-name}s and @var{value}.
-+ at end defun
-
-- at defunx x:create-window window position size border-width border background
-+ at defun x:create-window window position size border-width border background
- 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 +912,8 @@
- @defun x:get-window-property window property
- Returns the (string or list of numbers) value of @var{property} of
- @var{window}.
-- at defunx x:get-window-property window property #t
-+ at end defun
-+ at defun x:get-window-property window property #t
- Removes and returns the (string or list of numbers) value of
- @var{property} of @var{window}.
- @end defun
-@@ -1392,8 +1396,9 @@
- 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}.
-+ at end defun
-
-- at defunx x:create-cursor source-font source-char mask-font mask-char fgc bgc
-+ at defun x:create-cursor source-font source-char mask-font mask-char fgc bgc
- 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 +1407,14 @@
- 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.
-+ at end defun
-
-- at defunx x:create-cursor source-font source-char #f #f fgc bgc
-+ at defun x:create-cursor source-font source-char #f #f fgc bgc
- If @var{mask-font} and @var{mask-char} are #f, all pixels of the source
- are displayed.
-+ at end defun
-
-- at defunx x:create-cursor source-pixmap mask-pixmap fgc bgc origin
-+ at defun x:create-cursor source-pixmap mask-pixmap fgc bgc origin
- @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 +1429,9 @@
- @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.
-+ at end defun
-
-- at defunx x:create-cursor source-pixmap #f fgc bgc origin
-+ at defun x:create-cursor source-pixmap #f fgc bgc origin
- If @var{mask-pixmap} is #f, all pixels of the source are displayed.
- @end defun
-
-@@ -1538,9 +1546,9 @@
- @code{X:Alloc-Color-Cells} returns a list of two uniform arrays if it
- succeeded or #f if it failed. The first array has the pixels allocated
- and the second has the plane-masks.
-+ at end defun
-
--
-- at defunx x:alloc-colormap-cells colormap ncolors rgb
-+ at defun x:alloc-colormap-cells colormap ncolors rgb
- @defunx x:alloc-colormap-cells colormap ncolors rgb contiguous?
-
- The specified @var{ncolors} must be positive; and @var{rgb} a list or
-@@ -1596,8 +1604,9 @@
- @var{rgb} is a list or vector of 3 integers, describing the red, green,
- and blue intensities respectively; or an integer @samp{#x at i{rrggbb}},
- packing red, green and blue intensities in the range 0 - 255.
-+ at end defun
-
-- at defunx x:colormap-find-color colormap color-name
-+ at defun x:colormap-find-color colormap color-name
-
- The case-insensitive string @var{color_name} specifies the name of a
- color (for example, @file{red})
-@@ -1630,8 +1639,9 @@
- @var{rgb} is a list or vector of 3 integers, describing the red, green,
- and blue intensities respectively; or an integer @samp{#x at i{rrggbb}},
- packing red, green and blue intensities in the range 0 - 255.
-+ at end defun
-
-- at defunx X:Color-Set! colormap pixel color-name
-+ at defun X:Color-Set! colormap pixel color-name
-
- The case-insensitive string @var{color_name} specifies the name of a
- color (for example, @file{red})
-@@ -1671,8 +1681,9 @@
- 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.
-+ at end defun
-
-- at defunx x:flush gc
-+ at defun x:flush gc
- Forces sending of GC component changes.
-
- Xlib usually defers sending changes to the components of a GC to the
-@@ -1726,12 +1737,14 @@
-
- @defun x:draw-points drawable gc position @dots{}
- @var{Position} @dots{} specifies coordinates of the point to be drawn.
-+ at end defun
-
-- at defunx x:draw-points drawable gc x y @dots{}
-+ at defun x:draw-points drawable gc x y @dots{}
- (@var{x}, @var{y}) @dots{} specifies coordinates of the point to be
- drawn.
-+ at end defun
-
-- at defunx x:draw-points drawable gc point-array
-+ at defun x:draw-points drawable gc point-array
- @var{point-array} is a uniform short array of rank 2, whose rightmost
- index spans a range of 2.
-
-@@ -1748,12 +1761,14 @@
- @defun x:draw-segments drawable gc pos1 pos2 @dots{}
- @var{Pos1}, @var{pos2}, @dots{} specify coordinates to be connected by
- segments.
-+ at end defun
-
-- at defunx x:draw-segments drawable gc x1 y1 x2 y2 @dots{}
-+ at defun x:draw-segments drawable gc x1 y1 x2 y2 @dots{}
- (@var{x1}, @var{y1}), (@var{x2}, @var{y2}) @dots{} specify coordinates
- to be connected by segments.
-+ at end defun
-
-- at defunx x:draw-segments drawable gc point-array
-+ at defun x:draw-segments drawable gc point-array
- @var{point-array} is a uniform short array of rank 2, whose rightmost
- index spans a range of 2.
-
-@@ -1779,12 +1794,14 @@
- @defun x:draw-lines drawable gc pos1 pos2 @dots{}
- @var{Pos1}, @var{pos2}, @dots{} specify coordinates to be connected by
- lines.
-+ at end defun
-
-- at defunx x:draw-lines drawable gc x1 y1 x2 y2 @dots{}
-+ at defun x:draw-lines drawable gc x1 y1 x2 y2 @dots{}
- (@var{x1}, @var{y1}), (@var{x2}, @var{y2}) @dots{} specify coordinates
- to be connected by lines.
-+ at end defun
-
-- at defunx x:draw-lines drawable gc point-array
-+ at defun x:draw-lines drawable gc point-array
- @var{point-array} is a uniform short array of rank 2, whose rightmost
- index spans a range of 2.
-
-@@ -1810,12 +1827,14 @@
-
- @defun x:fill-polygon drawable gc pos1 pos2 @dots{}
- @var{Pos1}, @var{pos2}, @dots{} specify coordinates of the border path.
-+ at end defun
-
-- at defunx x:fill-polygon drawable gc x1 y1 x2 y2 @dots{}
-+ at defun x:fill-polygon drawable gc x1 y1 x2 y2 @dots{}
- (@var{x1}, @var{y1}), (@var{x2}, @var{y2}) @dots{} specify coordinates
- of the border path.
-+ at end defun
-
-- at defunx x:fill-polygon drawable gc point-array
-+ at defun x:fill-polygon drawable gc point-array
- @var{point-array} is a uniform short array of rank 2, whose rightmost
- index spans a range of 2.
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/scm.git/commitdiff/dc517e98ebde183942280d2965d3bbc1764584b7
More information about the pld-cvs-commit
mailing list