Subject: bug#32355: closed (Re: [bug#32355] Updated patch)

From: [email-masked] (GNU bug Tracking System)
Date: Thu, 16 Aug 2018 22:38:02 +0000

Your bug report

#32355: [PATCH] gnu: racket: Update to 7.0

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
32355: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=32355
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#32355] Updated patch
From: Leo Famulari <[email-masked]>
To: Konrad Hinsen <[email-masked]>
Cc: [email-masked]
Date: Thu, 16 Aug 2018 18:37:08 -0400
List-Id: <debbugs-submit.debbugs.gnu.org>

On Tue, Aug 14, 2018 at 02:02:13PM +0200, Konrad Hinsen wrote:
> From 2d80d085c372cf466d95b8e06289b2f58853f7ea Mon Sep 17 00:00:00 2001
> From: Konrad Hinsen <[email-masked]>
> Date: Thu, 2 Aug 2018 16:23:11 +0200
> Subject: [PATCH] gnu: racket: Update to 7.0
> 
> * gnu/packages/scheme.scm (racket): Update to 7.0.

Thanks!

> ---
>  gnu/local.mk                                  |  2 +-
>  .../patches/racket-fix-xform-issue.patch      | 63 -------------------
>  .../racket-store-checksum-override.patch      | 19 ++++--
>  gnu/packages/scheme.scm                       | 39 ++++++------
>  4 files changed, 34 insertions(+), 89 deletions(-)
>  delete mode 100644 gnu/packages/patches/racket-fix-xform-issue.patch

I filled out the commit message and pushed as
e0b49c785b6fe577fbf07e5d74b8544e9d336209

Subject: [PATCH] gnu: racket: Update to 7.0
From: Konrad Hinsen <[email-masked]>
To: [email-masked]
Date: Thu, 2 Aug 2018 16:23:11 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/scheme.scm (racket): Update to 7.0.
---
 .../patches/racket-fix-xform-issue.patch      | 63 -------------------
 gnu/packages/scheme.scm                       | 16 ++---
 2 files changed, 8 insertions(+), 71 deletions(-)
 delete mode 100644 gnu/packages/patches/racket-fix-xform-issue.patch

diff --git a/gnu/packages/patches/racket-fix-xform-issue.patch b/gnu/packages/patches/racket-fix-xform-issue.patch
deleted file mode 100644
index 0a1640ee5..000000000
--- a/gnu/packages/patches/racket-fix-xform-issue.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-050cdb59839896b41431791f8ee0ef2564231b8f
-Author:     Matthew Flatt <[email-masked]>
-AuthorDate: Tue Mar 6 09:05:08 2018 -0700
-Commit:     Matthew Flatt <[email-masked]>
-CommitDate: Tue Mar 6 09:05:08 2018 -0700
-
-Parent:     efb9a919fc ffi docs: clarification on `unsafe-socket->port`
-Containing: master
-Follows:    v5.0.1 (21612)
-
-xform: avoid problems with `__signbitf128`
-
-Closes #1962 and uses the suggested patch there, among other changes.
-
-2 files changed, 6 insertions(+), 3 deletions(-)
-racket/collects/compiler/private/xform.rkt | 2 +-
-racket/src/racket/src/number.c             | 7 +++++--
-
-diff --git a/racket/collects/compiler/private/xform.rkt b/racket/collects/compiler/private/xform.rkt
-index 28a425c057..89ae848f9c 100644
---- a/collects/compiler/private/xform.rkt
-+++ b/collects/compiler/private/xform.rkt
-@@ -904,7 +904,7 @@
- 
-                strlen cos cosl sin sinl exp expl pow powl log logl sqrt sqrtl atan2 atan2l frexp
-                isnan isinf fpclass signbit _signbit _fpclass __fpclassify __fpclassifyf __fpclassifyl
--	       _isnan __isfinited __isnanl __isnan __signbit __signbitf __signbitd __signbitl
-+	       _isnan __isfinited __isnanl __isnan __signbit __signbitf __signbitd __signbitl __signbitf128
-                __isinff __isinfl isnanf isinff __isinfd __isnanf __isnand __isinf __isinff128
-                __inline_isnanl __inline_isnan __inline_signbit __inline_signbitf __inline_signbitd __inline_signbitl
-                __builtin_popcount __builtin_clz __builtin_isnan __builtin_isinf __builtin_signbit
-diff --git a/racket/src/racket/src/number.c b/racket/src/racket/src/number.c
-index 71f42aaf3c..3bbad3ba83 100644
---- a/src/racket/src/number.c
-+++ b/src/racket/src/number.c
-@@ -1796,6 +1796,7 @@ double scheme_real_to_double(Scheme_Object *r)
- }
- 
- XFORM_NONGCING static MZ_INLINE int minus_zero_p(double d)
-+  XFORM_SKIP_PROC
- {
- #ifdef MZ_IS_NEG_ZERO
-   return MZ_IS_NEG_ZERO(d);
-@@ -1809,7 +1810,9 @@ int scheme_minus_zero_p(double d)
-   return minus_zero_p(d);
- }
- 
--static int rational_dbl_p(double f) {
-+XFORM_NONGCING static int rational_dbl_p(double f)
-+  XFORM_SKIP_PROC
-+{
-   return !(MZ_IS_NAN(f)
-            || MZ_IS_INFINITY(f));
- }
-@@ -1955,7 +1958,7 @@ real_p(int argc, Scheme_Object *argv[])
-   return (SCHEME_REALP(o) ? scheme_true : scheme_false);
- }
- 
--static int is_rational(const Scheme_Object *o)
-+XFORM_NONGCING static int is_rational(const Scheme_Object *o)
- {
-   if (SCHEME_FLOATP(o))
-     return rational_dbl_p(SCHEME_FLOAT_VAL(o));
\ No newline at end of file
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 4178a45a8..545980088 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -65,6 +65,7 @@
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages libedit)
   #:use-module (ice-9 match))
 
 (define (mit-scheme-source-directory system version)
@@ -407,7 +408,7 @@ implementation techniques and as an expository tool.")
 (define-public racket
   (package
     (name "racket")
-    (version "6.12")
+    (version "7.0")
     (source (origin
              (method url-fetch)
              (uri (list (string-append "http://mirror.racket-lang.org/installers/"
@@ -417,11 +418,7 @@ implementation techniques and as an expository tool.")
                          version "/racket-" version "-src.tgz")))
              (sha256
               (base32
-               "0cwcypzjfl9py1s695mhqkiapff7c1w29llsmdj7qgn58wl0apk5"))
-             (patches (search-patches
-                       ;; See: https://github.com/racket/racket/issues/1962
-                       ;; This can be removed in whatever Racket release comes after 6.12
-                       "racket-fix-xform-issue.patch"))))
+               "1glv5amsp9xp480d4yr63hhm9kkyav06yl3a6p489nkr4cln0j9a"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
@@ -484,7 +481,9 @@ implementation techniques and as an expository tool.")
                   ("share/pkgs/gui-lib/mred/private/wx/gtk/gl-context.rkt"
                    ("libGL"))
                   ("share/pkgs/sgl/gl.rkt"
-                   ("libGL" "libGLU")))))
+                   ("libGL" "libGLU"))
+                  ("share/pkgs/readline-lib/readline/rktrl.rkt"
+                   ("libedit")))))
              (chdir "src")
              #t))
          (add-after 'unpack 'patch-/bin/sh
@@ -512,7 +511,8 @@ implementation techniques and as an expository tool.")
        ("openssl" ,openssl)
        ("pango" ,pango)
        ("sqlite" ,sqlite)
-       ("unixodbc" ,unixodbc)))
+       ("unixodbc" ,unixodbc)
+       ("libedit" ,libedit)))
     (home-page "http://racket-lang.org")
     (synopsis "Implementation of Scheme and related languages")
     (description
-- 
2.18.0