diff options
author | Marius Bakke <marius@gnu.org> | 2021-05-16 12:09:30 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2021-05-22 17:08:14 +0200 |
commit | 6daa0b5af3282bd3433605825bbe7f5d20dd6f4c (patch) | |
tree | 2afc63ce6958b3d8926c31635d7526717310ca2f /gnu/packages/patches/tcl-fix-cross-compilation.patch | |
parent | 4119775de1aef44104186b3abfba1973aa973b1a (diff) | |
download | guix-6daa0b5af3282bd3433605825bbe7f5d20dd6f4c.tar.gz |
gnu: Tcl/Tk: Update to 8.6.11.
* gnu/packages/patches/tcl-fix-cross-compilation.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/tcl.scm (tcl): Update to 8.6.11. [source](patches): Remove. [arguments]: Remove trailing #t's. (tk): Update to 8.6.11.1. [arguments]: Remove trailing #t's and reindent.
Diffstat (limited to 'gnu/packages/patches/tcl-fix-cross-compilation.patch')
-rw-r--r-- | gnu/packages/patches/tcl-fix-cross-compilation.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/gnu/packages/patches/tcl-fix-cross-compilation.patch b/gnu/packages/patches/tcl-fix-cross-compilation.patch deleted file mode 100644 index 00c36b8f27..0000000000 --- a/gnu/packages/patches/tcl-fix-cross-compilation.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f7fa48c4c75a1e748dc5071e709c0b62ff739eaa Mon Sep 17 00:00:00 2001 -From: "jan.nijtmans" <nijtmans@users.sourceforge.net> -Date: Mon, 9 Dec 2019 10:02:20 +0000 -Subject: [PATCH] Fix [abd4abedd2]: Failed to build tk 8.6.10 with cross - compile - -Patch taken from upstream to fix cross-compilation. To be removed on next Tcl release. - ---- - compat/strtol.c | 2 +- - compat/strtoul.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/compat/strtol.c b/compat/strtol.c -index b7f69196ce2..811006a64c3 100644 ---- a/compat/strtol.c -+++ b/compat/strtol.c -@@ -53,7 +53,7 @@ strtol( - */ - - p = string; -- while (TclIsSpaceProc(*p)) { -+ while (isspace(UCHAR(*p))) { - p += 1; - } - -diff --git a/compat/strtoul.c b/compat/strtoul.c -index e37eb05f823..15587f1da1a 100644 ---- a/compat/strtoul.c -+++ b/compat/strtoul.c -@@ -74,7 +74,7 @@ strtoul( - */ - - p = string; -- while (TclIsSpaceProc(*p)) { -+ while (isspace(UCHAR(*p))) { - p += 1; - } - if (*p == '-') { |