From e7354817c72ec55d66e912013f194ed83feac852 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 27 Jan 2025 22:19:19 +0100
Subject: [PATCH] clisp: 2.50pre20230112 -> 2.49.95-unstable-2024-12-28

---
 .../interpreters/clisp/default.nix            | 32 +++----------------
 .../interpreters/clisp/gnulib_aarch64.patch   | 13 --------
 2 files changed, 5 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/development/interpreters/clisp/gnulib_aarch64.patch

diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index 555bfc45beff..2bcb59fe66f5 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -7,7 +7,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  autoconf269,
+  autoconf,
   automake,
   bash,
   libtool,
@@ -56,24 +56,22 @@ assert
 
 let
   ffcallAvailable = stdenv.hostPlatform.isLinux && (libffcall != null);
-  # Some modules need autoreconf called in their directory.
-  shouldReconfModule = name: name != "asdf";
 in
 
 stdenv.mkDerivation {
-  version = "2.50pre20230112";
+  version = "2.49.95-unstable-2024-12-28";
   pname = "clisp";
 
   src = fetchFromGitLab {
     owner = "gnu-clisp";
     repo = "clisp";
-    rev = "bf72805c4dace982a6d3399ff4e7f7d5e77ab99a";
-    hash = "sha256-sQoN2FUg9BPaCgvCF91lFsU/zLja1NrgWsEIr2cPiqo=";
+    rev = "c3ec11bab87cfdbeba01523ed88ac2a16b22304d";
+    hash = "sha256-xXGx2FlS0l9huVMHqNbcAViLjxK8szOFPT0J8MpGp9w=";
   };
 
   strictDeps = true;
   nativeBuildInputs = [
-    autoconf269
+    autoconf
     automake
     libtool
   ];
@@ -98,10 +96,6 @@ stdenv.mkDerivation {
       libXext
     ];
 
-  patches = [
-    ./gnulib_aarch64.patch
-  ];
-
   # First, replace port 9090 (rather low, can be used)
   # with 64237 (much higher, IANA private area, not
   # anything rememberable).
@@ -112,22 +106,6 @@ stdenv.mkDerivation {
     find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i
   '';
 
-  preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin (
-    ''
-      (
-        cd src
-        autoreconf -f -i -I m4 -I glm4
-      )
-    ''
-    + lib.concatMapStrings (x: ''
-      (
-        root="$PWD"
-        cd modules/${x}
-        autoreconf -f -i -I "$root/src" -I "$root/src/m4" -I "$root/src/glm4"
-      )
-    '') (builtins.filter shouldReconfModule withModules)
-  );
-
   configureFlags =
     [ "builddir" ]
     ++ lib.optional (!dllSupport) "--without-dynamic-modules"
diff --git a/pkgs/development/interpreters/clisp/gnulib_aarch64.patch b/pkgs/development/interpreters/clisp/gnulib_aarch64.patch
deleted file mode 100644
index a0095835706a..000000000000
--- a/pkgs/development/interpreters/clisp/gnulib_aarch64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/gllib/vma-iter.c b/src/gllib/vma-iter.c
-index 6045f21d7..d50a3a398 100644
---- a/src/gllib/vma-iter.c
-+++ b/src/gllib/vma-iter.c
-@@ -1327,7 +1327,7 @@ vma_iterate (vma_iterate_callback_fn callback, void *data)
-          In 64-bit processes, we could use vm_region_64 or mach_vm_region.
-          I choose vm_region_64 because it uses the same types as vm_region,
-          resulting in less conditional code.  */
--# if defined __ppc64__ || defined __x86_64__
-+# if defined __aarch64__ || defined __ppc64__ || defined __x86_64__
-       struct vm_region_basic_info_64 info;
-       mach_msg_type_number_t info_count = VM_REGION_BASIC_INFO_COUNT_64;
-